From 1ddf17dff0cb21c9e13842af82cfbd0c22c38e62 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Fri, 8 Jan 2010 12:15:36 +1100 Subject: Return-Path per RFC needs '<' and '>' around the addr_spec --- actionmailer/test/mail_service_test.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index fa32537d0c..9b3da299ba 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -1110,10 +1110,15 @@ EOF assert_equal "another@somewhere.test", mail['return-path'].to_s end + def test_return_path_with_create + mail = TestMailer.create_return_path + assert_equal "another@somewhere.test", mail.return_path + end + def test_return_path_with_deliver ActionMailer::Base.delivery_method = :smtp TestMailer.deliver_return_path - assert_match %r{^Return-Path:.*another@somewhere.test}, MockSMTP.deliveries[0][0] + assert_match %r{^Return-Path: }, MockSMTP.deliveries[0][0] assert_equal "another@somewhere.test", MockSMTP.deliveries[0][1].to_s end -- cgit v1.2.3