Remove guards for Ruby 3.1

Author: andrykonchin

core/array/intersect_spec.rb

@@ -2,65 +2,63 @@
 require_relative 'fixtures/classes'
 
 describe 'Array#intersect?' do
-  ruby_version_is '3.1' do # https://bugs.ruby-lang.org/issues/15198
-    describe 'when at least one element in two Arrays is the same' do
-      it 'returns true' do
-        [1, 2].intersect?([2, 3, 4]).should == true
-        [2, 3, 4].intersect?([1, 2]).should == true
-      end
+  describe 'when at least one element in two Arrays is the same' do
+    it 'returns true' do
+      [1, 2].intersect?([2, 3, 4]).should == true
+      [2, 3, 4].intersect?([1, 2]).should == true
     end
+  end
 
-    describe 'when there are no elements in common between two Arrays' do
-      it 'returns false' do
-        [0, 1, 2].intersect?([3, 4]).should == false
-        [3, 4].intersect?([0, 1, 2]).should == false
-        [3, 4].intersect?([]).should == false
-        [].intersect?([0, 1, 2]).should == false
-      end
+  describe 'when there are no elements in common between two Arrays' do
+    it 'returns false' do
+      [0, 1, 2].intersect?([3, 4]).should == false
+      [3, 4].intersect?([0, 1, 2]).should == false
+      [3, 4].intersect?([]).should == false
+      [].intersect?([0, 1, 2]).should == false
     end
+  end
 
-    it "tries to convert the passed argument to an Array using #to_ary" do
-      obj = mock('[1,2,3]')
-      obj.should_receive(:to_ary).and_return([1, 2, 3])
+  it "tries to convert the passed argument to an Array using #to_ary" do
+    obj = mock('[1,2,3]')
+    obj.should_receive(:to_ary).and_return([1, 2, 3])
 
-      [1, 2].intersect?(obj).should == true
-    end
+    [1, 2].intersect?(obj).should == true
+  end
 
-    it "determines equivalence between elements in the sense of eql?" do
-      obj1 = mock('1')
-      obj2 = mock('2')
-      obj1.stub!(:hash).and_return(0)
-      obj2.stub!(:hash).and_return(0)
-      obj1.stub!(:eql?).and_return(true)
-      obj2.stub!(:eql?).and_return(true)
+  it "determines equivalence between elements in the sense of eql?" do
+    obj1 = mock('1')
+    obj2 = mock('2')
+    obj1.stub!(:hash).and_return(0)
+    obj2.stub!(:hash).and_return(0)
+    obj1.stub!(:eql?).and_return(true)
+    obj2.stub!(:eql?).and_return(true)
 
-      [obj1].intersect?([obj2]).should == true
+    [obj1].intersect?([obj2]).should == true
 
-      obj1 = mock('3')
-      obj2 = mock('4')
-      obj1.stub!(:hash).and_return(0)
-      obj2.stub!(:hash).and_return(0)
-      obj1.stub!(:eql?).and_return(false)
-      obj2.stub!(:eql?).and_return(false)
+    obj1 = mock('3')
+    obj2 = mock('4')
+    obj1.stub!(:hash).and_return(0)
+    obj2.stub!(:hash).and_return(0)
+    obj1.stub!(:eql?).and_return(false)
+    obj2.stub!(:eql?).and_return(false)
 
-      [obj1].intersect?([obj2]).should == false
-    end
+    [obj1].intersect?([obj2]).should == false
+  end
 
-    it "does not call to_ary on array subclasses" do
-      [5, 6].intersect?(ArraySpecs::ToAryArray[1, 2, 5, 6]).should == true
-    end
+  it "does not call to_ary on array subclasses" do
+    [5, 6].intersect?(ArraySpecs::ToAryArray[1, 2, 5, 6]).should == true
+  end
 
-    it "properly handles an identical item even when its #eql? isn't reflexive" do
-      x = mock('x')
-      x.stub!(:hash).and_return(42)
-      x.stub!(:eql?).and_return(false) # Stubbed for clarity and latitude in implementation; not actually sent by MRI.
+  it "properly handles an identical item even when its #eql? isn't reflexive" do
+    x = mock('x')
+    x.stub!(:hash).and_return(42)
+    x.stub!(:eql?).and_return(false) # Stubbed for clarity and latitude in implementation; not actually sent by MRI.
 
