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_render_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_render_test.rb')
-rw-r--r-- | actionmailer/test/mail_render_test.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb index a725dac4ca..d6ee21a8b9 100644 --- a/actionmailer/test/mail_render_test.rb +++ b/actionmailer/test/mail_render_test.rb @@ -45,13 +45,17 @@ end class RenderHelperTest < Test::Unit::TestCase def setup - ActionMailer::Base.delivery_method = :test + set_delivery_method :test ActionMailer::Base.perform_deliveries = true ActionMailer::Base.deliveries = [] @recipient = 'test@localhost' end + def teardown + restore_delivery_method + end + def test_inline_template mail = RenderMailer.create_inline_template(@recipient) assert_equal "Hello, Earth", mail.body.strip @@ -70,13 +74,17 @@ end class FirstSecondHelperTest < Test::Unit::TestCase def setup - ActionMailer::Base.delivery_method = :test + set_delivery_method :test ActionMailer::Base.perform_deliveries = true ActionMailer::Base.deliveries = [] @recipient = 'test@localhost' end + def teardown + restore_delivery_method + end + def test_ordering mail = FirstMailer.create_share(@recipient) assert_equal "first mail", mail.body.strip |