Update to ruby/spec@3affe1e

6 files changed, 57 insertions, 124 deletions

diff --git a/spec/ruby/core/enumerable/filter_map_spec.rb b/spec/ruby/core/enumerable/filter_map_spec.rb
index 31acc277b4..aa4894230b 100644
--- a/spec/ruby/core/enumerable/filter_map_spec.rb
+++ b/spec/ruby/core/enumerable/filter_map_spec.rb
@@ -1,26 +1,24 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is '2.7' do
-  describe 'Enumerable#filter_map' do
-    before :each do
-      @numerous = EnumerableSpecs::Numerous.new(*(1..8).to_a)
-    end
+describe 'Enumerable#filter_map' do
+  before :each do
+    @numerous = EnumerableSpecs::Numerous.new(*(1..8).to_a)
+  end
 
-    it 'returns an empty array if there are no elements' do
-      EnumerableSpecs::Empty.new.filter_map { true }.should == []
-    end
+  it 'returns an empty array if there are no elements' do
+    EnumerableSpecs::Empty.new.filter_map { true }.should == []
+  end
 
-    it 'returns an array with truthy results of passing each element to block' do
-      @numerous.filter_map { |i| i * 2 if i.even? }.should == [4, 8, 12, 16]
-      @numerous.filter_map { |i| i * 2 }.should == [2, 4, 6, 8, 10, 12, 14, 16]
-      @numerous.filter_map { 0 }.should == [0, 0, 0, 0, 0, 0, 0, 0]
-      @numerous.filter_map { false }.should == []
-      @numerous.filter_map { nil }.should == []
-    end
+  it 'returns an array with truthy results of passing each element to block' do
+    @numerous.filter_map { |i| i * 2 if i.even? }.should == [4, 8, 12, 16]
+    @numerous.filter_map { |i| i * 2 }.should == [2, 4, 6, 8, 10, 12, 14, 16]
+    @numerous.filter_map { 0 }.should == [0, 0, 0, 0, 0, 0, 0, 0]
+    @numerous.filter_map { false }.should == []
+    @numerous.filter_map { nil }.should == []
+  end
 
-    it 'returns an enumerator when no block given' do
-      @numerous.filter_map.should be_an_instance_of(Enumerator)
-    end
+  it 'returns an enumerator when no block given' do
+    @numerous.filter_map.should be_an_instance_of(Enumerator)
   end
 end
diff --git a/spec/ruby/core/enumerable/group_by_spec.rb b/spec/ruby/core/enumerable/group_by_spec.rb
index 52b5a68d64..4fd1603819 100644
--- a/spec/ruby/core/enumerable/group_by_spec.rb
+++ b/spec/ruby/core/enumerable/group_by_spec.rb
@@ -33,15 +33,5 @@ describe "Enumerable#group_by" do
                   [3, 4, 5] => [[3, 4, 5]] }
   end
 
-  ruby_version_is ''...'2.7' do
-    it "returns a tainted hash if self is tainted" do
-      EnumerableSpecs::Empty.new.taint.group_by {}.tainted?.should be_true
-    end
-
-    it "returns an untrusted hash if self is untrusted" do
-      EnumerableSpecs::Empty.new.untrust.group_by {}.untrusted?.should be_true
-    end
-  end
-
   it_behaves_like :enumerable_enumeratorized_with_origin_size, :group_by
 end
diff --git a/spec/ruby/core/enumerable/shared/entries.rb b/spec/ruby/core/enumerable/shared/entries.rb
index 590ce73bcf..e32eb23d2a 100644
--- a/spec/ruby/core/enumerable/shared/entries.rb
+++ b/spec/ruby/core/enumerable/shared/entries.rb
@@ -13,14 +13,4 @@ describe :enumerable_entries, shared: true do
     count.send(@method, :hello, "world").should == [1, 2, 3]
     count.arguments_passed.should == [:hello, "world"]
   end
-
-  ruby_version_is ''...'2.7' do
-    it "returns a tainted array if self is tainted" do
-      EnumerableSpecs::Empty.new.taint.send(@method).tainted?.should be_true
-    end
-
-    it "returns an untrusted array if self is untrusted" do
-      EnumerableSpecs::Empty.new.untrust.send(@method).untrusted?.should be_true
-    end
-  end
 end
diff --git a/spec/ruby/core/enumerable/shared/inject.rb b/spec/ruby/core/enumerable/shared/inject.rb
index e59b82b02e..c5907f92d8 100644
--- a/spec/ruby/core/enumerable/shared/inject.rb
+++ b/spec/ruby/core/enumerable/shared/inject.rb
@@ -17,7 +17,8 @@ describe :enumerable_inject, shared: true do
   end
 
   it "ignores the block if two arguments" do
