1 files changed, 50 insertions, 74 deletions
diff --git a/spec/ruby/optional/capi/util_spec.rb b/spec/ruby/optional/capi/util_spec.rb
index 0251c7c62b..dd3cbb6549 100644
--- a/spec/ruby/optional/capi/util_spec.rb
+++ b/spec/ruby/optional/capi/util_spec.rb
@@ -11,21 +11,21 @@ describe "C-API Util function" do
     before :each do
       @prc = -> { 1 }
       @acc = []
-      @keyword_prefix = 'k' if RUBY_VERSION >= '2.7'
       ScratchPad.record @acc
     end
 
     it "assigns the required arguments scanned" do
-      @o.rb_scan_args([1, 2], "2", 2, @acc).should == 2
-      ScratchPad.recorded.should == [1, 2]
+      obj = Object.new
+      @o.rb_scan_args([obj, 2], "2", 2, @acc).should == 2
+      ScratchPad.recorded.should == [obj, 2]
     end
 
     it "raises an ArgumentError if there are insufficient arguments" do
-      -> { @o.rb_scan_args([1, 2], "3", 0, @acc) }.should raise_error(ArgumentError)
+      -> { @o.rb_scan_args([1, 2], "3", 0, @acc) }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 3)")
     end
 
     it "raises an ArgumentError if there are too many arguments" do
-      -> { @o.rb_scan_args([1, 2, 3, 4], "3", 0, @acc) }.should raise_error(ArgumentError)
+      -> { @o.rb_scan_args([1, 2, 3, 4], "3", 0, @acc) }.should.raise(ArgumentError, "wrong number of arguments (given 4, expected 3)")
     end
 
     it "assigns the required and optional arguments scanned" do
@@ -48,7 +48,7 @@ describe "C-API Util function" do
       ScratchPad.recorded.should == [1, 2, [3, 4]]
     end
 
-    it "assigns the required and optional arguments and and empty Array when there are no arguments to splat" do
+    it "assigns the required and optional arguments and empty Array when there are no arguments to splat" do
       @o.rb_scan_args([1, 2], "11*", 3, @acc).should == 2
       ScratchPad.recorded.should == [1, 2, []]
     end
@@ -100,13 +100,13 @@ describe "C-API Util function" do
 
     it "assigns Hash arguments" do
       h = {a: 1, b: 2}
-      @o.rb_scan_args([h], "#{@keyword_prefix}0:", 1, @acc).should == 0
+      @o.rb_scan_args([h], "k0:", 1, @acc).should == 0
       ScratchPad.recorded.should == [h]
     end
 
     it "assigns required and Hash arguments" do
       h = {a: 1, b: 2}
-      @o.rb_scan_args([1, h], "#{@keyword_prefix}1:", 2, @acc).should == 1
+      @o.rb_scan_args([1, h], "k1:", 2, @acc).should == 1
       ScratchPad.recorded.should == [1, h]
     end
 
@@ -115,22 +115,18 @@ describe "C-API Util function" do
       ScratchPad.recorded.should == [1, nil]
     end
 
-    ruby_version_is ''...'3.0' do
-      it "assigns required and Hash arguments with nil Hash" do
-        suppress_warning do
-          @o.rb_scan_args([1, nil], "1:", 2, @acc).should == 1
-        end
-        ScratchPad.recorded.should == [1, nil]
-      end
+    it "rejects the use of nil as a hash" do
+      -> {
+        @o.rb_scan_args([1, nil], "1:", 2, @acc)
+      }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+      ScratchPad.recorded.should == []
     end
 
-    ruby_version_is '3.0' do
-      it "rejects the use of nil as a hash" do
-        -> {
-          @o.rb_scan_args([1, nil], "1:", 2, @acc).should == 1
-        }.should raise_error(ArgumentError)
-        ScratchPad.recorded.should == []
-      end
+    it "rejects the use of of a non-Hash as keywords" do
+      -> {
+        @o.rb_scan_args([42], ":", 1, @acc)
+      }.should.raise(ArgumentError, "wrong number of arguments (given 1, expected 0)")
+      ScratchPad.recorded.should == []
     end
 
     it "assigns required and optional arguments with no hash argument given" do
@@ -138,61 +134,41 @@ describe "C-API Util function" do
       ScratchPad.recorded.should == [1, 7, 4]
     end
 
-    it "assigns required, optional, splat, post-splat, Hash and block arguments" do
-      h = {a: 1, b: 2}
-      @o.rb_scan_args([1, 2, 3, 4, 5, h], "#{@keyword_prefix}11*1:&", 6, @acc, &@prc).should == 5
-      ScratchPad.recorded.should == [1, 2, [3, 4], 5, h, @prc]
+    it "assigns optional arguments with no hash argument given" do
+      @o.rb_scan_args([1, 7], "02:", 3, @acc).should == 2
+      ScratchPad.recorded.should == [1, 7, nil]
     end
 
