Revert "Merge pull request #50489 from maniSHarma7575/50481-fix-activ…

…esupport-json-encode" This reverts commit 7b9e9ee, reversing changes made to 590a675. Reason: #50489 (comment)
rails · May 22, 2024 · c0a2b28 · c0a2b28
1 parent 26f8edf
commit c0a2b28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
@@ -76,13 +76,7 @@ def jsonify(value)
             when Hash
               result = {}
               value.each do |k, v|
-                unless String === k
-                  k = if Symbol === k
-                    k.name
-                  else
-                    k.to_s
-                  end
-                end
+                k = k.to_s unless Symbol === k || String === k
                 result[k] = jsonify(v)
               end
               result

diff --git a/activesupport/test/json/encoding_test_cases.rb b/activesupport/test/json/encoding_test_cases.rb
@@ -81,8 +81,7 @@ module EncodingTestCases
                      [ [1, "a", :b, nil, false], %([1,\"a\",\"b\",null,false]) ]]
 
     HashTests     = [[ { foo: "bar" }, %({\"foo\":\"bar\"}) ],
-                     [ { 1 => 1, 2 => "a", 3 => :b, 4 => nil, 5 => false }, %({\"1\":1,\"2\":\"a\",\"3\":\"b\",\"4\":null,\"5\":false}) ],
-                     [ { "a" => 1, :a => 2, :c => { "b" => 3, :b => 4 } }, %({\"a\":2,\"c\":{\"b\":4}}) ]]
+                     [ { 1 => 1, 2 => "a", 3 => :b, 4 => nil, 5 => false }, %({\"1\":1,\"2\":\"a\",\"3\":\"b\",\"4\":null,\"5\":false}) ]]
 
     RangeTests    = [[ 1..2,     %("1..2")],
                      [ 1...2,    %("1...2")],