Skip to content

Commit b9cee02

Browse files
committed
Specs: fix expect-style that wasn't backported to old should-style
1 parent b5a2884 commit b9cee02

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

spec/mail/network/delivery_methods/smtp_spec.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,11 @@ def redefine_verify_none(new_value)
197197
198198
end
199199

200-
expect(mail.smtp_envelope_from).to eq addr
200+
mail.smtp_envelope_from.should eq addr
201201

202-
expect do
202+
doing {
203203
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}")
205205
end
206206

207207
it "should raise on SMTP injection via RCPT TO newlines" do
@@ -212,11 +212,11 @@ def redefine_verify_none(new_value)
212212
to addr
213213
end
214214

215-
expect(mail.smtp_envelope_to).to eq [addr]
215+
mail.smtp_envelope_to.should eq [addr]
216216

217-
expect do
217+
doing {
218218
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}")
220220
end
221221

222222
it "should raise on SMTP injection via MAIL FROM overflow" do
@@ -227,11 +227,11 @@ def redefine_verify_none(new_value)
227227
228228
end
229229

230-
expect(mail.smtp_envelope_from).to eq addr
230+
mail.smtp_envelope_from.should eq addr
231231

232-
expect do
232+
doing {
233233
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}")
235235
end
236236

237237
it "should raise on SMTP injection via RCPT TO overflow" do
@@ -242,11 +242,11 @@ def redefine_verify_none(new_value)
242242
to addr
243243
end
244244

245-
expect(mail.smtp_envelope_to).to eq [addr]
245+
mail.smtp_envelope_to.should eq [addr]
246246

247-
expect do
247+
doing {
248248
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}")
250250
end
251251
end
252252
end

0 commit comments

Comments
 (0)