Drop support for ruby 2.4 from ruby/spec

9 files changed, 27 insertions, 105 deletions

diff --git a/spec/ruby/core/module/alias_method_spec.rb b/spec/ruby/core/module/alias_method_spec.rb
index b47ddc22d4..742e289a3f 100644
--- a/spec/ruby/core/module/alias_method_spec.rb
+++ b/spec/ruby/core/module/alias_method_spec.rb
@@ -81,15 +81,8 @@ describe "Module#alias_method" do
     -> { @class.make_alias mock('x'), :public_one }.should raise_error(TypeError)
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      -> { @class.alias_method :ichi, :public_one }.should raise_error(NoMethodError)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:alias_method, false)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:alias_method, false)
   end
 
   it "returns self" do
diff --git a/spec/ruby/core/module/attr_accessor_spec.rb b/spec/ruby/core/module/attr_accessor_spec.rb
index ce95ccd487..6a749341be 100644
--- a/spec/ruby/core/module/attr_accessor_spec.rb
+++ b/spec/ruby/core/module/attr_accessor_spec.rb
@@ -63,15 +63,8 @@ describe "Module#attr_accessor" do
     -> { c.new.foo=1 }.should raise_error(NoMethodError)
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      Module.should have_private_instance_method(:attr_accessor, false)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:attr_accessor, false)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:attr_accessor, false)
   end
 
   describe "on immediates" do
diff --git a/spec/ruby/core/module/attr_reader_spec.rb b/spec/ruby/core/module/attr_reader_spec.rb
index 082bc03b60..238e3db9ea 100644
--- a/spec/ruby/core/module/attr_reader_spec.rb
+++ b/spec/ruby/core/module/attr_reader_spec.rb
@@ -58,14 +58,7 @@ describe "Module#attr_reader" do
     -> { c.new.foo }.should raise_error(NoMethodError)
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      Module.should have_private_instance_method(:attr_reader, false)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:attr_reader, false)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:attr_reader, false)
   end
 end
diff --git a/spec/ruby/core/module/attr_spec.rb b/spec/ruby/core/module/attr_spec.rb
index 20316a3d39..8b91e77658 100644
--- a/spec/ruby/core/module/attr_spec.rb
+++ b/spec/ruby/core/module/attr_spec.rb
@@ -142,14 +142,7 @@ describe "Module#attr" do
     }.should complain(/boolean argument is obsoleted/, verbose: true)
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      Module.should have_private_instance_method(:attr, false)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:attr, false)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:attr, false)
   end
 end
diff --git a/spec/ruby/core/module/attr_writer_spec.rb b/spec/ruby/core/module/attr_writer_spec.rb
index 3b110cecf7..e4b193a9d8 100644
--- a/spec/ruby/core/module/attr_writer_spec.rb
+++ b/spec/ruby/core/module/attr_writer_spec.rb
@@ -58,14 +58,7 @@ describe "Module#attr_writer" do
     -> { c.new.foo=1 }.should raise_error(NoMethodError)
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      Module.should have_private_instance_method(:attr_writer, false)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:attr_writer, false)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:attr_writer, false)
   end
 end
diff --git a/spec/ruby/core/module/define_method_spec.rb b/spec/ruby/core/module/define_method_spec.rb
index be61c62659..49472c18e1 100644
--- a/spec/ruby/core/module/define_method_spec.rb
+++ b/spec/ruby/core/module/define_method_spec.rb
@@ -355,15 +355,8 @@ describe "Module#define_method" do
     klass.new.string_test.should == "string_test result"
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      Module.should have_private_instance_method(:define_method)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:define_method)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:define_method)
   end
 
   it "returns its symbol" do
diff --git a/spec/ruby/core/module/refine_spec.rb b/spec/ruby/core/module/refine_spec.rb
index 81dd492362..6df4fa4719 100644
--- a/spec/ruby/core/module/refine_spec.rb
+++ b/spec/ruby/core/module/refine_spec.rb
@@ -393,44 +393,22 @@ describe "Module#refine" do
       end
     end
 
-    ruby_version_is "" ... "2.5" do
-      it "is not honored by string interpolation" do
-        refinement = Module.new do
-          refine Integer do
-            def to_s
-              "foo"
-            end
+    it "is honored by string interpolation" do
+      refinement = Module.new do
+        refine Integer do
+          def to_s
+            "foo"
           end
         end
-
-        result = nil
-        Module.new do
-          using refinement
-          result = "#{1}"
-        end
-
-        result.should == "1"
       end
-    end
-
-    ruby_version_is "2.5" do
-      it "is honored by string interpolation" do
-        refinement = Module.new do
-          refine Integer do
-            def to_s
-              "foo"
-            end
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-          result = "#{1}"
-        end
 
-        result.should == "foo"
+      result = nil
+      Module.new do
+        using refinement
+        result = "#{1}"
       end
+
+      result.should == "foo"
     end
 
     it "is honored by Kernel#binding" do
diff --git a/spec/ruby/core/module/remove_method_spec.rb b/spec/ruby/core/module/remove_method_spec.rb
index 0765c902b0..b6ae02078f 100644
--- a/spec/ruby/core/module/remove_method_spec.rb
+++ b/spec/ruby/core/module/remove_method_spec.rb
@@ -20,15 +20,8 @@ describe "Module#remove_method" do
     @module = Module.new { def method_to_remove; end }
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      Module.should have_private_instance_method(:remove_method, false)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:remove_method, false)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:remove_method, false)
   end
 
   it "removes the method from a class" do
diff --git a/spec/ruby/core/module/undef_method_spec.rb b/spec/ruby/core/module/undef_method_spec.rb
index 4eeaaef3a8..c2ad200536 100644
--- a/spec/ruby/core/module/undef_method_spec.rb
+++ b/spec/ruby/core/module/undef_method_spec.rb
@@ -18,15 +18,8 @@ describe "Module#undef_method" do
     @module = Module.new { def method_to_undef; end }
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      Module.should have_private_instance_method(:undef_method, false)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:undef_method, false)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:undef_method, false)
   end
 
   it "requires multiple arguments" do