Restore HWIA support to AJ::Arguments.deserialize

Restore HashWithIndifferentAccess support to
ActiveJob::Arguments.deserialize.

3 files changed, 13 insertions, 1 deletions

diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index 768e6bd250..8bbecd5a5a 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Restore HashWithIndifferentAccess support to ActiveJob::Arguments.deserialize.
+
+    *Gannon McGibbon*
+
 *   Include deserialized arguments in job instances returned from
     `assert_enqueued_with` and `assert_performed_with`
 
diff --git a/activejob/lib/active_job/arguments.rb b/activejob/lib/active_job/arguments.rb
index 8dcf588f35..31347194d2 100644
--- a/activejob/lib/active_job/arguments.rb
+++ b/activejob/lib/active_job/arguments.rb
@@ -147,7 +147,10 @@ module ActiveJob
       end
 
       def transform_symbol_keys(hash, symbol_keys)
-        hash.transform_keys do |key|
+        # NOTE: HashWithIndifferentAccess#transform_keys always
+        # returns stringified keys with indifferent access
+        # so we call #to_h here to ensure keys are symbolized.
+        hash.to_h.transform_keys do |key|
           if symbol_keys.include?(key)
             key.to_sym
           else
diff --git a/activejob/test/cases/argument_serialization_test.rb b/activejob/test/cases/argument_serialization_test.rb
index f07529d743..8b2981926f 100644
--- a/activejob/test/cases/argument_serialization_test.rb
+++ b/activejob/test/cases/argument_serialization_test.rb
@@ -73,6 +73,7 @@ class ArgumentSerializationTest < ActiveSupport::TestCase
     string_key = { "a" => 1, "_aj_symbol_keys" => [] }
     another_string_key = { "a" => 1 }
     indifferent_access = { "a" => 1, "_aj_hash_with_indifferent_access" => true }
+    indifferent_access_symbol_key = symbol_key.with_indifferent_access
 
     assert_equal(
       { a: 1 },
@@ -90,6 +91,10 @@ class ArgumentSerializationTest < ActiveSupport::TestCase
       { "a" => 1 },
       ActiveJob::Arguments.deserialize([indifferent_access]).first
     )
+    assert_equal(
+      { a: 1 },
+      ActiveJob::Arguments.deserialize([indifferent_access_symbol_key]).first
+    )
   end
 
   test "should maintain hash with indifferent access" do