Update to ruby/spec@3affe1e

7 files changed, 96 insertions, 188 deletions

diff --git a/spec/ruby/core/hash/constructor_spec.rb b/spec/ruby/core/hash/constructor_spec.rb
index ad67274802..8fba47958f 100644
--- a/spec/ruby/core/hash/constructor_spec.rb
+++ b/spec/ruby/core/hash/constructor_spec.rb
@@ -42,26 +42,13 @@ describe "Hash.[]" do
     Hash[ary].should == { a: :b }
   end
 
-  ruby_version_is "" ... "2.7" do
-    it "ignores elements that are not arrays" do
-      -> {
-        Hash[[:a]].should == {}
-      }.should complain(/ignoring wrong elements/)
-      -> {
-        Hash[[:nil]].should == {}
-      }.should complain(/ignoring wrong elements/)
-    end
-  end
-
-  ruby_version_is "2.7" do
-    it "raises for elements that are not arrays" do
-      -> {
-        Hash[[:a]].should == {}
-      }.should raise_error(ArgumentError)
-      -> {
-        Hash[[:nil]].should == {}
-      }.should raise_error(ArgumentError)
-    end
+  it "raises for elements that are not arrays" do
+    -> {
+      Hash[[:a]].should == {}
+    }.should raise_error(ArgumentError)
+    -> {
+      Hash[[:nil]].should == {}
+    }.should raise_error(ArgumentError)
   end
 
   it "raises an ArgumentError for arrays of more than 2 elements" do
diff --git a/spec/ruby/core/hash/deconstruct_keys_spec.rb b/spec/ruby/core/hash/deconstruct_keys_spec.rb
index b265732616..bbcd8932e5 100644
--- a/spec/ruby/core/hash/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/hash/deconstruct_keys_spec.rb
@@ -1,25 +1,23 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "2.7" do
-  describe "Hash#deconstruct_keys" do
-    it "returns self" do
-      hash = {a: 1, b: 2}
+describe "Hash#deconstruct_keys" do
+  it "returns self" do
+    hash = {a: 1, b: 2}
 
-      hash.deconstruct_keys([:a, :b]).should equal hash
-    end
+    hash.deconstruct_keys([:a, :b]).should equal hash
+  end
 
