Update to ruby/spec@35a9fba

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

4 files changed, 95 insertions, 38 deletions

diff --git a/spec/ruby/core/env/filter_spec.rb b/spec/ruby/core/env/filter_spec.rb
new file mode 100644
index 0000000000..ba18a3b33b
--- /dev/null
+++ b/spec/ruby/core/env/filter_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+require_relative '../enumerable/shared/enumeratorized'
+require_relative 'shared/select'
+
+ruby_version_is "2.6" do
+  describe "ENV.filter!" do
+    it_behaves_like :env_select!, :filter!
+    it_behaves_like :enumeratorized_with_origin_size, :filter!, ENV
+  end
+
+  describe "ENV.filter" do
+    it_behaves_like :env_select, :filter
+    it_behaves_like :enumeratorized_with_origin_size, :filter, ENV
+  end
+end
diff --git a/spec/ruby/core/env/select_spec.rb b/spec/ruby/core/env/select_spec.rb
index 9ccd27f3e7..c3a76f4434 100644
--- a/spec/ruby/core/env/select_spec.rb
+++ b/spec/ruby/core/env/select_spec.rb
@@ -1,39 +1,13 @@
 require_relative '../../spec_helper'
 require_relative '../enumerable/shared/enumeratorized'
+require_relative 'shared/select'
 
 describe "ENV.select!" do
-  it "removes environment variables for which the block returns true" do
-    ENV["foo"] = "bar"
-    ENV.select! { |k, v| k != "foo" }
-    ENV["foo"].should == nil
-  end
-
-  it "returns self if any changes were made" do
-    ENV["foo"] = "bar"
-    ENV.select! { |k, v| k != "foo" }.should == ENV
-  end
-
-  it "returns nil if no changes were made" do
-    ENV.select! { true }.should == nil
-  end
-
-  it "returns an Enumerator if called without a block" do
-    ENV.select!.should be_an_instance_of(Enumerator)
-  end
-
+  it_behaves_like :env_select!, :select!
   it_behaves_like :enumeratorized_with_origin_size, :select!, ENV
 end
 
 describe "ENV.select" do
-  it "returns a Hash of names and values for which block return true" do
-    ENV["foo"] = "bar"
-    ENV.select { |k, v| k == "foo" }.should == {"foo" => "bar"}
-    ENV.delete "foo"
-  end
-
-  it "returns an Enumerator when no block is given" do
-    ENV.select.should be_an_instance_of(Enumerator)
-  end
-
+  it_behaves_like :env_select, :select
   it_behaves_like :enumeratorized_with_origin_size, :select, ENV
 end
diff --git a/spec/ruby/core/env/shared/select.rb b/spec/ruby/core/env/shared/select.rb
new file mode 100644
index 0000000000..a0b46a775a
--- /dev/null
+++ b/spec/ruby/core/env/shared/select.rb
@@ -0,0 +1,32 @@
+describe :env_select, shared: true do
+  it "returns a Hash of names and values for which block return true" do
+    ENV["foo"] = "bar"
+    (ENV.send(@method) { |k, v| k == "foo" }).should == { "foo" => "bar" }
+    ENV.delete "foo"
+  end
+
+  it "returns an Enumerator when no block is given" do
+    ENV.send(@method).should be_an_instance_of(Enumerator)
+  end
+end
+
+describe :env_select!, shared: true do
+  it "removes environment variables for which the block returns true" do
+    ENV["foo"] = "bar"
+    ENV.send(@method) { |k, v| k != "foo" }
+    ENV["foo"].should == nil
+  end
+
+  it "returns self if any changes were made" do
+    ENV["foo"] = "bar"
+    (ENV.send(@method) { |k, v| k != "foo" }).should == ENV
+  end
+
+  it "returns nil if no changes were made" do
+    (ENV.send(@method) { true }).should == nil
+  end
+
+  it "returns an Enumerator if called without a block" do
+    ENV.send(@method).should be_an_instance_of(Enumerator)
+  end
+end
diff --git a/spec/ruby/core/env/to_h_spec.rb b/spec/ruby/core/env/to_h_spec.rb
index f6c796b4d6..81a17700e9 100644
--- a/spec/ruby/core/env/to_h_spec.rb
+++ b/spec/ruby/core/env/to_h_spec.rb
@@ -1,18 +1,54 @@
 require_relative '../../spec_helper'
 require_relative 'shared/to_hash'
 
-describe "ENV.to_hash" do
+describe "ENV.to_h" do
   it_behaves_like :env_to_hash, :to_h
 
   ruby_version_is "2.6" do
-    it "converts [key, value] pairs returned by the block to a hash" do
-      orig = ENV.to_hash
-      begin
-        ENV.replace "a" => "b", "c" => "d"
-        i = 0
-        ENV.to_h {|k, v| [k.to_sym, v.upcase]}.should == {a:"B", c:"D"}
-      ensure
-        ENV.replace orig
+    context "with block" do
+      before do
+        @orig_hash = ENV.to_hash
+      end
+
+      after do
+        ENV.replace @orig_hash
+      end
+
+      it "converts [key, value] pairs returned by the block to a hash" do
+        ENV.replace("a" => "b", "c" => "d")
+        ENV.to_h { |k, v| [k, v.upcase] }.should == { 'a' => "B", 'c' => "D" }
+      end
+
+      it "raises ArgumentError if block returns longer or shorter array" do
+        -> do
+          ENV.to_h { |k, v| [k, v.upcase, 1] }
+        end.should raise_error(ArgumentError, /element has wrong array length/)
+
+        -> do
+          ENV.to_h { |k, v| [k] }
+        end.should raise_error(ArgumentError, /element has wrong array length/)
+      end
+
+      it "raises TypeError if block returns something other than Array" do
+        -> do
+          ENV.to_h { |k, v| "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'])
+
+        ENV.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
+          ENV.to_h { |k| x }
+        end.should raise_error(TypeError, /wrong element type MockObject/)
       end
     end
   end