aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-27 09:33:53 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-27 09:33:53 -0800
commit88a688382079846971f488947f6d1efe8063bc12 (patch)
treed7432a6649c9acd0f65c1ac1de0450af2a0d27b2 /activesupport
parent2283a1d62e36bc7787a01e87a5d2a018e83da22c (diff)
parente68505a41a5c4ceeb0ed343daa0433846b054076 (diff)
downloadrails-88a688382079846971f488947f6d1efe8063bc12.tar.gz
rails-88a688382079846971f488947f6d1efe8063bc12.tar.bz2
rails-88a688382079846971f488947f6d1efe8063bc12.zip
Merge pull request #8634 from senny/rewrite_order_dependent_test_case
rewrite order dependent test case
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/json/encoding_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index b6e2cd4529..12ce250eb3 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -276,7 +276,8 @@ class TestJSONEncoding < ActiveSupport::TestCase
f.bar = "world"
hash = {"foo" => f, "other_hash" => {"foo" => "other_foo", "test" => "other_test"}}
- assert_equal(%({"foo":{"foo":"hello","bar":"world"},"other_hash":{"foo":"other_foo","test":"other_test"}}), hash.to_json)
+ assert_equal({"foo"=>{"foo"=>"hello","bar"=>"world"},
+ "other_hash" => {"foo"=>"other_foo","test"=>"other_test"}}, JSON.parse(hash.to_json))
end
def test_struct_encoding