Merge pull request #17361 from aripollak/try-bang-parity

Bring try! into parity with try.

2 files changed, 9 insertions, 5 deletions

diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb
index 31919474ed..112ec05e15 100644
--- a/activesupport/lib/active_support/core_ext/object/try.rb
+++ b/activesupport/lib/active_support/core_ext/object/try.rb
@@ -59,7 +59,7 @@ class Object
   # does not implement the tried method.
   def try!(*a, &b)
     if a.empty? && block_given?
-      yield self
+      try(*a, &b)
     else
       public_send(*a, &b)
     end
diff --git a/activesupport/test/core_ext/object/try_test.rb b/activesupport/test/core_ext/object/try_test.rb
index 225c20fa36..efc6beaf02 100644
--- a/activesupport/test/core_ext/object/try_test.rb
+++ b/activesupport/test/core_ext/object/try_test.rb
@@ -30,10 +30,6 @@ class ObjectTryTest < ActiveSupport::TestCase
     assert_raise(NoMethodError) { @string.try!(method, 'llo', 'y') }
   end
 
-  def test_try_only_block_bang
-    assert_equal @string.reverse, @string.try! { |s| s.reverse }
-  end
-
   def test_valid_method
     assert_equal 5, @string.try(:size)
   end
@@ -59,6 +55,10 @@ class ObjectTryTest < ActiveSupport::TestCase
     assert_equal @string.reverse, @string.try { |s| s.reverse }
   end
 
+  def test_try_only_block_bang
+    assert_equal @string.reverse, @string.try! { |s| s.reverse }
+  end
+
   def test_try_only_block_nil
     ran = false
     nil.try { ran = true }
@@ -69,6 +69,10 @@ class ObjectTryTest < ActiveSupport::TestCase
     assert_equal @string.reverse, @string.try { reverse }
   end
 
+  def test_try_with_instance_eval_block_bang
+    assert_equal @string.reverse, @string.try! { reverse }
+  end
+
   def test_try_with_private_method_bang
     klass = Class.new do
       private