2 files changed, 29 insertions, 1 deletions
diff --git a/spec/ruby/core/objectspace/weakmap/delete_spec.rb b/spec/ruby/core/objectspace/weakmap/delete_spec.rb
new file mode 100644
index 0000000000..03beebbb83
--- /dev/null
+++ b/spec/ruby/core/objectspace/weakmap/delete_spec.rb
@@ -0,0 +1,28 @@
+require_relative '../../../spec_helper'
+
+describe "ObjectSpace::WeakMap#delete" do
+  it "removes the entry and returns the deleted value" do
+    m = ObjectSpace::WeakMap.new
+    key = Object.new
+    value = Object.new
+    m[key] = value
+
+    m.delete(key).should == value
+    m.key?(key).should == false
+  end
+
+  it "calls supplied block if the key is not found" do
+    key = Object.new
+    m = ObjectSpace::WeakMap.new
+    return_value = m.delete(key) do |yielded_key|
+      yielded_key.should == key
+      5
+    end
+    return_value.should == 5
+  end
+
+  it "returns nil if the key is not found when no block is given" do
+    m = ObjectSpace::WeakMap.new
+    m.delete(Object.new).should == nil
+  end
+end
diff --git a/spec/ruby/core/objectspace/weakmap/shared/each.rb b/spec/ruby/core/objectspace/weakmap/shared/each.rb
index 3d43a19347..771c416dde 100644
--- a/spec/ruby/core/objectspace/weakmap/shared/each.rb
+++ b/spec/ruby/core/objectspace/weakmap/shared/each.rb
@@ -5,6 +5,6 @@ describe :weakmap_each, shared: true do
     ref = "x"
     map.send(@method).should == map
     map[key] = ref
-    -> { map.send(@method) }.should raise_error(LocalJumpError)
+    -> { map.send(@method) }.should.raise(LocalJumpError)
   end
 end