3 files changed, 51 insertions, 48 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..302de264fb
--- /dev/null
+++ b/spec/ruby/core/objectspace/weakmap/delete_spec.rb
@@ -0,0 +1,30 @@
+require_relative '../../../spec_helper'
+
+ruby_version_is '3.3' do
+  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
+end
diff --git a/spec/ruby/core/objectspace/weakmap/element_set_spec.rb b/spec/ruby/core/objectspace/weakmap/element_set_spec.rb
index 2b53650148..8588877158 100644
--- a/spec/ruby/core/objectspace/weakmap/element_set_spec.rb
+++ b/spec/ruby/core/objectspace/weakmap/element_set_spec.rb
@@ -17,45 +17,22 @@ describe "ObjectSpace::WeakMap#[]=" do
     map[key1].should == ref1
   end
 
-  ruby_version_is ""..."2.7" do
-    it "does not accept primitive or frozen keys or values" do
-      map = ObjectSpace::WeakMap.new
-      x = Object.new
-      -> { map[true] = x }.should raise_error(ArgumentError)
-      -> { map[false] = x }.should raise_error(ArgumentError)
-      -> { map[nil] = x }.should raise_error(ArgumentError)
-      -> { map[42] = x }.should raise_error(ArgumentError)
-      -> { map[:foo] = x }.should raise_error(ArgumentError)
-      -> { map[x] = true }.should raise_error(ArgumentError)
-      -> { map[x] = false }.should raise_error(ArgumentError)
-      -> { map[x] = nil }.should raise_error(ArgumentError)
-      -> { map[x] = 42 }.should raise_error(ArgumentError)
-      -> { map[x] = :foo }.should raise_error(ArgumentError)
-
-      y = Object.new.freeze
-      -> { map[x] = y}.should raise_error(FrozenError)
-      -> { map[y] = x}.should raise_error(FrozenError)
-    end
-  end
-
-  ruby_version_is "2.7" do
-    it "accepts primitive or frozen keys or values" do
-      map = ObjectSpace::WeakMap.new
-      x = Object.new
-      should_accept(map, true, x)
-      should_accept(map, false, x)
-      should_accept(map, nil, x)
-      should_accept(map, 42, x)
-      should_accept(map, :foo, x)
+  it "accepts primitive or frozen keys or values" do
+    map = ObjectSpace::WeakMap.new
+    x = Object.new
+    should_accept(map, true, x)
+    should_accept(map, false, x)
+    should_accept(map, nil, x)
+    should_accept(map, 42, x)
+    should_accept(map, :foo, x)
 
-      should_accept(map, x, true)
-      should_accept(map, x, false)
-      should_accept(map, x, 42)
-      should_accept(map, x, :foo)
+    should_accept(map, x, true)
+    should_accept(map, x, false)
+    should_accept(map, x, 42)
+    should_accept(map, x, :foo)
 
-      y = Object.new.freeze
-      should_accept(map, x, y)
-      should_accept(map, y, x)
-    end
+    y = Object.new.freeze
+    should_accept(map, x, y)
+    should_accept(map, y, x)
   end
 end
diff --git a/spec/ruby/core/objectspace/weakmap/shared/include.rb b/spec/ruby/core/objectspace/weakmap/shared/include.rb
index f9c174b6d1..1770eeac8b 100644
--- a/spec/ruby/core/objectspace/weakmap/shared/include.rb
+++ b/spec/ruby/core/objectspace/weakmap/shared/include.rb
@@ -20,15 +20,11 @@ describe :weakmap_include?, shared: true do
     map.send(@method, key2).should == false
   end
 
-  ruby_version_is "2.7" do
-    ruby_bug "#16826", "2.7.0"..."2.7.2" do
-      it "reports true if the pair exists and the value is nil" do
-        map = ObjectSpace::WeakMap.new
-        key = Object.new
-        map[key] = nil
-        map.size.should == 1
-        map.send(@method, key).should == true
-      end
-    end
+  it "reports true if the pair exists and the value is nil" do
+    map = ObjectSpace::WeakMap.new
+    key = Object.new
+    map[key] = nil
+    map.size.should == 1
+    map.send(@method, key).should == true
   end
 end