1 files changed, 9 insertions, 10 deletions
diff --git a/spec/ruby/core/hash/shift_spec.rb b/spec/ruby/core/hash/shift_spec.rb
index 9d43e640f5..6095d2e55f 100644
--- a/spec/ruby/core/hash/shift_spec.rb
+++ b/spec/ruby/core/hash/shift_spec.rb
@@ -8,7 +8,7 @@ describe "Hash#shift" do
 
     h.size.times do |i|
       r = h.shift
-      r.should be_kind_of(Array)
+      r.should.is_a?(Array)
       h2[r.first].should == r.last
       h.size.should == h2.size - i - 1
     end
@@ -30,23 +30,22 @@ describe "Hash#shift" do
     h.should == {}
   end
 
-  it "calls #default with nil if the Hash is empty" do
+  it "returns nil if the Hash is empty" do
     h = {}
     def h.default(key)
-      key.should == nil
-      :foo
+      raise
     end
-    h.shift.should == :foo
+    h.shift.should == nil
   end
 
   it "returns nil from an empty hash" do
     {}.shift.should == nil
   end
 
-  it "returns (computed) default for empty hashes" do
-    Hash.new(5).shift.should == 5
+  it "returns nil for empty hashes with defaults and default procs" do
+    Hash.new(5).shift.should == nil
     h = Hash.new { |*args| args }
-    h.shift.should == [h, nil]
+    h.shift.should == nil
   end
 
   it "preserves Hash invariants when removing the last item" do
@@ -58,8 +57,8 @@ describe "Hash#shift" do
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.shift  }.should raise_error(FrozenError)
-    -> { HashSpecs.empty_frozen_hash.shift }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.shift  }.should.raise(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.shift }.should.raise(FrozenError)
   end
 
   it "works when the hash is at capacity" do