Update to ruby/spec@a6b8805

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 71 insertions, 6 deletions

diff --git a/spec/ruby/core/enumerable/any_spec.rb b/spec/ruby/core/enumerable/any_spec.rb
index 4f7af68b07..4a7511f649 100644
--- a/spec/ruby/core/enumerable/any_spec.rb
+++ b/spec/ruby/core/enumerable/any_spec.rb
@@ -68,11 +68,11 @@ describe "Enumerable#any?" do
 
   describe "with block" do
     it "returns true if the block ever returns other than false or nil" do
-      @enum.any? { true } == true
-      @enum.any? { 0 } == true
-      @enum.any? { 1 } == true
+      @enum.any? { true }.should == true
+      @enum.any? { 0 }.should == true
+      @enum.any? { 1 }.should == true
 
-      @enum1.any? { Object.new } == true
+      @enum1.any? { Object.new }.should == true
       @enum1.any?{ |o| o < 1 }.should == true
       @enum1.any?{ |o| 5 }.should == true
 
diff --git a/spec/ruby/core/enumerable/cycle_spec.rb b/spec/ruby/core/enumerable/cycle_spec.rb
index 2f5760992d..9089a94963 100644
--- a/spec/ruby/core/enumerable/cycle_spec.rb
+++ b/spec/ruby/core/enumerable/cycle_spec.rb
@@ -69,7 +69,7 @@ describe "Enumerable#cycle" do
       enum.cycle(obj).to_a.should == [3, 2, 1, 3, 2, 1]
     end
 
-    it "raises a TypeError when the passed n can be coerced to Integer" do
+    it "raises a TypeError when the passed n cannot be coerced to Integer" do
       enum = EnumerableSpecs::Numerous.new
       lambda{ enum.cycle("cat"){} }.should raise_error(TypeError)
     end
diff --git a/spec/ruby/core/enumerable/drop_spec.rb b/spec/ruby/core/enumerable/drop_spec.rb
index 1bcdc0ee9a..4013a639ce 100644
--- a/spec/ruby/core/enumerable/drop_spec.rb
+++ b/spec/ruby/core/enumerable/drop_spec.rb
@@ -34,7 +34,7 @@ describe "Enumerable#drop" do
       EnumerableSpecs::Numerous.new(3, 2, 1, :go).drop(4).should == []
     end
 
-    it "raises a TypeError when the passed n can be coerced to Integer" do
+    it "raises a TypeError when the passed n cannot be coerced to Integer" do
       lambda{ @enum.drop("hat") }.should raise_error(TypeError)
       lambda{ @enum.drop(nil) }.should raise_error(TypeError)
     end
diff --git a/spec/ruby/core/enumerable/uniq_spec.rb b/spec/ruby/core/enumerable/uniq_spec.rb
index 0ede0170ce..5ca7556aed 100644
--- a/spec/ruby/core/enumerable/uniq_spec.rb
+++ b/spec/ruby/core/enumerable/uniq_spec.rb
@@ -7,6 +7,71 @@ ruby_version_is '2.4' do
       [0, 1, 2, 3].to_enum.uniq { |n| n.even? }.should == [0, 1]
     end
 
+    it "uses eql? semantics" do
+      [1.0, 1].to_enum.uniq.should == [1.0, 1]
+    end
+
+    it "compares elements first with hash" do
+      x = mock('0')
+      x.should_receive(:hash).at_least(1).and_return(0)
+      y = mock('0')
+      y.should_receive(:hash).at_least(1).and_return(0)
+
+      [x, y].to_enum.uniq.should == [x, y]
+    end
+
+    it "does not compare elements with different hash codes via eql?" do
+      x = mock('0')
+      x.should_not_receive(:eql?)
+      y = mock('1')
+      y.should_not_receive(:eql?)
+
+      x.should_receive(:hash).at_least(1).and_return(0)
+      y.should_receive(:hash).at_least(1).and_return(1)
+
+      [x, y].to_enum.uniq.should == [x, y]
+    end
+
+    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].tainted?.should == true
+      a[1].tainted?.should == 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].eql?(a[1]) or
+          # a[1].eql?(a[0]) so we taint both.
+          taint
+          o.taint
+          true
+        end
+
+        obj
+      end
+
+      a.to_enum.uniq.size.should == 1
+      a[0].tainted?.should == true
+      a[1].tainted?.should == true
+    end
+
     context 'when yielded with multiple arguments' do
       before :each do
         @enum = Object.new.to_enum