1 files changed, 53 insertions, 111 deletions
diff --git a/spec/ruby/core/module/refine_spec.rb b/spec/ruby/core/module/refine_spec.rb
index f6751a42da..11085c325b 100644
--- a/spec/ruby/core/module/refine_spec.rb
+++ b/spec/ruby/core/module/refine_spec.rb
@@ -71,7 +71,7 @@ describe "Module#refine" do
       Module.new do
         refine("foo") {}
       end
-    end.should raise_error(TypeError)
+    end.should raise_error(TypeError, "wrong argument type String (expected Class or Module)")
   end
 
   it "accepts a module as argument" do
@@ -243,28 +243,30 @@ describe "Module#refine" do
       result.should == "foo from singleton class"
     end
 
-    it "looks in the included modules for builtin methods" do
-      result = ruby_exe(<<-RUBY)
-        a = Module.new do
-          def /(other) quo(other) end
-        end
+    ruby_version_is ""..."3.2" do
+      it "looks in the included modules for builtin methods" do
+          result = ruby_exe(<<-RUBY)
+          a = Module.new do
+            def /(other) quo(other) end
+          end
 
-        refinement = Module.new do
-          refine Integer do
-            include a
+          refinement = Module.new do
+            refine Integer do
+              include a
+            end
           end
-        end
 
-        result = nil
-        Module.new do
-          using refinement
-          result = 1 / 2
-        end
+          result = nil
+          Module.new do
+            using refinement
+            result = 1 / 2
+          end
 
-        print result.class
-      RUBY
+          print result.class
+        RUBY
 
-      result.should == 'Rational'
+        result.should == 'Rational'
+      end
     end
 
     it "looks in later included modules of the refined module first" do
@@ -516,115 +518,55 @@ describe "Module#refine" do
       result.should == "hello from refinement"
     end
 
-    ruby_version_is "" ... "2.7" do
-      it "is not honored by Kernel#method" do
-        klass = Class.new
-        refinement = Module.new do
-          refine klass do
-            def foo; end
-          end
+    it "is honored by Kernel#method" do
+      klass = Class.new
+      refinement = Module.new do
+        refine klass do
+          def foo; end
         end
-
-        -> {
-          Module.new do
-            using refinement
-            klass.new.method(:foo)
-          end
-        }.should raise_error(NameError, /undefined method `foo'/)
       end
-    end
-
-    ruby_version_is "2.7" do
-      it "is honored by Kernel#method" do
-        klass = Class.new
-        refinement = Module.new do
-          refine klass do
-            def foo; end
-          end
-        end
 
-        result = nil
-        Module.new do
-          using refinement
-          result = klass.new.method(:foo).class
-        end
-
-        result.should == Method
+      result = nil
+      Module.new do
+        using refinement
+        result = klass.new.method(:foo).class
       end
-    end
 
-    ruby_version_is "" ... "2.7" do
-      it "is not honored by Kernel#public_method" do
-        klass = Class.new
-        refinement = Module.new do
-          refine klass do
-            def foo; end
-          end
-        end
-
-        -> {
-          Module.new do
-            using refinement
-            klass.new.public_method(:foo)
-          end
-        }.should raise_error(NameError, /undefined method `foo'/)
-      end
+      result.should == Method
     end
 
-    ruby_version_is "2.7" do
-      it "is honored by Kernel#public_method" do
-        klass = Class.new
-        refinement = Module.new do
-          refine klass do
-            def foo; end
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-          result = klass.new.public_method(:foo).class
+    it "is honored by Kernel#public_method" do
+      klass = Class.new
+      refinement = Module.new do
+        refine klass do
+          def foo; end
         end
-
-        result.should == Method
       end
-    end
 
-    ruby_version_is "" ... "2.7" do
-      it "is not honored by Kernel#instance_method" do
-        klass = Class.new
-        refinement = Module.new do
-          refine klass do
-            def foo; end
-          end
-        end
-
-        -> {
-          Module.new do
-            using refinement
-            klass.instance_method(:foo)
-          end
-        }.should raise_error(NameError, /undefined method `foo'/)
+      result = nil
+      Module.new do
+        using refinement
+        result = klass.new.public_method(:foo).class
       end
-    end
 
-    ruby_version_is "2.7" do
-      it "is honored by Kernel#instance_method" do
-        klass = Class.new
-        refinement = Module.new do
-          refine klass do
-            def foo; end
-          end
-        end
+      result.should == Method
+    end
 
-        result = nil
-        Module.new do
-          using refinement
-          result = klass.instance_method(:foo).class
+    it "is honored by Kernel#instance_method" do
+      klass = Class.new
+      refinement = Module.new do
+        refine klass do
+          def foo; end
         end
+      end
 
-        result.should == UnboundMethod
+      result = nil
+      Module.new do
+        using refinement
+        result = klass.instance_method(:foo).class
       end
+
+      result.should == UnboundMethod
     end
 
     it "is honored by Kernel#respond_to?" do