1 files changed, 69 insertions, 50 deletions
diff --git a/spec/ruby/language/lambda_spec.rb b/spec/ruby/language/lambda_spec.rb
index a4c265d80c..a3f01ec04b 100644
--- a/spec/ruby/language/lambda_spec.rb
+++ b/spec/ruby/language/lambda_spec.rb
@@ -22,14 +22,12 @@ describe "A lambda literal -> () { }" do
     -> { }.lambda?.should be_true
   end
 
-  ruby_version_is "2.6" do
-    it "may include a rescue clause" do
-      eval('-> do raise ArgumentError; rescue ArgumentError; 7; end').should be_an_instance_of(Proc)
-    end
+  it "may include a rescue clause" do
+    eval('-> do raise ArgumentError; rescue ArgumentError; 7; end').should be_an_instance_of(Proc)
+  end
 
-    it "may include a ensure clause" do
-      eval('-> do 1; ensure; 2; end').should be_an_instance_of(Proc)
-    end
+  it "may include a ensure clause" do
+    eval('-> do 1; ensure; 2; end').should be_an_instance_of(Proc)
   end
 
   it "has its own scope for local variables" do
@@ -179,16 +177,34 @@ describe "A lambda literal -> () { }" do
       result.should == [1, 2, 3, [4, 5], 6, [7, 8], 9, 10, 11, 12]
     end
 
-    evaluate <<-ruby do
-        @a = -> (*, **k) { k }
-      ruby
+    ruby_version_is ''...'3.0' do
+      evaluate <<-ruby do
+          @a = -> (*, **k) { k }
+        ruby
 
-      @a.().should == {}
-      @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5}
+        @a.().should == {}
+        @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5}
+
+        suppress_keyword_warning do
+          h = mock("keyword splat")
+          h.should_receive(:to_hash).and_return({a: 1})
+          @a.(h).should == {a: 1}
+        end
+      end
+    end
+
+    ruby_version_is '3.0' do
+      evaluate <<-ruby do
+          @a = -> (*, **k) { k }
+        ruby
+
+        @a.().should == {}
+        @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5}
 
-      h = mock("keyword splat")
-      h.should_receive(:to_hash).and_return({a: 1})
-      @a.(h).should == {a: 1}
+        h = mock("keyword splat")
+        h.should_not_receive(:to_hash)
+        @a.(h).should == {}
+      end
     end
 
     evaluate <<-ruby do
@@ -265,20 +281,18 @@ describe "A lambda literal -> () { }" do
     end
 
     describe "with circular optional argument reference" do
-      it "shadows an existing local with the same name as the argument" do
+      it "raises a SyntaxError if using an existing local with the same name as the argument" do
         a = 1
         -> {
           @proc = eval "-> (a=a) { a }"
-        }.should complain(/circular argument reference/)
-        @proc.call.should == nil
+        }.should raise_error(SyntaxError)
       end
 
-      it "shadows an existing method with the same name as the argument" do
+      it "raises a SyntaxError if there is an existing method with the same name as the argument" do
         def a; 1; end
         -> {
           @proc = eval "-> (a=a) { a }"
-        }.should complain(/circular argument reference/)
-        @proc.call.should == nil
+        }.should raise_error(SyntaxError)
       end
 
       it "calls an existing method with the same name as the argument if explicitly using ()" do
@@ -312,36 +326,23 @@ describe "A lambda expression 'lambda { ... }'" do
   end
 
   it "requires a block" do
-    lambda { lambda }.should raise_error(ArgumentError)
-  end
-
-  ruby_version_is "2.5" do
-    it "may include a rescue clause" do
-      eval('lambda do raise ArgumentError; rescue ArgumentError; 7; end').should be_an_instance_of(Proc)
+    suppress_warning do
+      lambda { lambda }.should raise_error(ArgumentError)
     end
   end
 
+  it "may include a rescue clause" do
+    eval('lambda do raise ArgumentError; rescue ArgumentError; 7; end').should be_an_instance_of(Proc)
+  end
 
   context "with an implicit block" do
     before do
       def meth; lambda; end
     end
 
-    ruby_version_is ""..."2.7" do
-      it "can be created" do
-        implicit_lambda = nil
-        -> {
-          implicit_lambda = meth { 1 }
-        }.should complain(/tried to create Proc object without a block/)
-
-        implicit_lambda.lambda?.should be_true
-        implicit_lambda.call.should == 1
-      end
-    end
-
-    ruby_version_is "2.7" do
-      it "raises ArgumentError" do
-        implicit_lambda = nil
+    it "raises ArgumentError" do
+      implicit_lambda = nil
+      suppress_warning do
         -> {
           meth { 1 }
         }.should raise_error(ArgumentError, /tried to create Proc object without a block/)
@@ -513,16 +514,34 @@ describe "A lambda expression 'lambda { ... }'" do
       result.should == [1, 2, 3, [4, 5], 6, [7, 8], 9, 10, 11, 12]
     end
 
-    evaluate <<-ruby do
-        @a = lambda { |*, **k| k }
-      ruby
+    ruby_version_is ''...'3.0' do
+      evaluate <<-ruby do
+          @a = lambda { |*, **k| k }
+        ruby
 
-      @a.().should == {}
-      @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5}
+        @a.().should == {}
+        @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5}
 
-      h = mock("keyword splat")
-      h.should_receive(:to_hash).and_return({a: 1})
-      @a.(h).should == {a: 1}
+        suppress_keyword_warning do
+          h = mock("keyword splat")
+          h.should_receive(:to_hash).and_return({a: 1})
+          @a.(h).should == {a: 1}
+        end
+      end
+    end
+
+    ruby_version_is '3.0' do
+      evaluate <<-ruby do
+          @a = lambda { |*, **k| k }
+        ruby
+
+        @a.().should == {}
+        @a.(1, 2, 3, a: 4, b: 5).should == {a: 4, b: 5}
+
+        h = mock("keyword splat")
+        h.should_not_receive(:to_hash)
+        @a.(h).should == {}
+      end
     end
 
     evaluate <<-ruby do