-    EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, :-){ raise "we never get here"}.should == 4
+    EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, :-) { raise "we never get here"}.should == 4
+    [].send(@method, 3, :+) { raise "we never get here"}.should == 3
   end
 
   it "can take a symbol argument" do
diff --git a/spec/ruby/core/enumerable/tally_spec.rb b/spec/ruby/core/enumerable/tally_spec.rb
index 92aac507ff..f09a8f533a 100644
--- a/spec/ruby/core/enumerable/tally_spec.rb
+++ b/spec/ruby/core/enumerable/tally_spec.rb
@@ -1,36 +1,34 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is "2.7" do
-  describe "Enumerable#tally" do
-    before :each do
-      ScratchPad.record []
-    end
+describe "Enumerable#tally" do
+  before :each do
+    ScratchPad.record []
+  end
 
-    it "returns a hash with counts according to the value" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally.should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
-    end
+  it "returns a hash with counts according to the value" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally.should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
+  end
 
-    it "returns a hash without default" do
-      hash = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz').tally
-      hash.default_proc.should be_nil
-      hash.default.should be_nil
-    end
+  it "returns a hash without default" do
+    hash = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz').tally
+    hash.default_proc.should be_nil
+    hash.default.should be_nil
+  end
 
-    it "returns an empty hash for empty enumerables" do
-      EnumerableSpecs::Empty.new.tally.should == {}
-    end
+  it "returns an empty hash for empty enumerables" do
+    EnumerableSpecs::Empty.new.tally.should == {}
+  end
 
-    it "counts values as gathered array when yielded with multiple arguments" do
-      EnumerableSpecs::YieldsMixed2.new.tally.should == EnumerableSpecs::YieldsMixed2.gathered_yields.group_by(&:itself).transform_values(&:size)
-    end
+  it "counts values as gathered array when yielded with multiple arguments" do
+    EnumerableSpecs::YieldsMixed2.new.tally.should == EnumerableSpecs::YieldsMixed2.gathered_yields.group_by(&:itself).transform_values(&:size)
+  end
 
-    it "does not call given block" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally { |v| ScratchPad << v }
-      ScratchPad.recorded.should == []
-    end
+  it "does not call given block" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally { |v| ScratchPad << v }
+    ScratchPad.recorded.should == []
   end
 end
 
diff --git a/spec/ruby/core/enumerable/uniq_spec.rb b/spec/ruby/core/enumerable/uniq_spec.rb
index e58dd36366..a1ed44796f 100644
--- a/spec/ruby/core/enumerable/uniq_spec.rb
+++ b/spec/ruby/core/enumerable/uniq_spec.rb
@@ -31,76 +31,32 @@ describe 'Enumerable#uniq' do
     [x, y].to_enum.uniq.should == [x, y]
   end
 
-  ruby_version_is '2.7' do
-    it "compares elements with matching hash codes with #eql?" do
-      a = Array.new(2) do
-        obj = mock('0')
-        obj.should_receive(:hash).at_least(1).and_return(0)
-
-        def obj.eql?(o)
-          false
-        end
-
-        obj
-      end
-
-      a.uniq.should == a
+  it "compares elements with matching hash codes with #eql?" do
+    a = Array.new(2) do
+      obj = mock('0')
+      obj.should_receive(:hash).at_least(1).and_return(0)
 
-      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
+      def obj.eql?(o)
+        false
       end
 
-      a.to_enum.uniq.size.should == 1
+      obj
     end
-  end
 
-  ruby_version_is ''...'2.7' do
-    it "compares elements with matching hash codes with #eql?" do
-      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].eql?(a[1]) or
-          # a[1].eql?(a[0]) so we taint both.
-          taint
-          o.taint
-          false
-        end
-
-        obj
-      end
-
-      a.uniq.should == a
-      a[0].should.tainted?
-      a[1].should.tainted?
+    a.uniq.should == a
 
-      a = Array.new(2) do
-        obj = mock('0')
-        obj.should_receive(:hash).at_least(1).and_return(0)
+    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].eql?(a[1]) or
-          # a[1].eql?(a[0]) so we taint both.
-          taint
-          o.taint
-          true
-        end
-
-        obj
+      def obj.eql?(o)
+        true
       end
 
-      a.to_enum.uniq.size.should == 1
-      a[0].should.tainted?
-      a[1].should.tainted?
+      obj
     end
+
+    a.to_enum.uniq.size.should == 1
   end
 
   context 'when yielded with multiple arguments' do