1 files changed, 40 insertions, 48 deletions
diff --git a/spec/ruby/core/proc/ruby2_keywords_spec.rb b/spec/ruby/core/proc/ruby2_keywords_spec.rb
index 4f6bc151b6..ab67302231 100644
--- a/spec/ruby/core/proc/ruby2_keywords_spec.rb
+++ b/spec/ruby/core/proc/ruby2_keywords_spec.rb
@@ -1,64 +1,56 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "2.7" do
-  describe "Proc#ruby2_keywords" do
-    it "marks the final hash argument as keyword hash" do
-      f = -> *a { a.last }
-      f.ruby2_keywords
-
-      last = f.call(1, 2, a: "a")
-      Hash.ruby2_keywords_hash?(last).should == true
-    end
+describe "Proc#ruby2_keywords" do
+  it "marks the final hash argument as keyword hash" do
+    f = -> *a { a.last }
+    f.ruby2_keywords
 
-    ruby_version_is "2.7" ... "3.0" do
-      it "fixes delegation warnings when calling a method accepting keywords" do
-        obj = Object.new
-        def obj.foo(*a, **b) end
+    last = f.call(1, 2, a: "a")
+    Hash.ruby2_keywords_hash?(last).should == true
+  end
 
-        f = -> *a { obj.foo(*a) }
+  it "applies to the underlying method and applies across duplication" do
+    f1 = -> *a { a.last }
+    f1.ruby2_keywords
+    f2 = f1.dup
 
-        -> { f.call(1, 2, {a: "a"}) }.should complain(/Using the last argument as keyword parameters is deprecated/)
-        f.ruby2_keywords
-        -> { f.call(1, 2, {a: "a"}) }.should_not complain
-      end
+    Hash.ruby2_keywords_hash?(f1.call(1, 2, a: "a")).should == true
+    Hash.ruby2_keywords_hash?(f2.call(1, 2, a: "a")).should == true
 
-      it "fixes delegation warnings when calling a proc accepting keywords" do
-        g = -> *a, **b { }
-        f = -> *a { g.call(*a) }
+    f3 = -> *a { a.last }
+    f4 = f3.dup
+    f3.ruby2_keywords
 
-        -> { f.call(1, 2, {a: "a"}) }.should complain(/Using the last argument as keyword parameters is deprecated/)
-        f.ruby2_keywords
-        -> { f.call(1, 2, {a: "a"}) }.should_not complain
-      end
-    end
+    Hash.ruby2_keywords_hash?(f3.call(1, 2, a: "a")).should == true
+    Hash.ruby2_keywords_hash?(f4.call(1, 2, a: "a")).should == true
+  end
 
-    it "returns self" do
-      f = -> *a { }
-      f.ruby2_keywords.should equal f
-    end
+  it "returns self" do
+    f = -> *a { }
+    f.ruby2_keywords.should equal f
+  end
 
-    it "prints warning when a proc does not accept argument splat" do
-      f = -> a, b, c { }
+  it "prints warning when a proc does not accept argument splat" do
+    f = -> a, b, c { }
 
-      -> {
-        f.ruby2_keywords
-      }.should complain(/Skipping set of ruby2_keywords flag for/)
-    end
+    -> {
+      f.ruby2_keywords
+    }.should complain(/Skipping set of ruby2_keywords flag for/)
+  end
 
-    it "prints warning when a proc accepts keywords" do
-      f = -> a:, b: { }
+  it "prints warning when a proc accepts keywords" do
+    f = -> a:, b: { }
 
-      -> {
-        f.ruby2_keywords
-      }.should complain(/Skipping set of ruby2_keywords flag for/)
-    end
+    -> {
+      f.ruby2_keywords
+    }.should complain(/Skipping set of ruby2_keywords flag for/)
+  end
 
-    it "prints warning when a proc accepts keyword splat" do
-      f = -> **a { }
+  it "prints warning when a proc accepts keyword splat" do
+    f = -> **a { }
 
-      -> {
-        f.ruby2_keywords
-      }.should complain(/Skipping set of ruby2_keywords flag for/)
-    end
+    -> {
+      f.ruby2_keywords
+    }.should complain(/Skipping set of ruby2_keywords flag for/)
   end
 end