Remove version guards for 3.0 since it is now the minimum

command_line/backtrace_limit_spec.rb

@@ -1,48 +1,46 @@
 require_relative '../spec_helper'
 
-ruby_version_is "3.0" do
-  describe "The --backtrace-limit command line option" do
-    it "limits top-level backtraces to a given number of entries" do
-      file = fixture(__FILE__ , "backtrace.rb")
-      out = ruby_exe(file, options: "--backtrace-limit=2", args: "top 2>&1", exit_status: 1)
-      out = out.gsub(__dir__, '')
+describe "The --backtrace-limit command line option" do
+  it "limits top-level backtraces to a given number of entries" do
+    file = fixture(__FILE__ , "backtrace.rb")
+    out = ruby_exe(file, options: "--backtrace-limit=2", args: "top 2>&1", exit_status: 1)
+    out = out.gsub(__dir__, '')
 
-      out.should == <<-MSG
+    out.should == <<-MSG
 top
 /fixtures/backtrace.rb:2:in `a': oops (RuntimeError)
 \tfrom /fixtures/backtrace.rb:6:in `b'
 \tfrom /fixtures/backtrace.rb:10:in `c'
 \t ... 2 levels...
-      MSG
-    end
+    MSG
+  end
 
-    it "affects Exception#full_message" do
-      file = fixture(__FILE__ , "backtrace.rb")
-      out = ruby_exe(file, options: "--backtrace-limit=2", args: "full_message 2>&1")
-      out = out.gsub(__dir__, '')
+  it "affects Exception#full_message" do
+    file = fixture(__FILE__ , "backtrace.rb")
+    out = ruby_exe(file, options: "--backtrace-limit=2", args: "full_message 2>&1")
+    out = out.gsub(__dir__, '')
 
-      out.should == <<-MSG
+    out.should == <<-MSG
 full_message
 /fixtures/backtrace.rb:2:in `a': oops (RuntimeError)
 \tfrom /fixtures/backtrace.rb:6:in `b'
 \tfrom /fixtures/backtrace.rb:10:in `c'
 \t ... 2 levels...
-      MSG
-    end
+    MSG
+  end
 
-    it "does not affect Exception#backtrace" do
-      file = fixture(__FILE__ , "backtrace.rb")
-      out = ruby_exe(file, options: "--backtrace-limit=2", args: "backtrace 2>&1")
-      out = out.gsub(__dir__, '')
+  it "does not affect Exception#backtrace" do
+    file = fixture(__FILE__ , "backtrace.rb")
+    out = ruby_exe(file, options: "--backtrace-limit=2", args: "backtrace 2>&1")
+    out = out.gsub(__dir__, '')
 