-    it "requires one argument" do
-      -> {
-        {a: 1}.deconstruct_keys
-      }.should raise_error(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
-    end
+  it "requires one argument" do
+    -> {
+      {a: 1}.deconstruct_keys
+    }.should raise_error(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
+  end
 
-    it "ignores argument" do
-      hash = {a: 1, b: 2}
+  it "ignores argument" do
+    hash = {a: 1, b: 2}
 
-      hash.deconstruct_keys([:a]).should == {a: 1, b: 2}
-      hash.deconstruct_keys(0   ).should == {a: 1, b: 2}
-      hash.deconstruct_keys(''  ).should == {a: 1, b: 2}
-    end
+    hash.deconstruct_keys([:a]).should == {a: 1, b: 2}
+    hash.deconstruct_keys(0   ).should == {a: 1, b: 2}
+    hash.deconstruct_keys(''  ).should == {a: 1, b: 2}
   end
 end
diff --git a/spec/ruby/core/hash/reject_spec.rb b/spec/ruby/core/hash/reject_spec.rb
index 397000ab67..dd8e817237 100644
--- a/spec/ruby/core/hash/reject_spec.rb
+++ b/spec/ruby/core/hash/reject_spec.rb
@@ -31,13 +31,6 @@ describe "Hash#reject" do
       HashSpecs::MyHash[1 => 2, 3 => 4].reject { false }.should be_kind_of(Hash)
       HashSpecs::MyHash[1 => 2, 3 => 4].reject { true }.should be_kind_of(Hash)
     end
-
-    ruby_version_is ''...'2.7' do
-      it "does not taint the resulting hash" do
-        h = { a: 1 }.taint
-        h.reject {false}.should_not.tainted?
-      end
-    end
   end
 
   it "processes entries with the same order as reject!" do
diff --git a/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb b/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
index 13e8ffe4af..e9337b9d1c 100644
--- a/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
+++ b/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
@@ -1,61 +1,59 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is "2.7" do
-  describe "Hash.ruby2_keywords_hash?" do
-    it "returns false if the Hash is not a keywords Hash" do
-      Hash.ruby2_keywords_hash?({}).should == false
-    end
-
-    it "returns true if the Hash is a keywords Hash marked by Module#ruby2_keywords" do
-      obj = Class.new {
-        ruby2_keywords def m(*args)
-          args.last
-        end
-      }.new
-      Hash.ruby2_keywords_hash?(obj.m(a: 1)).should == true
-    end
-
-    it "raises TypeError for non-Hash" do
-      -> { Hash.ruby2_keywords_hash?(nil) }.should raise_error(TypeError)
-    end
-  end
-
-  describe "Hash.ruby2_keywords_hash" do
-    it "returns a copy of a Hash and marks the copy as a keywords Hash" do
-      h = {a: 1}.freeze
-      kw = Hash.ruby2_keywords_hash(h)
-      Hash.ruby2_keywords_hash?(h).should == false
-      Hash.ruby2_keywords_hash?(kw).should == true
-      kw.should == h
-    end
-
-    it "returns an instance of the subclass if called on an instance of a subclass of Hash" do
-      h = HashSpecs::MyHash.new
-      h[:a] = 1
-      kw = Hash.ruby2_keywords_hash(h)
-      kw.class.should == HashSpecs::MyHash
-      Hash.ruby2_keywords_hash?(h).should == false
-      Hash.ruby2_keywords_hash?(kw).should == true
-      kw.should == h
-    end
-
-    it "copies instance variables" do
-      h = {a: 1}
-      h.instance_variable_set(:@foo, 42)
-      kw = Hash.ruby2_keywords_hash(h)
-      kw.instance_variable_get(:@foo).should == 42
-    end
-
-    it "copies the hash internals" do
-      h = {a: 1}
-      kw = Hash.ruby2_keywords_hash(h)
-      h[:a] = 2
-      kw[:a].should == 1
-    end
-
-    it "raises TypeError for non-Hash" do
-      -> { Hash.ruby2_keywords_hash(nil) }.should raise_error(TypeError)
-    end
+describe "Hash.ruby2_keywords_hash?" do
+  it "returns false if the Hash is not a keywords Hash" do
+    Hash.ruby2_keywords_hash?({}).should == false
+  end
+
+  it "returns true if the Hash is a keywords Hash marked by Module#ruby2_keywords" do
+    obj = Class.new {
+      ruby2_keywords def m(*args)
+        args.last
+      end
+    }.new
+    Hash.ruby2_keywords_hash?(obj.m(a: 1)).should == true
+  end
+
+  it "raises TypeError for non-Hash" do
+    -> { Hash.ruby2_keywords_hash?(nil) }.should raise_error(TypeError)
+  end
+end
+
+describe "Hash.ruby2_keywords_hash" do
+  it "returns a copy of a Hash and marks the copy as a keywords Hash" do
+    h = {a: 1}.freeze
+    kw = Hash.ruby2_keywords_hash(h)
+    Hash.ruby2_keywords_hash?(h).should == false
+    Hash.ruby2_keywords_hash?(kw).should == true
+    kw.should == h
+  end
+
+  it "returns an instance of the subclass if called on an instance of a subclass of Hash" do
+    h = HashSpecs::MyHash.new
+    h[:a] = 1
+    kw = Hash.ruby2_keywords_hash(h)
+    kw.class.should == HashSpecs::MyHash
+    Hash.ruby2_keywords_hash?(h).should == false
+    Hash.ruby2_keywords_hash?(kw).should == true
+    kw.should == h
+  end
+
+  it "copies instance variables" do
+    h = {a: 1}
+    h.instance_variable_set(:@foo, 42)
+    kw = Hash.ruby2_keywords_hash(h)
+    kw.instance_variable_get(:@foo).should == 42
+  end
+
+  it "copies the hash internals" do
+    h = {a: 1}
+    kw = Hash.ruby2_keywords_hash(h)
+    h[:a] = 2
+    kw[:a].should == 1
+  end
+
+  it "raises TypeError for non-Hash" do
+    -> { Hash.ruby2_keywords_hash(nil) }.should raise_error(TypeError)
   end
 end
diff --git a/spec/ruby/core/hash/shared/eql.rb b/spec/ruby/core/hash/shared/eql.rb
index e294edd764..68db49f76d 100644
--- a/spec/ruby/core/hash/shared/eql.rb
+++ b/spec/ruby/core/hash/shared/eql.rb
@@ -149,80 +149,34 @@ describe :hash_eql_additional, shared: true do
     h.send(@method, HashSpecs::MyHash[h]).should be_true
   end
 
-  ruby_version_is '2.7' do
-    # Why isn't this true of eql? too ?
-    it "compares keys with matching hash codes via eql?" do
-      a = Array.new(2) do
-        obj = mock('0')
-        obj.should_receive(:hash).at_least(1).and_return(0)
-
-        def obj.eql?(o)
-          return true if self.equal?(o)
-          false
-        end
-
-        obj
+  # Why isn't this true of eql? too ?
+  it "compares keys with matching hash codes via eql?" do
+    a = Array.new(2) do
+      obj = mock('0')
+      obj.should_receive(:hash).at_least(1).and_return(0)
+
+      def obj.eql?(o)
+        return true if self.equal?(o)
+        false
       end
 
-      { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_false
-
-      a = Array.new(2) do
-        obj = mock('0')
-        obj.should_receive(:hash).at_least(1).and_return(0)
-
-        def obj.eql?(o)
-          true
-        end
-
-        obj
-      end
-
-      { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_true
+      obj
     end
-  end
 
-  ruby_version_is ''...'2.7' do
-    # Why isn't this true of eql? too ?
-    it "compares keys with matching hash codes via eql?" do
-      a = Array.new(2) do
-        obj = mock('0')
-        obj.should_receive(:hash).at_least(1).and_return(0)
+    { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_false
 
-        # It's undefined whether the impl does a[0].eql?(a[1]) or
-        # a[1].eql?(a[0]) so we taint both.
-        def obj.eql?(o)
-          return true if self.equal?(o)
-          taint
-          o.taint
-          false
-        end
+    a = Array.new(2) do
+      obj = mock('0')
+      obj.should_receive(:hash).at_least(1).and_return(0)
 
-        obj
+      def obj.eql?(o)
+        true
       end
 
-      { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_false
-      a[0].tainted?.should be_true
-      a[1].tainted?.should be_true
-
-      a = Array.new(2) do
-        obj = mock('0')
-        obj.should_receive(:hash).at_least(1).and_return(0)
-
-        def obj.eql?(o)
-          # It's undefined whether the impl does a[0].send(@method, a[1]) or
-          # a[1].send(@method, a[0]) so we taint both.
-          taint
-          o.taint
-          true
-        end
-
-        obj
-      end
-
-      { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_true
-      a[0].tainted?.should be_true
-      a[1].tainted?.should be_true
+      obj
     end
+
+    { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_true
   end
 
   it "compares the values in self to values in other hash" do
diff --git a/spec/ruby/core/hash/shared/to_s.rb b/spec/ruby/core/hash/shared/to_s.rb
index c74537aed4..2db3a96583 100644
--- a/spec/ruby/core/hash/shared/to_s.rb
+++ b/spec/ruby/core/hash/shared/to_s.rb
@@ -76,18 +76,6 @@ describe :hash_to_s, shared: true do
     y.send(@method).should == "{1=>{0=>{...}}}"
   end
 
-  ruby_version_is ''...'2.7' do
-    it "returns a tainted string if self is tainted and not empty" do
-      {}.taint.send(@method).tainted?.should be_false
-      { nil => nil }.taint.send(@method).tainted?.should be_true
-    end
-
-    it "returns an untrusted string if self is untrusted and not empty" do
-      {}.untrust.send(@method).untrusted?.should be_false
-      { nil => nil }.untrust.send(@method).untrusted?.should be_true
-    end
-  end
-
   it "does not raise if inspected result is not default external encoding" do
     utf_16be = mock("utf_16be")
     utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
diff --git a/spec/ruby/core/hash/to_a_spec.rb b/spec/ruby/core/hash/to_a_spec.rb
index 6f6f74f73b..8b7894a2ba 100644
--- a/spec/ruby/core/hash/to_a_spec.rb
+++ b/spec/ruby/core/hash/to_a_spec.rb
@@ -27,17 +27,7 @@ describe "Hash#to_a" do
     ent.should == pairs
   end
 
-  ruby_version_is ''...'2.7' do
-    it "returns a tainted array if self is tainted" do
-      {}.taint.to_a.tainted?.should be_true
-    end
-
-    it "returns an untrusted array if self is untrusted" do
-      {}.untrust.to_a.untrusted?.should be_true
-    end
-  end
-
-  ruby_version_is '2.7'...'3.0' do
+  ruby_version_is ''...'3.0' do
     it "returns a not tainted array if self is tainted" do
       {}.taint.to_a.tainted?.should be_false
     end