1 files changed, 30 insertions, 2 deletions
diff --git a/test/ruby/test_nomethod_error.rb b/test/ruby/test_nomethod_error.rb
index 321b7ccab2..6abd20cc81 100644
--- a/test/ruby/test_nomethod_error.rb
+++ b/test/ruby/test_nomethod_error.rb
@@ -78,14 +78,14 @@ class TestNoMethodError < Test::Unit::TestCase
     assert_equal :foo, error.name
     assert_equal [1, 2], error.args
     assert_equal receiver, error.receiver
-    assert error.private_call?, "private_call? was false."
+    assert_predicate error, :private_call?
   end
 
   def test_message_encoding
     bug3237 = '[ruby-core:29948]'
     str = "\u2600"
     id = :"\u2604"
-    msg = "undefined method `#{id}' for \"#{str}\":String"
+    msg = "undefined method '#{id}' for an instance of String"
     assert_raise_with_message(NoMethodError, Regexp.compile(Regexp.quote(msg)), bug3237) do
       str.__send__(id)
     end
@@ -106,4 +106,32 @@ class TestNoMethodError < Test::Unit::TestCase
 
     assert_match(/undefined method.+this_method_does_not_exist.+for.+Module/, err.to_s)
   end
+
+  def test_send_forward_raises
+    t = EnvUtil.labeled_class("Test") do
+      def foo(...)
+        forward(...)
+      end
+    end
+    obj = t.new
+    assert_raise(NoMethodError) do
+      obj.foo
+    end
+  end
+
+  # [Bug #21535]
+  def test_send_forward_raises_when_called_through_vcall
+    t = EnvUtil.labeled_class("Test") do
+      def foo(...)
+        forward(...)
+      end
+      def foo_indirect
+        foo # vcall
+      end
+    end
+    obj = t.new
+    assert_raise(NoMethodError) do
+      obj.foo_indirect
+    end
+  end
 end