-      out.should == <<-MSG
+    out.should == <<-MSG
 backtrace
 /fixtures/backtrace.rb:2:in `a'
 /fixtures/backtrace.rb:6:in `b'
 /fixtures/backtrace.rb:10:in `c'
 /fixtures/backtrace.rb:14:in `d'
 /fixtures/backtrace.rb:29:in `<main>'
-      MSG
-    end
+    MSG
   end
 end

core/array/drop_spec.rb

@@ -50,15 +50,7 @@
     -> { [1, 2].drop(obj) }.should raise_error(TypeError)
   end
 
-  ruby_version_is ''...'3.0' do
-    it 'returns a subclass instance for Array subclasses' do
-      ArraySpecs::MyArray[1, 2, 3, 4, 5].drop(1).should be_an_instance_of(ArraySpecs::MyArray)
-    end
-  end
-
-  ruby_version_is '3.0' do
-    it 'returns a Array instance for Array subclasses' do
-      ArraySpecs::MyArray[1, 2, 3, 4, 5].drop(1).should be_an_instance_of(Array)
-    end
+  it 'returns a Array instance for Array subclasses' do
+    ArraySpecs::MyArray[1, 2, 3, 4, 5].drop(1).should be_an_instance_of(Array)
   end
 end

core/array/drop_while_spec.rb

@@ -18,15 +18,7 @@
     [1, 2, 3, false, 5].drop_while { |n| n }.should == [false, 5]
   end
 
-  ruby_version_is ''...'3.0' do
-    it 'returns a subclass instance for Array subclasses' do
-      ArraySpecs::MyArray[1, 2, 3, 4, 5].drop_while { |n| n < 4 }.should be_an_instance_of(ArraySpecs::MyArray)
-    end
-  end
-
-  ruby_version_is '3.0' do
-    it 'returns a Array instance for Array subclasses' do
-      ArraySpecs::MyArray[1, 2, 3, 4, 5].drop_while { |n| n < 4 }.should be_an_instance_of(Array)
-    end
+  it 'returns a Array instance for Array subclasses' do
+    ArraySpecs::MyArray[1, 2, 3, 4, 5].drop_while { |n| n < 4 }.should be_an_instance_of(Array)
   end
 end

core/array/flatten_spec.rb

@@ -75,24 +75,12 @@
     [[obj]].flatten(1)
   end
 
-  ruby_version_is ''...'3.0' do
-    it "returns subclass instance for Array subclasses" do
-      ArraySpecs::MyArray[].flatten.should be_an_instance_of(ArraySpecs::MyArray)
-      ArraySpecs::MyArray[1, 2, 3].flatten.should be_an_instance_of(ArraySpecs::MyArray)
-      ArraySpecs::MyArray[1, [2], 3].flatten.should be_an_instance_of(ArraySpecs::MyArray)
-      ArraySpecs::MyArray[1, [2, 3], 4].flatten.should == ArraySpecs::MyArray[1, 2, 3, 4]
-      [ArraySpecs::MyArray[1, 2, 3]].flatten.should be_an_instance_of(Array)
-    end
-  end
-
-  ruby_version_is '3.0' do
-    it "returns Array instance for Array subclasses" do
-      ArraySpecs::MyArray[].flatten.should be_an_instance_of(Array)
-      ArraySpecs::MyArray[1, 2, 3].flatten.should be_an_instance_of(Array)
-      ArraySpecs::MyArray[1, [2], 3].flatten.should be_an_instance_of(Array)
-      ArraySpecs::MyArray[1, [2, 3], 4].flatten.should == [1, 2, 3, 4]
-      [ArraySpecs::MyArray[1, 2, 3]].flatten.should be_an_instance_of(Array)
-    end
+  it "returns Array instance for Array subclasses" do
+    ArraySpecs::MyArray[].flatten.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, 2, 3].flatten.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, [2], 3].flatten.should be_an_instance_of(Array)
+    ArraySpecs::MyArray[1, [2, 3], 4].flatten.should == [1, 2, 3, 4]
+    [ArraySpecs::MyArray[1, 2, 3]].flatten.should be_an_instance_of(Array)
   end
 
   it "is not destructive" do

core/array/multiply_spec.rb

@@ -76,20 +76,10 @@ def obj.to_str() "2" end
       @array = ArraySpecs::MyArray[1, 2, 3, 4, 5]
     end
 
-    ruby_version_is ''...'3.0' do
-      it "returns a subclass instance" do
-        (@array * 0).should be_an_instance_of(ArraySpecs::MyArray)
-        (@array * 1).should be_an_instance_of(ArraySpecs::MyArray)
-        (@array * 2).should be_an_instance_of(ArraySpecs::MyArray)
-      end
-    end
-
-    ruby_version_is '3.0' do
-      it "returns an Array instance" do
-        (@array * 0).should be_an_instance_of(Array)
-        (@array * 1).should be_an_instance_of(Array)
-        (@array * 2).should be_an_instance_of(Array)
-      end
+    it "returns an Array instance" do
+      (@array * 0).should be_an_instance_of(Array)
+      (@array * 1).should be_an_instance_of(Array)
+      (@array * 2).should be_an_instance_of(Array)
     end
 
     it "does not call #initialize on the subclass instance" do