1 files changed, 22 insertions, 10 deletions
diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb
index cbae6e7ed5..5434acb523 100644
--- a/test/ripper/test_parser_events.rb
+++ b/test/ripper/test_parser_events.rb
@@ -267,17 +267,29 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
   end
 
   def test_assign_error_backref
-    thru_assign_error = false
+    errors = []
     result =
-      parse('$` = 1', :on_assign_error) {thru_assign_error = true}
-    assert_equal true, thru_assign_error
-    assert_equal '[assign(assign_error(var_field($`)),1)]', result
+      parse('$& = 1', %i[on_assign_error compile_error]) {|e, *| errors << e}
+    assert_equal %i[on_assign_error], errors
+    assert_equal '[assign(assign_error(var_field($&)),1)]', result
 
-    thru_assign_error = false
+    errors = []
     result =
-      parse('$`, _ = 1', :on_assign_error) {thru_assign_error = true}
-    assert_equal true, thru_assign_error
-    assert_equal '[massign([assign_error(var_field($`)),var_field(_)],1)]', result
+      parse('$&, _ = 1', %i[on_assign_error compile_error]) {|e, *| errors << e}
+    assert_equal %i[on_assign_error], errors
+    assert_equal '[massign([assign_error(var_field($&)),var_field(_)],1)]', result
+
+    errors = []
+    result =
+      parse('$& += 1', %i[on_assign_error compile_error]) {|e, *| errors << e}
+    assert_equal %i[on_assign_error], errors
+    assert_equal '[assign_error(opassign(var_field($&),+=,1))]', result
+
+    errors = []
+    result =
+      parse('$& += cmd 1, 2', %i[on_assign_error compile_error]) {|e, *| errors << e}
+    assert_equal %i[on_assign_error], errors
+    assert_equal '[assign_error(opassign(var_field($&),+=,command(cmd,[1,2])))]', result
   end
 
   def test_assign_error_const_qualified
@@ -1682,8 +1694,8 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
       else
       end
     STR
-    assert_match(/duplicated 'when' clause/, fmt)
-    assert_equal([3], args)
+    assert_match(/duplicates 'when' clause/, fmt)
+    assert_equal([4, 3], args)
   end
 
   def test_warn_duplicated_hash_keys