diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-19 14:28:04 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-19 14:28:04 +0100 |
| commit | c1848f9736d9a4a45181642106acecb6a83a45a3 (patch) | |
| tree | 982fd3ea7b1ba41d123d3188d0dfd36668c3abe3 /actionmailer/test/mail_service_test.rb | |
| parent | c8e2998701653df9035232778d60f18c4a07abb4 (diff) | |
| download | rails-c1848f9736d9a4a45181642106acecb6a83a45a3.tar.gz rails-c1848f9736d9a4a45181642106acecb6a83a45a3.tar.bz2 rails-c1848f9736d9a4a45181642106acecb6a83a45a3.zip | |
Get all tests passing.
Diffstat (limited to 'actionmailer/test/mail_service_test.rb')
| -rw-r--r-- | actionmailer/test/mail_service_test.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 17e7992e29..7b5f8b1ffc 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -680,7 +680,7 @@ class ActionMailerTest < Test::Unit::TestCase def test_performs_delivery_via_sendmail IO.expects(:popen).once.with('/usr/sbin/sendmail -i -t test@localhost', 'w+') - TestMailer.delivery_method = :sendmail + ActionMailer::Base.delivery_method = :sendmail TestMailer.deliver_signed_up(@recipient) end @@ -1069,12 +1069,7 @@ EOF def test_return_path_with_create mail = TestMailer.create_return_path - 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 + assert_equal "another@somewhere.test", mail.return_path end def test_return_path_with_deliver |