1 files changed, 49 insertions, 26 deletions

diff --git a/spec/ruby/language/module_spec.rb b/spec/ruby/language/module_spec.rb
index fffcf9c90d..2f22e383d5 100644
--- a/spec/ruby/language/module_spec.rb
+++ b/spec/ruby/language/module_spec.rb
@@ -4,78 +4,99 @@ require_relative 'fixtures/module'
 describe "The module keyword" do
   it "creates a new module without semicolon" do
     module ModuleSpecsKeywordWithoutSemicolon end
-    ModuleSpecsKeywordWithoutSemicolon.should be_an_instance_of(Module)
+    ModuleSpecsKeywordWithoutSemicolon.should.instance_of?(Module)
   end
 
   it "creates a new module with a non-qualified constant name" do
     module ModuleSpecsToplevel; end
-    ModuleSpecsToplevel.should be_an_instance_of(Module)
+    ModuleSpecsToplevel.should.instance_of?(Module)
   end
 
   it "creates a new module with a qualified constant name" do
     module ModuleSpecs::Nested; end
-    ModuleSpecs::Nested.should be_an_instance_of(Module)
+    ModuleSpecs::Nested.should.instance_of?(Module)
   end
 
   it "creates a new module with a variable qualified constant name" do
     m = Module.new
     module m::N; end
-    m::N.should be_an_instance_of(Module)
+    m::N.should.instance_of?(Module)
   end
 
   it "reopens an existing module" do
     module ModuleSpecs; Reopened = true; end
-    ModuleSpecs::Reopened.should be_true
-  end
-
-  ruby_version_is '3.2' do
-    it "does not reopen a module included in Object" do
-      module IncludedModuleSpecs; Reopened = true; end
-      ModuleSpecs::IncludedInObject::IncludedModuleSpecs.should_not == Object::IncludedModuleSpecs
-    end
-  end
-
-  ruby_version_is ''...'3.2' do
-    it "reopens a module included in Object" do
-      module IncludedModuleSpecs; Reopened = true; end
-      ModuleSpecs::IncludedInObject::IncludedModuleSpecs::Reopened.should be_true
-    end
+    ModuleSpecs::Reopened.should == true
+  ensure
+    ModuleSpecs.send(:remove_const, :Reopened)
+  end
+
+  it "does not reopen a module included in Object" do
+    ruby_exe(<<~RUBY).should == "false"
+      module IncludedInObject
+        module IncludedModule; end
+      end
+      class Object
+        include IncludedInObject
+      end
+      module IncludedModule; end
+      print IncludedInObject::IncludedModule == Object::IncludedModule
+    RUBY
+  end
+
+  it "does not reopen a module included in non-Object modules" do
+    ruby_exe(<<~RUBY).should == "false/false"
+      module Included
+        module IncludedModule; end
+      end
+      module M
+        include Included
+        module IncludedModule; end
+      end
+      class C
+        include Included
+        module IncludedModule; end
+      end
+      print Included::IncludedModule == M::IncludedModule, "/",
+            Included::IncludedModule == C::IncludedModule
+    RUBY
   end
 
   it "raises a TypeError if the constant is a Class" do
     -> do
       module ModuleSpecs::Modules::Klass; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is a String" do
-    -> { module ModuleSpecs::Modules::A; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::A; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is an Integer" do
-    -> { module ModuleSpecs::Modules::B; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::B; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is nil" do
-    -> { module ModuleSpecs::Modules::C; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::C; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is true" do
-    -> { module ModuleSpecs::Modules::D; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::D; end }.should.raise(TypeError)
   end
 
   it "raises a TypeError if the constant is false" do
-    -> { module ModuleSpecs::Modules::D; end }.should raise_error(TypeError)
+    -> { module ModuleSpecs::Modules::D; end }.should.raise(TypeError)
   end
 end
 
 describe "Assigning an anonymous module to a constant" do
   it "sets the name of the module" do
     mod = Module.new
-    mod.name.should be_nil
+    mod.name.should == nil
 
     ::ModuleSpecs_CS1 = mod
     mod.name.should == "ModuleSpecs_CS1"
+  ensure
+    Object.send(:remove_const, :ModuleSpecs_CS1)
   end
 
   it "sets the name of a module scoped by an anonymous module" do
@@ -96,5 +117,7 @@ describe "Assigning an anonymous module to a constant" do
     b.name.should == "ModuleSpecs_CS2::B"
     c.name.should == "ModuleSpecs_CS2::B::C"
     d.name.should == "ModuleSpecs_CS2::D"
+  ensure
+    Object.send(:remove_const, :ModuleSpecs_CS2)
   end
 end