2 files changed, 5 insertions, 16 deletions
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb
index 5fce1eeafc..f8e2ce22fa 100644
--- a/activesupport/test/callbacks_test.rb
+++ b/activesupport/test/callbacks_test.rb
@@ -772,22 +772,6 @@ module CallbacksTest
     end
   end
 
-  class PerKeyOptionDeprecationTest < ActiveSupport::TestCase
-
-    def test_per_key_option_deprecation
-      assert_raise NotImplementedError do
-        Phone.class_eval do
-          set_callback :save, :before, :before_save1, :per_key => {:if => "true"}
-        end
-      end
-      assert_raise NotImplementedError do
-        Phone.class_eval do
-          skip_callback :save, :before, :before_save1, :per_key => {:if => "true"}
-        end
-      end
-    end
-  end
-
   class ExcludingDuplicatesCallbackTest < ActiveSupport::TestCase
     def test_excludes_duplicates_in_separate_calls
       model = DuplicatingCallbacks.new
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index b385e806bc..dfcc6cd12a 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -506,6 +506,11 @@ class HashExtTest < ActiveSupport::TestCase
   def test_indifferent_hash_with_array_of_hashes
     hash = { "urls" => { "url" => [ { "address" => "1" }, { "address" => "2" } ] }}.with_indifferent_access
     assert_equal "1", hash[:urls][:url].first[:address]
+
+    hash = hash.to_hash
+    assert_not hash.instance_of?(HashWithIndifferentAccess)
+    assert_not hash["urls"].instance_of?(HashWithIndifferentAccess)
+    assert_not hash["urls"]["url"].first.instance_of?(HashWithIndifferentAccess)
   end
 
   def test_should_preserve_array_subclass_when_value_is_array