Add more tests for reopening classes

Author: trinistr

core/module/fixtures/classes.rb

@@ -1,6 +1,8 @@
 module ModuleSpecs
   def self.without_test_modules(modules)
-    ignore = %w[MSpecRSpecAdapter PP::ObjectMixin ModuleSpecs::IncludedInObject MainSpecs::Module ConstantSpecs::ModuleA]
+    ignore =
+      %w[MSpecRSpecAdapter PP::ObjectMixin ModuleSpecs::IncludedInObject
+         ClassSpecs::IncludedInObjectWithClass MainSpecs::Module ConstantSpecs::ModuleA]
     modules.reject { |k| ignore.include?(k.name) }
   end
 

fixtures/class.rb

@@ -126,6 +126,11 @@ def self.get_class_name
   DEFINE_CLASS = -> do
     class ::A; end
   end
+
+  module IncludedInObjectWithClass
+    class IncludedClassSpecs
+    end
+  end
 end
 
 class Class
@@ -137,6 +142,8 @@ def example_instance_method_of_singleton_class; end
   def self.example_class_method_of_singleton_class; end
 end
 class Object
+  include ClassSpecs::IncludedInObjectWithClass
+
   def example_instance_method_of_object; end
   def self.example_class_method_of_object; end
 end

language/class_spec.rb

@@ -46,7 +46,14 @@ class ClassSpecsKeywordWithSemicolon; end
     -> {
       class ClassSpecsNumber
       end
-    }.should raise_error(TypeError)
+    }.should raise_error(TypeError, /\AClassSpecsNumber is not a class/)
+  end
+
+  it "raises TypeError if constant given as class name exists and is not a Class" do
+    -> {
+      class ClassSpecs::IncludedInObjectWithClass
+      end
+    }.should raise_error(TypeError, /\AIncludedInObjectWithClass is not a class/)
   end
 
   # test case known to be detecting bugs (JRuby, MRI)
@@ -346,6 +353,11 @@ def self.m
     ClassSpecs::M.m.should == 1
     ClassSpecs::L.singleton_class.send(:remove_method, :m)
   end
+
+  it "does not reopen a class included in Object" do
+    class IncludedClassSpecs; end
+    ClassSpecs::IncludedInObjectWithClass::IncludedClassSpecs.should_not == Object::IncludedClassSpecs
+  end
 end
 
 describe "class provides hooks" do