-    ruby_version_is ''...'3.0' do
-      # r43934
-      it "rejects non-keyword arguments" do
-        h = {1 => 2, 3 => 4}
-        -> {
-          suppress_warning do
-            @o.rb_scan_args([h], "#{@keyword_prefix}0:", 1, @acc)
-          end
-        }.should raise_error(ArgumentError)
-        ScratchPad.recorded.should == []
-      end
+    it "assigns optional arguments with no hash argument given and rejects the use of optional nil argument as a hash" do
+      -> {
+        @o.rb_scan_args([1, nil], "02:", 3, @acc).should == 2
+      }.should_not complain
 
-      it "rejects required and non-keyword arguments" do
-        h = {1 => 2, 3 => 4}
-        -> {
-          suppress_warning do
-            @o.rb_scan_args([1, h], "#{@keyword_prefix}1:", 2, @acc)
-          end
-        }.should raise_error(ArgumentError)
-        ScratchPad.recorded.should == []
-      end
+      ScratchPad.recorded.should == [1, nil, nil]
+    end
 
-      it "considers the hash as a post argument when there is a splat" do
-        h = {1 => 2, 3 => 4}
-        suppress_warning do
-          @o.rb_scan_args([1, 2, 3, 4, 5, h], "#{@keyword_prefix}11*1:&", 6, @acc, &@prc).should == 6
-        end
-        ScratchPad.recorded.should == [1, 2, [3, 4, 5], h, nil, @prc]
-      end
+    it "assigns required, optional, splat, post-splat, Hash and block arguments" do
+      h = {a: 1, b: 2}
+      @o.rb_scan_args([1, 2, 3, 4, 5, h], "k11*1:&", 6, @acc, &@prc).should == 5
+      ScratchPad.recorded.should == [1, 2, [3, 4], 5, h, @prc]
     end
 
-    ruby_version_is '3.0' do
-      it "does not reject non-symbol keys in keyword arguments" do
-        h = {1 => 2, 3 => 4}
-        @o.rb_scan_args([h], "#{@keyword_prefix}0:", 1, @acc).should == 0
-        ScratchPad.recorded.should == [h]
-      end
+    it "does not reject non-symbol keys in keyword arguments" do
+      h = {1 => 2, 3 => 4}
+      @o.rb_scan_args([h], "k0:", 1, @acc).should == 0
+      ScratchPad.recorded.should == [h]
+    end
 
-      it "does not reject non-symbol keys in keyword arguments with required argument" do
-        h = {1 => 2, 3 => 4}
-        @o.rb_scan_args([1, h], "#{@keyword_prefix}1:", 2, @acc).should == 1
-        ScratchPad.recorded.should == [1, h]
-      end
+    it "does not reject non-symbol keys in keyword arguments with required argument" do
+      h = {1 => 2, 3 => 4}
+      @o.rb_scan_args([1, h], "k1:", 2, @acc).should == 1
+      ScratchPad.recorded.should == [1, h]
+    end
 
-      it "considers keyword arguments with non-symbol keys as keywords when using splat and post arguments" do
-        h = {1 => 2, 3 => 4}
-        @o.rb_scan_args([1, 2, 3, 4, 5, h], "#{@keyword_prefix}11*1:&", 6, @acc, &@prc).should == 5
-        ScratchPad.recorded.should == [1, 2, [3, 4], 5, h, @prc]
-      end
+    it "considers keyword arguments with non-symbol keys as keywords when using splat and post arguments" do
+      h = {1 => 2, 3 => 4}
+      @o.rb_scan_args([1, 2, 3, 4, 5, h], "k11*1:&", 6, @acc, &@prc).should == 5
+      ScratchPad.recorded.should == [1, 2, [3, 4], 5, h, @prc]
     end
   end
 
@@ -217,7 +193,7 @@ describe "C-API Util function" do
 
     it "raises an error if a required argument is not in the hash" do
       h = { :a => 7, :c => 12, :b => 5 }
-      -> { @o.rb_get_kwargs(h, [:b, :d], 2, 0) }.should raise_error(ArgumentError, /missing keyword: :?d/)
+      -> { @o.rb_get_kwargs(h, [:b, :d], 2, 0) }.should.raise(ArgumentError, "missing keyword: :d")
       h.should == {:a => 7, :c => 12}
     end
 
@@ -229,7 +205,7 @@ describe "C-API Util function" do
 
     it "raises an error if there are additional arguments  and optional is positive" do
       h = { :a => 7, :c => 12, :b => 5 }
-      -> { @o.rb_get_kwargs(h, [:b, :a], 2, 0) }.should raise_error(ArgumentError, /unknown keyword: :?c/)
+      -> { @o.rb_get_kwargs(h, [:b, :a], 2, 0) }.should.raise(ArgumentError, "unknown keyword: :c")
       h.should == {:c => 12}
     end
 
@@ -240,10 +216,10 @@ describe "C-API Util function" do
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "rb_long2int" do
       it "raises a RangeError if the value is outside the range of a C int" do
-        -> { @o.rb_long2int(0xffff_ffff_ffff) }.should raise_error(RangeError)
+        -> { @o.rb_long2int(0xffff_ffff_ffff) }.should.raise(RangeError)
       end
     end
 
@@ -289,7 +265,7 @@ describe "C-API Util function" do
 
   describe "rb_sourceline" do
     it "returns the current ruby file" do
-      @o.rb_sourceline.should be_kind_of(Fixnum)
+      @o.rb_sourceline.should.is_a?(Integer)
     end
   end