@@ -197,11 +197,11 @@ def redefine_verify_none(new_value)
197
197
198
198
end
199
199
200
- expect ( mail . smtp_envelope_from ) . to eq addr
200
+ mail . smtp_envelope_from . should eq addr
201
201
202
- expect do
202
+ doing {
203
203
mail . deliver
204
- end . to raise_error ( ArgumentError , "SMTP From address may not contain CR or LF line breaks: #{ addr . inspect } " )
204
+ } . should raise_error ( ArgumentError , "SMTP From address may not contain CR or LF line breaks: #{ addr . inspect } " )
205
205
end
206
206
207
207
it "should raise on SMTP injection via RCPT TO newlines" do
@@ -212,11 +212,11 @@ def redefine_verify_none(new_value)
212
212
to addr
213
213
end
214
214
215
- expect ( mail . smtp_envelope_to ) . to eq [ addr ]
215
+ mail . smtp_envelope_to . should eq [ addr ]
216
216
217
- expect do
217
+ doing {
218
218
mail . deliver
219
- end . to raise_error ( ArgumentError , "SMTP To address may not contain CR or LF line breaks: #{ addr . inspect } " )
219
+ } . should raise_error ( ArgumentError , "SMTP To address may not contain CR or LF line breaks: #{ addr . inspect } " )
220
220
end
221
221
222
222
it "should raise on SMTP injection via MAIL FROM overflow" do
@@ -227,11 +227,11 @@ def redefine_verify_none(new_value)
227
227
228
228
end
229
229
230
- expect ( mail . smtp_envelope_from ) . to eq addr
230
+ mail . smtp_envelope_from . should eq addr
231
231
232
- expect do
232
+ doing {
233
233
mail . deliver
234
- end . to raise_error ( ArgumentError , "SMTP From address may not exceed 2kB: #{ addr . inspect } " )
234
+ } . should raise_error ( ArgumentError , "SMTP From address may not exceed 2kB: #{ addr . inspect } " )
235
235
end
236
236
237
237
it "should raise on SMTP injection via RCPT TO overflow" do
@@ -242,11 +242,11 @@ def redefine_verify_none(new_value)
242
242
to addr
243
243
end
244
244
245
- expect ( mail . smtp_envelope_to ) . to eq [ addr ]
245
+ mail . smtp_envelope_to . should eq [ addr ]
246
246
247
- expect do
247
+ doing {
248
248
mail . deliver
249
- end . to raise_error ( ArgumentError , "SMTP To address may not exceed 2kB: #{ addr . inspect } " )
249
+ } . should raise_error ( ArgumentError , "SMTP To address may not exceed 2kB: #{ addr . inspect } " )
250
250
end
251
251
end
252
252
end
0 commit comments