diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2007-11-07 16:05:17 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-11-07 16:05:17 +0000 |
commit | 57cde631383a8a0fa8d231ac1ae85ea725e12cd5 (patch) | |
tree | 085048b9a8aa2456b4842cf45af66bde320615b8 /actionmailer/test/mail_service_test.rb | |
parent | 6b018e3d08c52417034cd648952668192327a9b7 (diff) | |
download | rails-57cde631383a8a0fa8d231ac1ae85ea725e12cd5.tar.gz rails-57cde631383a8a0fa8d231ac1ae85ea725e12cd5.tar.bz2 rails-57cde631383a8a0fa8d231ac1ae85ea725e12cd5.zip |
Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) (closes #10033) [zdennis]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/test/mail_service_test.rb')
-rwxr-xr-x | actionmailer/test/mail_service_test.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 58c6d39749..09132ed7e6 100755 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -282,7 +282,7 @@ class ActionMailerTest < Test::Unit::TestCase # Replacing logger work around for mocha bug. Should be fixed in mocha 0.3.3 def setup - ActionMailer::Base.delivery_method = :test + set_delivery_method :test ActionMailer::Base.perform_deliveries = true ActionMailer::Base.raise_delivery_errors = true ActionMailer::Base.deliveries = [] @@ -290,9 +290,10 @@ class ActionMailerTest < Test::Unit::TestCase @original_logger = TestMailer.logger @recipient = 'test@localhost' end - + def teardown TestMailer.logger = @original_logger + restore_delivery_method end def test_nested_parts @@ -902,11 +903,15 @@ class MethodNamingTest < Test::Unit::TestCase end def setup - ActionMailer::Base.delivery_method = :test + set_delivery_method :test ActionMailer::Base.perform_deliveries = true ActionMailer::Base.deliveries = [] end + def teardown + restore_delivery_method + end + def test_send_method assert_nothing_raised do assert_emails 1 do |