1 files changed, 30 insertions, 9 deletions
diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb
index 8784e0e988..f6b9ea83d3 100644
--- a/test/ruby/test_const.rb
+++ b/test/ruby/test_const.rb
@@ -3,20 +3,30 @@
 require 'test/unit'
 
 class TestConst < Test::Unit::TestCase
-  TEST1 = 1
-  TEST2 = 2
 
-  module Const
-    TEST3 = 3
-    TEST4 = 4
-  end
+  Constants_Setup = -> do
+    remove_const :TEST1  if defined? ::TestConst::TEST1
+    remove_const :TEST2  if defined? ::TestConst::TEST2
+    remove_const :Const  if defined? ::TestConst::Const
+    remove_const :Const2 if defined? ::TestConst::Const2
+
+    TEST1 = 1
+    TEST2 = 2
 
-  module Const2
-    TEST3 = 6
-    TEST4 = 8
+    module Const
+      TEST3 = 3
+      TEST4 = 4
+    end
+
+    module Const2
+      TEST3 = 6
+      TEST4 = 8
+    end
   end
 
   def test_const
+    Constants_Setup.call
+
     assert defined?(TEST1)
     assert_equal 1, TEST1
     assert defined?(TEST2)
@@ -48,6 +58,17 @@ class TestConst < Test::Unit::TestCase
     assert_equal 8, TEST4
   end
 
+  def test_const_access_from_nil
+    assert_raise(TypeError) { eval("nil::Object") }
+    assert_nil eval("defined?(nil::Object)")
+
+    assert_raise(TypeError) { eval("c = nil; c::Object") }
+    assert_nil eval("c = nil; defined?(c::Object)")
+
+    assert_raise(TypeError) { eval("sc = Class.new; sc::C = nil; sc::C::Object") }
+    assert_nil eval("sc = Class.new; sc::C = nil; defined?(sc::C::Object)")
+  end
+
   def test_redefinition
     c = Class.new
     name = "X\u{5b9a 6570}"