1 files changed, 24 insertions, 24 deletions
diff --git a/spec/ruby/core/hash/fetch_values_spec.rb b/spec/ruby/core/hash/fetch_values_spec.rb
index d6e47d5885..0cd48565af 100644
--- a/spec/ruby/core/hash/fetch_values_spec.rb
+++ b/spec/ruby/core/hash/fetch_values_spec.rb
@@ -1,35 +1,35 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require_relative '../../shared/hash/key_error'
 
-ruby_version_is "2.3" do
-  describe "Hash#fetch_values" do
-    before :each do
-      @hash = { a: 1, b: 2, c: 3 }
+describe "Hash#fetch_values" do
+  before :each do
+    @hash = { a: 1, b: 2, c: 3 }
+  end
+
+  describe "with matched keys" do
+    it "returns the values for keys" do
+      @hash.fetch_values(:a).should == [1]
+      @hash.fetch_values(:a, :c).should == [1, 3]
     end
 
-    describe "with matched keys" do
-      it "returns the values for keys" do
-        @hash.fetch_values(:a).should == [1]
-        @hash.fetch_values(:a, :c).should == [1, 3]
-      end
+    it "returns the values for keys ordered in the order of the requested keys" do
+      @hash.fetch_values(:c, :a).should == [3, 1]
     end
+  end
 
-    describe "with unmatched keys" do
-      it "raises a KeyError" do
-        ->{ @hash.fetch_values :z }.should raise_error(KeyError)
-        ->{ @hash.fetch_values :a, :z }.should raise_error(KeyError)
-      end
+  describe "with unmatched keys" do
+    it_behaves_like :key_error, -> obj, key { obj.fetch_values(key) }, Hash.new({ a: 5 })
 
-      it "returns the default value from block" do
-        @hash.fetch_values(:z) { |key| "`#{key}' is not found" }.should == ["`z' is not found"]
-        @hash.fetch_values(:a, :z) { |key| "`#{key}' is not found" }.should == [1, "`z' is not found"]
-      end
+    it "returns the default value from block" do
+      @hash.fetch_values(:z) { |key| "`#{key}' is not found" }.should == ["`z' is not found"]
+      @hash.fetch_values(:a, :z) { |key| "`#{key}' is not found" }.should == [1, "`z' is not found"]
     end
+  end
 
-    describe "without keys" do
-      it "returns an empty Array" do
-        @hash.fetch_values.should == []
-      end
+  describe "without keys" do
+    it "returns an empty Array" do
+      @hash.fetch_values.should == []
     end
   end
 end