1 files changed, 19 insertions, 11 deletions
diff --git a/spec/ruby/core/hash/fetch_spec.rb b/spec/ruby/core/hash/fetch_spec.rb
index 5e701b1162..f9b80b6c49 100644
--- a/spec/ruby/core/hash/fetch_spec.rb
+++ b/spec/ruby/core/hash/fetch_spec.rb
@@ -1,15 +1,23 @@
-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'
 
 describe "Hash#fetch" do
-  it "returns the value for key" do
-    { a: 1, b: -1 }.fetch(:b).should == -1
+  context "when the key is not found" do
+    it_behaves_like :key_error, -> obj, key { obj.fetch(key) }, Hash.new({ a: 5 })
+    it_behaves_like :key_error, -> obj, key { obj.fetch(key) }, {}
+    it_behaves_like :key_error, -> obj, key { obj.fetch(key) }, Hash.new { 5 }
+    it_behaves_like :key_error, -> obj, key { obj.fetch(key) }, Hash.new(5)
+
+    it "formats the object with #inspect in the KeyError message" do
+      -> {
+        {}.fetch('foo')
+      }.should.raise(KeyError, 'key not found: "foo"')
+    end
   end
 
-  it "raises a KeyError if key is not found" do
-    lambda { {}.fetch(:a)       }.should raise_error(KeyError)
-    lambda { Hash.new(5).fetch(:a)    }.should raise_error(KeyError)
-    lambda { Hash.new { 5 }.fetch(:a) }.should raise_error(KeyError)
+  it "returns the value for key" do
+    { a: 1, b: -1 }.fetch(:b).should == -1
   end
 
   it "returns default if key is not found when passed a default" do
@@ -23,14 +31,14 @@ describe "Hash#fetch" do
   end
 
   it "gives precedence to the default block over the default argument when passed both" do
-    lambda {
+    -> {
       @result = {}.fetch(9, :foo) { |i| i * i }
     }.should complain(/block supersedes default value argument/)
     @result.should == 81
   end
 
   it "raises an ArgumentError when not passed one or two arguments" do
-    lambda { {}.fetch()        }.should raise_error(ArgumentError)
-    lambda { {}.fetch(1, 2, 3) }.should raise_error(ArgumentError)
+    -> { {}.fetch()        }.should.raise(ArgumentError)
+    -> { {}.fetch(1, 2, 3) }.should.raise(ArgumentError)
   end
 end