vendor/rails/actionmailer/test/test_helper_test.rb in radiant-0.7.2 vs vendor/rails/actionmailer/test/test_helper_test.rb in radiant-0.8.0

@@ -24,21 +24,21 @@
   def test_mailer_class_is_correctly_inferred
     assert_equal TestHelperMailer, self.class.mailer_class
   end
 
   def test_determine_default_mailer_raises_correct_error
-    assert_raises(ActionMailer::NonInferrableMailerError) do
+    assert_raise(ActionMailer::NonInferrableMailerError) do
       self.class.determine_default_mailer("NotAMailerTest")
     end
   end
   
   def test_charset_is_utf_8
     assert_equal "utf-8", charset
   end
 
   def test_encode
-    assert_equal "=?utf-8?Q?=0aasdf=0a?=", encode("\nasdf\n")
+    assert_equal "=?utf-8?Q?=0Aasdf=0A?=", encode("\nasdf\n")
   end
 
   def test_assert_emails
     assert_nothing_raised do
       assert_emails 1 do
@@ -82,31 +82,31 @@
       end
     end
   end
   
   def test_assert_emails_too_few_sent
-    error = assert_raises Test::Unit::AssertionFailedError do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 2 do
         TestHelperMailer.deliver_test
       end
     end
     
     assert_match /2 .* but 1/, error.message
   end
   
   def test_assert_emails_too_many_sent
-    error = assert_raises Test::Unit::AssertionFailedError do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 1 do
         TestHelperMailer.deliver_test
         TestHelperMailer.deliver_test
       end
     end
     
     assert_match /1 .* but 2/, error.message
   end
   
   def test_assert_no_emails_failure
-    error = assert_raises Test::Unit::AssertionFailedError do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_emails do
         TestHelperMailer.deliver_test
       end
     end