@@ -62,6 +62,28 @@
 it "passes a single, multi-value Array" do
 @y.s([1, 2, 3], &lambda { |*a| a }).should == [[1, 2, 3]]
 end
+
+it "raises an ArgumentError if too few arguments are passed" do
+lambda {
+@y.s(1, &lambda { |a,b| [a,b] })
+}.should raise_error(ArgumentError)
+end
+
+ruby_bug "#12705", "2.4" do
+it "should not destructure an Array into multiple arguments" do
+lambda {
+@y.s([1, 2], &lambda { |a,b| [a,b] })
+}.should raise_error(ArgumentError)
+end
+end
+
+ruby_version_is ""..."2.2" do # above is a regression since 2.2
+it "should not destructure an Array into multiple arguments" do
+lambda {
+@y.s([1, 2], &lambda { |a,b| [a,b] })
+}.should raise_error(ArgumentError)
+end
+end
 end
 end
 
@@ -73,6 +95,22 @@
 it "passes the arguments to the block" do
 @y.m(1, 2, 3) { |*a| a }.should == [1, 2, 3]
 end
+
+it "passes only the first argument if the block takes one parameter" do
+@y.m(1, 2, 3) { |a| a }.should == 1
+end
+
+it "raises an ArgumentError if too many arguments are passed to a lambda" do
+lambda {
+@y.m(1, 2, 3, &lambda { |a| })
+}.should raise_error(ArgumentError)
+end
+
+it "raises an ArgumentError if too few arguments are passed to a lambda" do
+lambda {
+@y.m(1, 2, 3, &lambda { |a,b,c,d| })
+}.should raise_error(ArgumentError)
+end
 end
 
 describe "taking a single splatted argument" do