Update to ruby/spec@3affe1e

Author: eregon

spec/ruby/.rubocop.yml

@@ -1,11 +1,12 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   DisplayCopNames: true
   Exclude:
     - command_line/fixtures/bad_syntax.rb
   DisabledByDefault: true
+  NewCops: disable
 
 Layout/TrailingWhitespace:
   Enabled: true
@@ -56,12 +57,52 @@ Lint/UnusedMethodArgument:
 Lint/UselessAssignment:
   Enabled: false
 
-Lint/UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: false
 
+Lint/EmptyConditionalBody:
+  Enabled: false # buggy
+
 Lint/Void:
   Enabled: false
 
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
+Lint/RaiseException:
+  Enabled: false
+
+Lint/FloatComparison:
+  Enabled: false
+
+Lint/DeprecatedClassMethods:
+  Enabled: false
+
+Lint/UnreachableLoop:
+  Enabled: false
+
+Lint/MissingSuper:
+  Enabled: false
+
+Lint/UselessMethodDefinition:
+  Enabled: false
+
+Lint/UselessTimes:
+  Enabled: false
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+
+Lint/DuplicateElsifCondition:
+  Enabled: false
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: false
+
+Lint/ElseLayout:
+  Exclude:
+    - 'language/if_spec.rb'
+
 Lint/EmptyExpression:
   Exclude:
     - 'language/**/*.rb'

spec/ruby/CONTRIBUTING.md

