aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/mail_helper_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-11-07 16:05:17 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-11-07 16:05:17 +0000
commit57cde631383a8a0fa8d231ac1ae85ea725e12cd5 (patch)
tree085048b9a8aa2456b4842cf45af66bde320615b8 /actionmailer/test/mail_helper_test.rb
parent6b018e3d08c52417034cd648952668192327a9b7 (diff)
downloadrails-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_helper_test.rb')
-rw-r--r--actionmailer/test/mail_helper_test.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index 344dcd7c49..70e5cb81d5 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -60,13 +60,17 @@ class MailerHelperTest < Test::Unit::TestCase
end
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_use_helper
mail = HelperMailer.create_use_helper(@recipient)
assert_match %r{Mr. Joe Person}, mail.encoded