Fixing issue when delegating to methods named "block", "args", or "arg"

1 files changed, 15 insertions, 0 deletions

diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb
index bdfbadcf1d..0ed66f8c37 100644
--- a/activesupport/test/core_ext/module_test.rb
+++ b/activesupport/test/core_ext/module_test.rb
@@ -83,6 +83,16 @@ Product = Struct.new(:name) do
   end
 end
 
+class Block
+  def hello?
+    true
+  end
+end
+
+HasBlock = Struct.new(:block) do
+  delegate :hello?, to: :block
+end
+
 class ParameterSet
   delegate :[], :[]=, :to => :@params
 
@@ -301,6 +311,11 @@ class ModuleTest < ActiveSupport::TestCase
     assert_raise(NoMethodError) { product.type_name }
   end
 
+  def test_delegation_with_method_arguments
+    has_block = HasBlock.new(Block.new)
+    assert has_block.hello?
+  end
+
   def test_parent
     assert_equal Yz::Zy, Yz::Zy::Cd.parent
     assert_equal Yz, Yz::Zy.parent