[ruby/forwardable] Make def_{instance,single}_delegators skip :__send__ and :__id__

Previously, __send__ and __id__ were skipped if provided as strings,
but not skipped if provided as symbols.

Fixes Ruby Bug 8855.

https://github.com/ruby/forwardable/commit/2e61c8c66c

1 files changed, 24 insertions, 0 deletions

diff --git a/test/test_forwardable.rb b/test/test_forwardable.rb
index 0a90d3a878..2c91d6f87c 100644
--- a/test/test_forwardable.rb
+++ b/test/test_forwardable.rb
@@ -107,6 +107,18 @@ class TestForwardable < Test::Unit::TestCase
     end
   end
 
+  def test_def_instance_delegators_send_id
+    %i[def_delegators def_instance_delegators].each do |m|
+      cls = forwardable_class do
+        attr_reader :receiver
+        __send__ m, :@receiver, :__send__, :__id__
+      end
+
+      assert_not_equal cls.new.__id__, cls.new.receiver.__id__
+      assert_not_equal cls.new.__send__(:__id__), cls.new.receiver.__send__(:__id__)
+    end
+  end
+
   def test_instance_delegate
     %i[delegate instance_delegate].each do |m|
       cls = forwardable_class do
@@ -215,6 +227,18 @@ class TestForwardable < Test::Unit::TestCase
     end
   end
 
+  def test_obj_single_delegators_send_id
+    %i[def_delegators def_single_delegators].each do |m|
+      obj = single_forwardable_object do
+        singleton_class.attr_reader :receiver
+        __send__ m, :@receiver, :__send__, :__id__
+      end
+
+      assert_not_equal obj.__id__, obj.receiver.__id__
+      assert_not_equal obj.__send__(:__id__), obj.receiver.__send__(:__id__)
+    end
+  end
+
   def test_obj_single_delegate
     %i[delegate single_delegate].each do |m|
       obj = single_forwardable_object do