7 files changed, 21 insertions, 102 deletions
diff --git a/spec/ruby/core/method/owner_spec.rb b/spec/ruby/core/method/owner_spec.rb
index 05422f1697..1cdc4edfa7 100644
--- a/spec/ruby/core/method/owner_spec.rb
+++ b/spec/ruby/core/method/owner_spec.rb
@@ -24,9 +24,7 @@ describe "Method#owner" do
     end
   end
 
-  ruby_version_is "3.2" do
-    it "returns the class on which public was called for a private method in ancestor" do
-      MethodSpecs::InheritedMethods::C.new.method(:derp).owner.should == MethodSpecs::InheritedMethods::C
-    end
+  it "returns the class on which public was called for a private method in ancestor" do
+    MethodSpecs::InheritedMethods::C.new.method(:derp).owner.should == MethodSpecs::InheritedMethods::C
   end
 end
diff --git a/spec/ruby/core/method/parameters_spec.rb b/spec/ruby/core/method/parameters_spec.rb
index 0178a61de6..f1c2523cf0 100644
--- a/spec/ruby/core/method/parameters_spec.rb
+++ b/spec/ruby/core/method/parameters_spec.rb
@@ -233,28 +233,14 @@ describe "Method#parameters" do
     m.method(:handled_via_method_missing).parameters.should == [[:rest]]
   end
 
-  ruby_version_is '3.2' do
-    it "adds rest arg with name * for \"star\" argument" do
-      m = MethodSpecs::Methods.new
-      m.method(:one_unnamed_splat).parameters.should == [[:rest, :*]]
-    end
-
-    it "adds keyrest arg with ** as a name for \"double star\" argument" do
-      m = MethodSpecs::Methods.new
-      m.method(:one_unnamed_keyrest).parameters.should == [[:keyrest, :**]]
-    end
+  it "adds rest arg with name * for \"star\" argument" do
+    m = MethodSpecs::Methods.new
+    m.method(:one_unnamed_splat).parameters.should == [[:rest, :*]]
   end
 
-  ruby_version_is ''...'3.2' do
-    it "adds nameless rest arg for \"star\" argument" do
-      m = MethodSpecs::Methods.new
-      m.method(:one_unnamed_splat).parameters.should == [[:rest]]
-    end
-
-    it "adds nameless keyrest arg for \"double star\" argument" do
-      m = MethodSpecs::Methods.new
-      m.method(:one_unnamed_keyrest).parameters.should == [[:keyrest]]
-    end
+  it "adds keyrest arg with ** as a name for \"double star\" argument" do
+    m = MethodSpecs::Methods.new
+    m.method(:one_unnamed_keyrest).parameters.should == [[:keyrest, :**]]
   end
 
   it "adds block arg with name & for anonymous block argument" do
diff --git a/spec/ruby/core/method/private_spec.rb b/spec/ruby/core/method/private_spec.rb
index 9b67a77243..e708542b2e 100644
--- a/spec/ruby/core/method/private_spec.rb
+++ b/spec/ruby/core/method/private_spec.rb
@@ -2,27 +2,8 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Method#private?" do
-  ruby_version_is ""..."3.2" do
-    it "returns false when the method is public" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_public_method).private?.should == false
-    end
-
-    it "returns false when the method is protected" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_protected_method).private?.should == false
-    end
-
-    it "returns true when the method is private" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_private_method).private?.should == true
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_private_method).should_not.respond_to?(:private?)
-    end
+  it "has been removed" do
+    obj = MethodSpecs::Methods.new
+    obj.method(:my_private_method).should_not.respond_to?(:private?)
   end
 end
diff --git a/spec/ruby/core/method/protected_spec.rb b/spec/ruby/core/method/protected_spec.rb
index 28c60c7536..f9e422ae3d 100644
--- a/spec/ruby/core/method/protected_spec.rb
+++ b/spec/ruby/core/method/protected_spec.rb
@@ -2,27 +2,8 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Method#protected?" do
-  ruby_version_is ""..."3.2" do
-    it "returns false when the method is public" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_public_method).protected?.should == false
-    end
-
-    it "returns true when the method is protected" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_protected_method).protected?.should == true
-    end
-
-    it "returns false when the method is private" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_private_method).protected?.should == false
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_protected_method).should_not.respond_to?(:protected?)
-    end
+  it "has been removed" do
+    obj = MethodSpecs::Methods.new
+    obj.method(:my_protected_method).should_not.respond_to?(:protected?)
   end
 end
diff --git a/spec/ruby/core/method/public_spec.rb b/spec/ruby/core/method/public_spec.rb
index 4844f4b90b..4cb23f4cf1 100644
--- a/spec/ruby/core/method/public_spec.rb
+++ b/spec/ruby/core/method/public_spec.rb
@@ -2,27 +2,8 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Method#public?" do
-  ruby_version_is ""..."3.2" do
-    it "returns true when the method is public" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_public_method).public?.should == true
-    end
-
-    it "returns false when the method is protected" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_protected_method).public?.should == false
-    end
-
-    it "returns false when the method is private" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_private_method).public?.should == false
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_public_method).should_not.respond_to?(:public?)
-    end
+  it "has been removed" do
+    obj = MethodSpecs::Methods.new
+    obj.method(:my_public_method).should_not.respond_to?(:public?)
   end
 end
diff --git a/spec/ruby/core/method/source_location_spec.rb b/spec/ruby/core/method/source_location_spec.rb
index 23d956ebec..87413a2ab6 100644
--- a/spec/ruby/core/method/source_location_spec.rb
+++ b/spec/ruby/core/method/source_location_spec.rb
@@ -109,10 +109,10 @@ describe "Method#source_location" do
       eval('def self.m; end', nil, "foo", 100)
     end
     location = c.method(:m).source_location
-    ruby_version_is(""..."3.5") do
+    ruby_version_is(""..."4.1") do
       location.should == ["foo", 100]
     end
-    ruby_version_is("3.5") do
+    ruby_version_is("4.1") do
       location.should == ["foo", 100, 0, 100, 15]
     end
   end
diff --git a/spec/ruby/core/method/unbind_spec.rb b/spec/ruby/core/method/unbind_spec.rb
index bdedd513ce..0b630e4d88 100644
--- a/spec/ruby/core/method/unbind_spec.rb
+++ b/spec/ruby/core/method/unbind_spec.rb
@@ -27,16 +27,8 @@ describe "Method#unbind" do
       @string.should =~ /MethodSpecs::MyMod/
     end
 
-    ruby_version_is ""..."3.2" do
-      it "returns a String containing the Module the method is referenced from" do
-        @string.should =~ /MethodSpecs::MySub/
-      end
-    end
-
-    ruby_version_is "3.2" do
-      it "returns a String containing the Module the method is referenced from" do
-        @string.should =~ /MethodSpecs::MyMod/
-      end
+    it "returns a String containing the Module the method is referenced from" do
+      @string.should =~ /MethodSpecs::MyMod/
     end
   end