Update to ruby/spec@35a9fba

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

2 files changed, 62 insertions, 4 deletions

diff --git a/spec/ruby/core/enumerable/chain_spec.rb b/spec/ruby/core/enumerable/chain_spec.rb
new file mode 100644
index 0000000000..0e86a02905
--- /dev/null
+++ b/spec/ruby/core/enumerable/chain_spec.rb
@@ -0,0 +1,22 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+ruby_version_is "2.6" do
+  describe "Enumerable#chain" do
+    before :each do
+      ScratchPad.record []
+    end
+
+    it "returns a chain of self and provided enumerables" do
+      one = EnumerableSpecs::Numerous.new(1)
+      two = EnumerableSpecs::Numerous.new(2)
+      three = EnumerableSpecs::Numerous.new(3)
+
+      chain = one.chain(two, three)
+
+      chain.should be_an_instance_of(Enumerator::Chain)
+      chain.each { |item| ScratchPad << item }
+      ScratchPad.recorded.should == [1, 2, 3]
+    end
+  end
+end
diff --git a/spec/ruby/core/enumerable/to_h_spec.rb b/spec/ruby/core/enumerable/to_h_spec.rb
index 966325c736..f15ced122e 100644
--- a/spec/ruby/core/enumerable/to_h_spec.rb
+++ b/spec/ruby/core/enumerable/to_h_spec.rb
@@ -45,10 +45,46 @@ describe "Enumerable#to_h" do
   end
 
   ruby_version_is "2.6" do
-    it "converts [key, value] pairs returned by the block to a hash" do
-      enum = EnumerableSpecs::EachDefiner.new(:a, :b)
-      i = 0
-      enum.to_h {|k| [k, i += 1]}.should == { a: 1, b: 2 }
+    context "with block" do
+      before do
+        @enum = EnumerableSpecs::EachDefiner.new(:a, :b)
+      end
+
+      it "converts [key, value] pairs returned by the block to a hash" do
+        @enum.to_h { |k| [k, k.to_s] }.should == { a: 'a', b: 'b' }
+      end
+
+      it "raises ArgumentError if block returns longer or shorter array" do
+        -> do
+          @enum.to_h { |k| [k, k.to_s, 1] }
+        end.should raise_error(ArgumentError, /element has wrong array length/)
+
+        -> do
+          @enum.to_h { |k| [k] }
+        end.should raise_error(ArgumentError, /element has wrong array length/)
+      end
+
+      it "raises TypeError if block returns something other than Array" do
+        -> do
+          @enum.to_h { |k| "not-array" }
+        end.should raise_error(TypeError, /wrong element type String/)
+      end
+
+      it "coerces returned pair to Array with #to_ary" do
+        x = mock('x')
+        x.stub!(:to_ary).and_return([:b, 'b'])
+
+        @enum.to_h { |k| x }.should == { :b => 'b' }
+      end
+
+      it "does not coerce returned pair to Array with #to_a" do
+        x = mock('x')
+        x.stub!(:to_a).and_return([:b, 'b'])
+
+        -> do
+          @enum.to_h { |k| x }
+        end.should raise_error(TypeError, /wrong element type MockObject/)
+      end
     end
   end
 end