Merge remote-tracking branch 'upstream/master' into lang-doc

2 files changed, 11 insertions, 2 deletions

diff --git a/test/assert.rb b/test/assert.rb
index 98057331b..3d35fc267 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -101,7 +101,7 @@ end
 
 def assert_equal(arg1, arg2 = nil, arg3 = nil)
   if block_given?
-    exp, act, msg = yield, arg1, arg2
+    exp, act, msg = arg1, yield, arg2
   else
     exp, act, msg = arg1, arg2, arg3
   end
@@ -113,7 +113,7 @@ end
 
 def assert_not_equal(arg1, arg2 = nil, arg3 = nil)
   if block_given?
-    exp, act, msg = yield, arg1, arg2
+    exp, act, msg = arg1, yield, arg2
   else
     exp, act, msg = arg1, arg2, arg3
   end
diff --git a/test/t/syntax.rb b/test/t/syntax.rb
index 332cfcca8..b975d0103 100644
--- a/test/t/syntax.rb
+++ b/test/t/syntax.rb
@@ -65,3 +65,12 @@ assert('Abbreviated variable assignment as returns') do
   end
   assert_equal Syntax4AbbrVarAsgnAsReturns::A.new.b, 1
 end
+
+assert('Splat and mass assignment') do
+  *a = *[1,2,3]
+  b, *c = *[7,8,9]
+
+  assert_equal [1,2,3], a
+  assert_equal 7, b
+  assert_equal [8,9], c
+end