10 files changed, 41 insertions, 18 deletions
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb
index cda9732cae..4f47e0519f 100644
--- a/activesupport/test/callbacks_test.rb
+++ b/activesupport/test/callbacks_test.rb
@@ -766,13 +766,11 @@ module CallbacksTest
   end
 
   class CallbackFalseTerminatorWithoutConfigTest < ActiveSupport::TestCase
-    def test_returning_false_halts_callback_if_config_variable_is_not_set
+    def test_returning_false_does_not_halt_callback_if_config_variable_is_not_set
       obj = CallbackFalseTerminator.new
-      assert_deprecated do
-        obj.save
-        assert_equal :second, obj.halted
-        assert !obj.saved
-      end
+      obj.save
+      assert_equal nil, obj.halted
+      assert obj.saved
     end
   end
 
@@ -781,13 +779,11 @@ module CallbacksTest
       ActiveSupport::Callbacks::CallbackChain.halt_and_display_warning_on_return_false = true
     end
 
-    def test_returning_false_halts_callback_if_config_variable_is_true
+    def test_returning_false_does_not_halt_callback_if_config_variable_is_true
       obj = CallbackFalseTerminator.new
-      assert_deprecated do
-        obj.save
-        assert_equal :second, obj.halted
-        assert !obj.saved
-      end
+      obj.save
+      assert_equal nil, obj.halted
+      assert obj.saved
     end
   end
 
diff --git a/activesupport/test/core_ext/hash/transform_keys_test.rb b/activesupport/test/core_ext/hash/transform_keys_test.rb
index a7e12117f3..5a0b99e22c 100644
--- a/activesupport/test/core_ext/hash/transform_keys_test.rb
+++ b/activesupport/test/core_ext/hash/transform_keys_test.rb
@@ -24,9 +24,21 @@ class TransformKeysTest < ActiveSupport::TestCase
     assert_equal Enumerator, enumerator.class
   end
 
+  test "transform_keys! returns an Enumerator if no block is given" do
+    original = { a: 'a', b: 'b' }
+    enumerator = original.transform_keys!
+    assert_equal Enumerator, enumerator.class
+  end
+
   test "transform_keys is chainable with Enumerable methods" do
     original = { a: 'a', b: 'b' }
     mapped = original.transform_keys.with_index { |k, i| [k, i].join.to_sym }
     assert_equal({ a0: 'a', b1: 'b' }, mapped)
   end
+
+  test "transform_keys! is chainable with Enumerable methods" do
+    original = { a: 'a', b: 'b' }
+    original.transform_keys!.with_index { |k, i| [k, i].join.to_sym }
+    assert_equal({ a0: 'a', b1: 'b' }, original)
+  end
 end
diff --git a/activesupport/test/core_ext/hash/transform_values_test.rb b/activesupport/test/core_ext/hash/transform_values_test.rb
index 45ed11fef7..7c33227dc0 100644
--- a/activesupport/test/core_ext/hash/transform_values_test.rb
+++ b/activesupport/test/core_ext/hash/transform_values_test.rb
@@ -53,9 +53,21 @@ class TransformValuesTest < ActiveSupport::TestCase
     assert_equal Enumerator, enumerator.class
   end
 
+  test "transform_values! returns an Enumerator if no block is given" do
+    original = { a: 'a', b: 'b' }
+    enumerator = original.transform_values!
+    assert_equal Enumerator, enumerator.class
+  end
+
   test "transform_values is chainable with Enumerable methods" do
     original = { a: 'a', b: 'b' }
     mapped = original.transform_values.with_index { |v, i| [v, i].join }
     assert_equal({ a: 'a0', b: 'b1' }, mapped)
   end
+
+  test "transform_values! is chainable with Enumerable methods" do
+    original = { a: 'a', b: 'b' }
+    original.transform_values!.with_index { |v, i| [v, i].join }
+    assert_equal({ a: 'a0', b: 'b1' }, original)
+  end
 end
diff --git a/activesupport/test/core_ext/object/blank_test.rb b/activesupport/test/core_ext/object/blank_test.rb
index 8a5e385dd7..a142096993 100644
--- a/activesupport/test/core_ext/object/blank_test.rb
+++ b/activesupport/test/core_ext/object/blank_test.rb
@@ -1,4 +1,3 @@
-
 require 'abstract_unit'
 require 'active_support/core_ext/object/blank'
 
diff --git a/activesupport/test/core_ext/object/try_test.rb b/activesupport/test/core_ext/object/try_test.rb
index 5ea0f0eca6..25bf0207b8 100644
--- a/activesupport/test/core_ext/object/try_test.rb
+++ b/activesupport/test/core_ext/object/try_test.rb
@@ -121,7 +121,7 @@ class ObjectTryTest < ActiveSupport::TestCase
     assert_equal 5, Decorator.new(@string).size
   end
 
-  def test_try_with_overriden_method_on_delegator
+  def test_try_with_overridden_method_on_delegator
     assert_equal 'overridden reverse', Decorator.new(@string).reverse
   end
 
diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb
index 18a8b92eb9..e6898658b5 100644
--- a/activesupport/test/inflector_test_cases.rb
+++ b/activesupport/test/inflector_test_cases.rb
@@ -1,4 +1,3 @@
-
 module InflectorTestCases
   SingularToPlural = {
     "search"      => "searches",
diff --git a/activesupport/test/multibyte_conformance_test.rb b/activesupport/test/multibyte_conformance_test.rb
index d8704716e7..2a885e32bf 100644
--- a/activesupport/test/multibyte_conformance_test.rb
+++ b/activesupport/test/multibyte_conformance_test.rb
@@ -1,4 +1,3 @@
-
 require 'abstract_unit'
 require 'multibyte_test_helpers'
 
diff --git a/activesupport/test/multibyte_proxy_test.rb b/activesupport/test/multibyte_proxy_test.rb
index 11f5374017..360cf57302 100644
--- a/activesupport/test/multibyte_proxy_test.rb
+++ b/activesupport/test/multibyte_proxy_test.rb
@@ -1,4 +1,3 @@
-
 require 'abstract_unit'
 
 class MultibyteProxyText < ActiveSupport::TestCase
diff --git a/activesupport/test/multibyte_test_helpers.rb b/activesupport/test/multibyte_test_helpers.rb
index 2e4b5cc873..58cf5488cd 100644
--- a/activesupport/test/multibyte_test_helpers.rb
+++ b/activesupport/test/multibyte_test_helpers.rb
@@ -1,4 +1,3 @@
-
 module MultibyteTestHelpers
   UNICODE_STRING = 'こにちわ'.freeze
   ASCII_STRING = 'ohayo'.freeze
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index 9e6d1a91d0..18228a2ac5 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -56,6 +56,14 @@ class AssertDifferenceTest < ActiveSupport::TestCase
     end
   end
 
+  def test_assert_difference_retval
+    incremented = assert_difference '@object.num', +1 do
+      @object.increment
+    end
+
+    assert_equal incremented, 1
+  end
+
   def test_assert_difference_with_implicit_difference
     assert_difference '@object.num' do
       @object.increment