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

Bring try! into parity with try.

activesupport/lib/active_support/core_ext/object/try.rb

@@ -59,7 +59,7 @@ def try(*a, &b)
   # 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

activesupport/test/core_ext/object/try_test.rb

@@ -30,10 +30,6 @@ def test_nonexisting_method_with_arguments_bang
     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 @@ def test_try_only_block
     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 @@ def test_try_with_instance_eval_block
     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