2 files changed, 27 insertions, 0 deletions
diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index e60db37c15..81c11e6f88 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -556,4 +556,24 @@ class TestClass < Test::Unit::TestCase
       }
     end;
   end
+
+  def test_should_not_expose_singleton_class_without_metaclass
+    assert_normal_exit %q{
+      klass = Class.new(Array)
+      # The metaclass of +klass+ should handle #bla since it should inherit methods from meta:meta:Array
+      def (Array.singleton_class).bla; :bla; end
+      hidden = ObjectSpace.each_object(Class).find { |c| klass.is_a? c and c.inspect.include? klass.inspect }
+      raise unless hidden.nil?
+    }, '[Bug #11740]'
+
+    assert_normal_exit %q{
+      klass = Class.new(Array)
+      klass.singleton_class
+      # The metaclass of +klass+ should handle #bla since it should inherit methods from meta:meta:Array
+      def (Array.singleton_class).bla; :bla; end
+      hidden = ObjectSpace.each_object(Class).find { |c| klass.is_a? c and c.inspect.include? klass.inspect }
+      raise if hidden.nil?
+    }, '[Bug #11740]'
+
+  end
 end
diff --git a/test/ruby/test_objectspace.rb b/test/ruby/test_objectspace.rb
index b701e0fc91..ec561bc405 100644
--- a/test/ruby/test_objectspace.rb
+++ b/test/ruby/test_objectspace.rb
@@ -149,5 +149,12 @@ End
       }
       assert(exist, 'Bug #11360')
     End
+
+    klass = Class.new
+    instance = klass.new
+    sclass = instance.singleton_class
+    meta = klass.singleton_class
+    assert_kind_of(meta, sclass)
+    assert_include(ObjectSpace.each_object(meta).to_a, sclass)
   end
 end