aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorEvan Phoenix <ephoenix@engineyard.com>2010-03-22 09:50:45 -0700
committerEvan Phoenix <ephoenix@engineyard.com>2010-03-22 10:00:03 -0700
commit1e4be20672252ac15a355589dd44bdd4623640c4 (patch)
tree4b59c20941e3b65765896c4d87c82968d49949c1 /actionmailer
parent34497c0b3638e7fd298da4a1107333fe534f9ca4 (diff)
downloadrails-1e4be20672252ac15a355589dd44bdd4623640c4.tar.gz
rails-1e4be20672252ac15a355589dd44bdd4623640c4.tar.bz2
rails-1e4be20672252ac15a355589dd44bdd4623640c4.zip
Fix ActionMailer test issues
* Don't depend so much no the message in a NameError * Reset the delivery method properly
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/old_base/mail_service_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index 6d0b2c53a3..e49307bfda 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -340,6 +340,8 @@ class ActionMailerTest < Test::Unit::TestCase
@original_logger = TestMailer.logger
@recipient = 'test@localhost'
+
+ TestMailer.delivery_method = :test
end
def teardown
@@ -1191,6 +1193,6 @@ class RespondToTest < Test::Unit::TestCase
RespondToMailer.not_a_method
end
- assert_match(/undefined method.*not_a_method/, error.message)
+ assert_match(/method.*not_a_method/, error.message)
end
-end \ No newline at end of file
+end