1 files changed, 70 insertions, 6 deletions
diff --git a/activesupport/test/core_ext/object/try_test.rb b/activesupport/test/core_ext/object/try_test.rb
index 89438675c1..5ea0f0eca6 100644
--- a/activesupport/test/core_ext/object/try_test.rb
+++ b/activesupport/test/core_ext/object/try_test.rb
@@ -77,9 +77,9 @@ class ObjectTryTest < ActiveSupport::TestCase
     klass = Class.new do
       private
 
-      def private_method
-        'private method'
-      end
+        def private_method
+          'private method'
+        end
     end
 
     assert_raise(NoMethodError) { klass.new.try!(:private_method) }
@@ -89,11 +89,75 @@ class ObjectTryTest < ActiveSupport::TestCase
     klass = Class.new do
       private
 
-      def private_method
-        'private method'
-      end
+        def private_method
+          'private method'
+        end
     end
 
     assert_nil klass.new.try(:private_method)
   end
+
+  class Decorator < SimpleDelegator
+    def delegator_method
+      'delegator method'
+    end
+
+    def reverse
+      'overridden reverse'
+    end
+
+    private
+
+      def private_delegator_method
+        'private delegator method'
+      end
+  end
+
+  def test_try_with_method_on_delegator
+    assert_equal 'delegator method', Decorator.new(@string).try(:delegator_method)
+  end
+
+  def test_try_with_method_on_delegator_target
+    assert_equal 5, Decorator.new(@string).size
+  end
+
+  def test_try_with_overriden_method_on_delegator
+    assert_equal 'overridden reverse', Decorator.new(@string).reverse
+  end
+
+  def test_try_with_private_method_on_delegator
+    assert_nil Decorator.new(@string).try(:private_delegator_method)
+  end
+
+  def test_try_with_private_method_on_delegator_bang
+    assert_raise(NoMethodError) do
+      Decorator.new(@string).try!(:private_delegator_method)
+    end
+  end
+
+  def test_try_with_private_method_on_delegator_target
+    klass = Class.new do
+      private
+
+        def private_method
+          'private method'
+        end
+    end
+
+    assert_nil Decorator.new(klass.new).try(:private_method)
+  end
+
+  def test_try_with_private_method_on_delegator_target_bang
+    klass = Class.new do
+      private
+
+        def private_method
+          'private method'
+        end
+    end
+
+    assert_raise(NoMethodError) do
+      Decorator.new(klass.new).try!(:private_method)
+    end
+  end
 end