Prefer assert_raise instead of flunk + rescue to test for exceptions

Change most tests to make use of assert_raise returning the raised
exception rather than relying on a combination of flunk + rescue to
check for exception types/messages.

1 files changed, 6 insertions, 6 deletions

diff --git a/activesupport/test/core_ext/name_error_test.rb b/activesupport/test/core_ext/name_error_test.rb
index 03ce09f22a..7525f80cf0 100644
--- a/activesupport/test/core_ext/name_error_test.rb
+++ b/activesupport/test/core_ext/name_error_test.rb
@@ -3,18 +3,18 @@ require 'active_support/core_ext/name_error'
 
 class NameErrorTest < ActiveSupport::TestCase
   def test_name_error_should_set_missing_name
-    SomeNameThatNobodyWillUse____Really ? 1 : 0
-    flunk "?!?!"
-  rescue NameError => exc
+    exc = assert_raise NameError do
+      SomeNameThatNobodyWillUse____Really ? 1 : 0
+    end
     assert_equal "NameErrorTest::SomeNameThatNobodyWillUse____Really", exc.missing_name
     assert exc.missing_name?(:SomeNameThatNobodyWillUse____Really)
     assert exc.missing_name?("NameErrorTest::SomeNameThatNobodyWillUse____Really")
   end
 
   def test_missing_method_should_ignore_missing_name
-    some_method_that_does_not_exist
-    flunk "?!?!"
-  rescue NameError => exc
+    exc = assert_raise NameError do
+      some_method_that_does_not_exist
+    end
     assert !exc.missing_name?(:Foo)
     assert_nil exc.missing_name
   end