aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-08 22:49:28 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-08 22:49:28 -0500
commit17ac2a248282ed34b694ebd4fc651d6a0eb1a23d (patch)
tree848418ba9ef48d482e1372a00c8a9462a9001ea9 /actionmailer
parent1df0a07f060291397dcbc8dd39e3abd3ad915a78 (diff)
downloadrails-17ac2a248282ed34b694ebd4fc651d6a0eb1a23d.tar.gz
rails-17ac2a248282ed34b694ebd4fc651d6a0eb1a23d.tar.bz2
rails-17ac2a248282ed34b694ebd4fc651d6a0eb1a23d.zip
Ruby 1.9 compat: check for minitest's assertion also
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/test_helper_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index f8913e548c..b7f9d9f8d3 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -84,7 +84,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
end
def test_assert_emails_too_few_sent
- error = assert_raises Test::Unit::AssertionFailedError do
+ error = assert_raises ActiveSupport::TestCase::Assertion do
assert_emails 2 do
TestHelperMailer.deliver_test
end
@@ -94,7 +94,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
end
def test_assert_emails_too_many_sent
- error = assert_raises Test::Unit::AssertionFailedError do
+ error = assert_raises ActiveSupport::TestCase::Assertion do
assert_emails 1 do
TestHelperMailer.deliver_test
TestHelperMailer.deliver_test
@@ -105,7 +105,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
end
def test_assert_no_emails_failure
- error = assert_raises Test::Unit::AssertionFailedError do
+ error = assert_raises ActiveSupport::TestCase::Assertion do
assert_no_emails do
TestHelperMailer.deliver_test
end