1 files changed, 30 insertions, 10 deletions
diff --git a/spec/ruby/optional/capi/util_spec.rb b/spec/ruby/optional/capi/util_spec.rb
index 320527521b..dd3cbb6549 100644
--- a/spec/ruby/optional/capi/util_spec.rb
+++ b/spec/ruby/optional/capi/util_spec.rb
@@ -21,11 +21,11 @@ describe "C-API Util function" do
     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
@@ -117,8 +117,15 @@ describe "C-API Util function" 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)
+        @o.rb_scan_args([1, nil], "1:", 2, @acc)
+      }.should.raise(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+      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
 
@@ -127,6 +134,19 @@ describe "C-API Util function" do
       ScratchPad.recorded.should == [1, 7, 4]
     end
 
+    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
+
+    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
+
+      ScratchPad.recorded.should == [1, nil, nil]
+    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
@@ -173,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
 
@@ -185,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
 
@@ -196,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
 
@@ -245,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(Integer)
+      @o.rb_sourceline.should.is_a?(Integer)
     end
   end