@@ -180,7 +180,7 @@ First, file a bug at https://bugs.ruby-lang.org/.
 It is better to use a `ruby_version_is` guard if there was a release with the fix.
 
 ```ruby
-ruby_bug '#13669', ''...'2.7' do
+ruby_bug '#13669', ''...'3.2' do
   it "works like this" do
     # Specify the expected behavior here, not the bug
   end

spec/ruby/README.md

@@ -31,8 +31,8 @@ ruby/spec is known to be tested in these implementations for every commit:
 * [Opal](https://github.com/opal/opal/tree/master/spec)
 * [Artichoke](https://github.com/artichoke/spec/tree/artichoke-vendor)
 
-ruby/spec describes the behavior of Ruby 2.6 and more recent Ruby versions.
-More precisely, every latest stable MRI release should [pass](https://github.com/ruby/spec/actions/workflows/ci.yml) all specs of ruby/spec (2.6.x, 2.7.x, 3.0.x, etc), and those are tested in CI.
+ruby/spec describes the behavior of Ruby 2.7 and more recent Ruby versions.
+More precisely, every latest stable MRI release should [pass](https://github.com/ruby/spec/actions/workflows/ci.yml) all specs of ruby/spec (2.7.x, 3.0.x, 3.1.x, etc), and those are tested in CI.
 
 ### Synchronization with Ruby Implementations
 
@@ -61,6 +61,7 @@ For older specs try these commits:
 * Ruby 2.3.8 - [Suite](https://github.com/ruby/spec/commit/dc733114d8ae66a3368ba3a98422c50147a76ba5) using [MSpec](https://github.com/ruby/mspec/commit/4599bc195fb109f2a482a01c32a7d659518369ea)
 * Ruby 2.4.10 - [Suite](https://github.com/ruby/spec/commit/bce4f2b81d6c31db67cf4d023a0625ceadde59bd) using [MSpec](https://github.com/ruby/mspec/commit/e7eb8aa4c26495b7b461e687d950b96eb08b3ff2)
 * Ruby 2.5.9 - [Suite](https://github.com/ruby/spec/commit/c503335d3d9f6ec6ef24de60a0716c34af69b64f) using [MSpec](https://github.com/ruby/mspec/commit/0091e8a62e954717cd54641f935eaf1403692041)
+* Ruby 2.6.10 - [Suite](https://github.com/ruby/spec/commit/aaf998fb8c92c4e63ad423a2e7ca6e6921818c6e) using [MSpec](https://github.com/ruby/mspec/commit/5e36c684e9e2b92b1187589bba1df22c640a8661)
 
 ### Running the specs
 

spec/ruby/command_line/dash_upper_w_spec.rb

@@ -19,29 +19,26 @@
   it_behaves_like :command_line_verbose, "-W2"
 end
 
-# Regarding the defaults, see core/warning/element_reference_spec.rb
-ruby_version_is "2.7" do
-  describe "The -W command line option with :deprecated" do
-    it "enables deprecation warnings" do
-      ruby_exe('p Warning[:deprecated]', options: '-W:deprecated').should == "true\n"
-    end
+describe "The -W command line option with :deprecated" do
+  it "enables deprecation warnings" do
+    ruby_exe('p Warning[:deprecated]', options: '-W:deprecated').should == "true\n"
   end
+end
 
-  describe "The -W command line option with :no-deprecated" do
-    it "suppresses deprecation warnings" do
-      ruby_exe('p Warning[:deprecated]', options: '-w -W:no-deprecated').should == "false\n"
-    end
+describe "The -W command line option with :no-deprecated" do
+  it "suppresses deprecation warnings" do
+    ruby_exe('p Warning[:deprecated]', options: '-w -W:no-deprecated').should == "false\n"
   end
+end
 
-  describe "The -W command line option with :experimental" do
-    it "enables experimental warnings" do
-      ruby_exe('p Warning[:experimental]', options: '-W:experimental').should == "true\n"
-    end
+describe "The -W command line option with :experimental" do
+  it "enables experimental warnings" do
+    ruby_exe('p Warning[:experimental]', options: '-W:experimental').should == "true\n"
   end
+end
 
-  describe "The -W command line option with :no-experimental" do
-    it "suppresses experimental warnings" do
-      ruby_exe('p Warning[:experimental]', options: '-w -W:no-experimental').should == "false\n"
-    end
+describe "The -W command line option with :no-experimental" do
+  it "suppresses experimental warnings" do
+    ruby_exe('p Warning[:experimental]', options: '-w -W:no-experimental').should == "false\n"
   end
 end

spec/ruby/command_line/dash_w_spec.rb

@@ -4,9 +4,7 @@
 describe "The -w command line option" do
   it_behaves_like :command_line_verbose, "-w"
 
-  ruby_version_is "2.7" do
-    it "enables both deprecated and experimental warnings" do
-      ruby_exe('p Warning[:deprecated]; p Warning[:experimental]', options: '-w').should == "true\ntrue\n"
-    end
+  it "enables both deprecated and experimental warnings" do
+    ruby_exe('p Warning[:deprecated]; p Warning[:experimental]', options: '-w').should == "true\ntrue\n"
   end
 end

spec/ruby/command_line/fixtures/freeze_flag_two_literals.rb

@@ -1 +1 @@
-p "abc".object_id == "abc".object_id
+p "abc".equal?("abc")

spec/ruby/command_line/rubyopt_spec.rb

@@ -59,24 +59,22 @@
     ruby_exe("p $VERBOSE", escape: true).chomp.should == "true"
   end
 
-  ruby_version_is "2.7" do
-    it "suppresses deprecation warnings for '-W:no-deprecated'" do
-      ENV["RUBYOPT"] = '-W:no-deprecated'
-      result = ruby_exe('$; = ""', args: '2>&1')
-      result.should == ""
-    end
+  it "suppresses deprecation warnings for '-W:no-deprecated'" do
+    ENV["RUBYOPT"] = '-W:no-deprecated'
+    result = ruby_exe('$; = ""', args: '2>&1')
+    result.should == ""
+  end
 
-    it "suppresses experimental warnings for '-W:no-experimental'" do
-      ENV["RUBYOPT"] = '-W:no-experimental'
-      result = ruby_exe('case 0; in a; end', args: '2>&1')
-      result.should == ""
-    end
+  it "suppresses experimental warnings for '-W:no-experimental'" do
+    ENV["RUBYOPT"] = '-W:no-experimental'
+    result = ruby_exe('case 0; in a; end', args: '2>&1')
+    result.should == ""
+  end
 
-    it "suppresses deprecation and experimental warnings for '-W:no-deprecated -W:no-experimental'" do
-      ENV["RUBYOPT"] = '-W:no-deprecated -W:no-experimental'
-      result = ruby_exe('case ($; = ""); in a; end', args: '2>&1')
-      result.should == ""
-    end
+  it "suppresses deprecation and experimental warnings for '-W:no-deprecated -W:no-experimental'" do
+    ENV["RUBYOPT"] = '-W:no-deprecated -W:no-experimental'
+    result = ruby_exe('case ($; = ""); in a; end', args: '2>&1')
+    result.should == ""
   end
 
   it "requires the file for '-r'" do

spec/ruby/core/array/clear_spec.rb

@@ -20,30 +20,10 @@
     a.size.should == 0
   end
 
-  ruby_version_is ''...'2.7' do
-    it "keeps tainted status" do
-      a = [1]
-      a.taint
-      a.tainted?.should be_true
-      a.clear
-      a.tainted?.should be_true
-    end
-  end
-
   it "does not accept any arguments" do
     -> { [1].clear(true) }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is ''...'2.7' do
-    it "keeps untrusted status" do
-      a = [1]
-      a.untrust
-      a.untrusted?.should be_true
-      a.clear
-      a.untrusted?.should be_true
-    end
-  end
-
   it "raises a FrozenError on a frozen array" do
     a = [1]
     a.freeze

spec/ruby/core/array/compact_spec.rb

@@ -21,20 +21,6 @@
   it "does not return subclass instance for Array subclasses" do
     ArraySpecs::MyArray[1, 2, 3, nil].compact.should be_an_instance_of(Array)
   end
-
-  ruby_version_is ''...'2.7' do
-    it "does not keep tainted status even if all elements are removed" do
-      a = [nil, nil]
-      a.taint
-      a.compact.tainted?.should be_false
-    end
-
-    it "does not keep untrusted status even if all elements are removed" do
-      a = [nil, nil]
-      a.untrust
-      a.compact.untrusted?.should be_false
-    end
-  end
 end
 
 describe "Array#compact!" do
@@ -59,22 +45,6 @@
     [1, 2, false, 3].compact!.should == nil
   end
 
-  ruby_version_is ''...'2.7' do
-    it "keeps tainted status even if all elements are removed" do
-      a = [nil, nil]
-      a.taint
-      a.compact!
-      a.tainted?.should be_true
-    end
-
-    it "keeps untrusted status even if all elements are removed" do
-      a = [nil, nil]
-      a.untrust
-      a.compact!
-      a.untrusted?.should be_true
-    end
-  end
-
   it "raises a FrozenError on a frozen array" do
     -> { ArraySpecs.frozen_array.compact! }.should raise_error(FrozenError)
   end

spec/ruby/core/array/concat_spec.rb

@@ -41,64 +41,6 @@
     -> { ArraySpecs.frozen_array.concat([]) }.should raise_error(FrozenError)
   end
 
-  ruby_version_is ''...'2.7' do
-    it "keeps tainted status" do
-      ary = [1, 2]
-      ary.taint
-      ary.concat([3])
-      ary.tainted?.should be_true
-      ary.concat([])
-      ary.tainted?.should be_true
-    end
-
-    it "is not infected by the other" do
-      ary = [1,2]
-      other = [3]; other.taint
-      ary.tainted?.should be_false
-      ary.concat(other)
-      ary.tainted?.should be_false
-    end
-
-    it "keeps the tainted status of elements" do
-      ary = [ Object.new, Object.new, Object.new ]
-      ary.each {|x| x.taint }
-
-      ary.concat([ Object.new ])
-      ary[0].tainted?.should be_true
-      ary[1].tainted?.should be_true
-      ary[2].tainted?.should be_true
-      ary[3].tainted?.should be_false
-    end
-
-    it "keeps untrusted status" do
-      ary = [1, 2]
-      ary.untrust
-      ary.concat([3])
-      ary.untrusted?.should be_true
-      ary.concat([])
-      ary.untrusted?.should be_true
-    end
-
-    it "is not infected untrustedness by the other" do
-      ary = [1,2]
-      other = [3]; other.untrust
-      ary.untrusted?.should be_false
-      ary.concat(other)
-      ary.untrusted?.should be_false
-    end
-
-    it "keeps the untrusted status of elements" do
-      ary = [ Object.new, Object.new, Object.new ]
-      ary.each {|x| x.untrust }
-
-      ary.concat([ Object.new ])
-      ary[0].untrusted?.should be_true
-      ary[1].untrusted?.should be_true
-      ary[2].untrusted?.should be_true
-      ary[3].untrusted?.should be_false
-    end
-  end
-
   it "appends elements to an Array with enough capacity that has been shifted" do
     ary = [1, 2, 3, 4, 5]
     2.times { ary.shift }