-      [x].intersect?([x]).should == true
-    end
+    [x].intersect?([x]).should == true
+  end
 
-    it "has semantic of !(a & b).empty?" do
-      [].intersect?([]).should == false
-      [nil].intersect?([nil]).should == true
-    end
+  it "has semantic of !(a & b).empty?" do
+    [].intersect?([]).should == false
+    [nil].intersect?([nil]).should == true
   end
 end

core/basicobject/instance_eval_spec.rb

@@ -141,22 +141,11 @@ class B; end
       caller.get_constant_with_string(receiver).should == :singleton_class
     end
 
-    ruby_version_is ""..."3.1" do
-      it "looks in the caller scope next" do
-        receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
-        caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
+    it "looks in the receiver class next" do
+      receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
+      caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
 
-        caller.get_constant_with_string(receiver).should == :Caller
-      end
-    end
-
-    ruby_version_is "3.1" do
-      it "looks in the receiver class next" do
-        receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
-        caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
-
-        caller.get_constant_with_string(receiver).should == :Receiver
-      end
+      caller.get_constant_with_string(receiver).should == :Receiver
     end
 
     it "looks in the caller class next" do

core/class/subclasses_spec.rb

@@ -1,87 +1,85 @@
 require_relative '../../spec_helper'
 require_relative '../module/fixtures/classes'
 
-ruby_version_is '3.1' do
-  describe "Class#subclasses" do
-    it "returns a list of classes directly inheriting from self" do
-      assert_subclasses(ModuleSpecs::Parent, [ModuleSpecs::Child, ModuleSpecs::Child2])
-    end
+describe "Class#subclasses" do
+  it "returns a list of classes directly inheriting from self" do
+    assert_subclasses(ModuleSpecs::Parent, [ModuleSpecs::Child, ModuleSpecs::Child2])
+  end
 
-    it "does not return included modules from the parent" do
-      parent = Class.new
-      child = Class.new(parent)
-      mod = Module.new
-      parent.include(mod)
+  it "does not return included modules from the parent" do
+    parent = Class.new
+    child = Class.new(parent)
+    mod = Module.new
+    parent.include(mod)
 
-      assert_subclasses(parent, [child])
-    end
-
-    it "does not return included modules from the child" do
-      parent = Class.new
-      child = Class.new(parent)
-      mod = Module.new
-      parent.include(mod)
+    assert_subclasses(parent, [child])
+  end
 
-      assert_subclasses(parent, [child])
-    end
+  it "does not return included modules from the child" do
+    parent = Class.new
+    child = Class.new(parent)
+    mod = Module.new
+    parent.include(mod)
 
-    it "does not return prepended modules from the parent" do
-      parent = Class.new
-      child = Class.new(parent)
-      mod = Module.new
-      parent.prepend(mod)
+    assert_subclasses(parent, [child])
+  end
 
-      assert_subclasses(parent, [child])
-    end
+  it "does not return prepended modules from the parent" do
+    parent = Class.new
+    child = Class.new(parent)
+    mod = Module.new
+    parent.prepend(mod)
 
-    it "does not return prepended modules from the child" do
-      parent = Class.new
-      child = Class.new(parent)
-      mod = Module.new
-      child.prepend(mod)
+    assert_subclasses(parent, [child])
+  end
 
-      assert_subclasses(parent, [child])
-    end
+  it "does not return prepended modules from the child" do
+    parent = Class.new
+    child = Class.new(parent)
+    mod = Module.new
+    child.prepend(mod)
 
-    it "does not return singleton classes" do
-      a = Class.new
+    assert_subclasses(parent, [child])
+  end
 
-      a_obj = a.new
-      def a_obj.force_singleton_class
-        42
-      end
+  it "does not return singleton classes" do
+    a = Class.new
 
-      a.subclasses.should_not include(a_obj.singleton_class)
+    a_obj = a.new
+    def a_obj.force_singleton_class
+      42
     end
 
-    it "has 1 entry per module or class" do
-      ModuleSpecs::Parent.subclasses.should == ModuleSpecs::Parent.subclasses.uniq
-    end
+    a.subclasses.should_not include(a_obj.singleton_class)
+  end
+
+  it "has 1 entry per module or class" do
+    ModuleSpecs::Parent.subclasses.should == ModuleSpecs::Parent.subclasses.uniq
+  end
 
