Ensure that constantize just rescues NameError that applies to the constant being currently loaded.

1 files changed, 6 insertions, 0 deletions

diff --git a/activesupport/test/constantize_test_cases.rb b/activesupport/test/constantize_test_cases.rb
index b8a866b6c9..81d200a0c8 100644
--- a/activesupport/test/constantize_test_cases.rb
+++ b/activesupport/test/constantize_test_cases.rb
@@ -12,8 +12,11 @@ module ConstantizeTestCases
     assert_nothing_raised { assert_equal ConstantizeTestCases, yield("ConstantizeTestCases") }
     assert_nothing_raised { assert_equal ConstantizeTestCases, yield("::ConstantizeTestCases") }
     assert_raise(NameError) { yield("UnknownClass") }
+    assert_raise(NameError) { yield("UnknownClass::Ace") }
+    assert_raise(NameError) { yield("UnknownClass::Ace::Base") }
     assert_raise(NameError) { yield("An invalid string") }
     assert_raise(NameError) { yield("InvalidClass\n") }
+    assert_raise(NameError) { yield("Ace::ConstantizeTestCases") }
     assert_raise(NameError) { yield("Ace::Base::ConstantizeTestCases") }
   end
   
@@ -23,9 +26,12 @@ module ConstantizeTestCases
     assert_nothing_raised { assert_equal ConstantizeTestCases, yield("ConstantizeTestCases") }
     assert_nothing_raised { assert_equal ConstantizeTestCases, yield("::ConstantizeTestCases") }
     assert_nothing_raised { assert_equal nil, yield("UnknownClass") }
+    assert_nothing_raised { assert_equal nil, yield("UnknownClass::Ace") }
+    assert_nothing_raised { assert_equal nil, yield("UnknownClass::Ace::Base") }
     assert_nothing_raised { assert_equal nil, yield("An invalid string") }
     assert_nothing_raised { assert_equal nil, yield("InvalidClass\n") }
     assert_nothing_raised { assert_equal nil, yield("blargle") }
+    assert_nothing_raised { assert_equal nil, yield("Ace::ConstantizeTestCases") }
     assert_nothing_raised { assert_equal nil, yield("Ace::Base::ConstantizeTestCases") }
   end
 end
\ No newline at end of file