-    it "works when creating subclasses concurrently" do
-      t = 16
-      n = 1000
-      go = false
-      superclass = Class.new
-
-      threads = t.times.map do
-        Thread.new do
-          Thread.pass until go
-          n.times.map do
-            Class.new(superclass)
-          end
+  it "works when creating subclasses concurrently" do
+    t = 16
+    n = 1000
+    go = false
+    superclass = Class.new
+
+    threads = t.times.map do
+      Thread.new do
+        Thread.pass until go
+        n.times.map do
+          Class.new(superclass)
         end
       end
+    end
 
-      go = true
-      classes = threads.map(&:value)
+    go = true
+    classes = threads.map(&:value)
 
-      superclass.subclasses.size.should == t * n
-      superclass.subclasses.each { |c| c.should be_kind_of(Class) }
-    end
+    superclass.subclasses.size.should == t * n
+    superclass.subclasses.each { |c| c.should be_kind_of(Class) }
+  end
 
-    def assert_subclasses(mod,subclasses)
-      mod.subclasses.sort_by(&:inspect).should == subclasses.sort_by(&:inspect)
-    end
+  def assert_subclasses(mod,subclasses)
+    mod.subclasses.sort_by(&:inspect).should == subclasses.sort_by(&:inspect)
   end
 end

core/dir/glob_spec.rb

@@ -89,31 +89,15 @@
     Dir.glob('**/', File::FNM_DOTMATCH).sort.should == expected
   end
 
-  ruby_version_is ''...'3.1' do
-    it "recursively matches files and directories in nested dot subdirectory with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
-      expected = %w[
-        nested/.
-        nested/.dotsubir
-        nested/.dotsubir/.
-        nested/.dotsubir/.dotfile
-        nested/.dotsubir/nondotfile
-      ]
-
-      Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "recursively matches files and directories in nested dot subdirectory except . with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
-      expected = %w[
-        nested/.
-        nested/.dotsubir
-        nested/.dotsubir/.dotfile
-        nested/.dotsubir/nondotfile
-      ]
+  it "recursively matches files and directories in nested dot subdirectory except . with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
+    expected = %w[
+      nested/.
+      nested/.dotsubir
+      nested/.dotsubir/.dotfile
+      nested/.dotsubir/nondotfile
+    ]
 
-      Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
-    end
+    Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
   end
 
   # This is a separate case to check **/ coming after a constant
@@ -260,34 +244,31 @@
     Dir.glob('**/.*', base: "deeply/nested").sort.should == expected
   end
 
-  # < 3.1 include a "." entry for every dir: ["directory/.", "directory/structure/.", ...]
-  ruby_version_is '3.1' do
-    it "handles **/.* with base keyword argument and FNM_DOTMATCH" do
-      expected = %w[
-        .
-        .dotfile.ext
-        directory/structure/.ext
-      ].sort
+  it "handles **/.* with base keyword argument and FNM_DOTMATCH" do
+    expected = %w[
+      .
+      .dotfile.ext
+      directory/structure/.ext
+    ].sort
 
-      Dir.glob('**/.*', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
-    end
+    Dir.glob('**/.*', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
+  end
 
-    it "handles **/** with base keyword argument and FNM_DOTMATCH" do
-      expected = %w[
-        .
-        .dotfile.ext
-        directory
-        directory/structure
-        directory/structure/.ext
-        directory/structure/bar
-        directory/structure/baz
-        directory/structure/file_one
-        directory/structure/file_one.ext
-        directory/structure/foo
-      ].sort
-
-      Dir.glob('**/**', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
-    end
+  it "handles **/** with base keyword argument and FNM_DOTMATCH" do
+    expected = %w[
+      .
+      .dotfile.ext
+      directory
+      directory/structure
+      directory/structure/.ext
+      directory/structure/bar
+      directory/structure/baz
+      directory/structure/file_one
+      directory/structure/file_one.ext
+      directory/structure/foo
+    ].sort
+
+    Dir.glob('**/**', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
   end
 
   it "handles **/*pattern* with base keyword argument and FNM_DOTMATCH" do