Permalink
Browse files

Fix a JSON ordering issue

  • Loading branch information...
1 parent ff7db40 commit a3eaaf6b50b76a51080ec9ae6b217095868f3054 Yehuda Katz committed Feb 10, 2010
Showing with 7 additions and 3 deletions.
  1. +7 −3 activesupport/test/json/encoding_test.rb
@@ -50,13 +50,18 @@ def as_json(options)
StandardDateTimeTests = [[ DateTime.civil(2005,2,1,15,15,10), %("2005-02-01T15:15:10+00:00") ]]
StandardStringTests = [[ 'this is the <string>', %("this is the <string>")]]
+ def sorted_json(json)
+ return json unless json =~ /^\{.*\}$/
+ '{' + json[1..-2].split(',').sort.join(',') + '}'
+ end
+
constants.grep(/Tests$/).each do |class_tests|
define_method("test_#{class_tests[0..-6].underscore}") do
begin
ActiveSupport.escape_html_entities_in_json = class_tests !~ /^Standard/
ActiveSupport.use_standard_json_time_format = class_tests =~ /^Standard/
self.class.const_get(class_tests).each do |pair|
- assert_equal pair.last, ActiveSupport::JSON.encode(pair.first)
+ assert_equal pair.last, sorted_json(ActiveSupport::JSON.encode(pair.first))
end
ensure
ActiveSupport.escape_html_entities_in_json = false
@@ -71,8 +76,7 @@ def test_hash_encoding
assert_equal %({\"a\":[1,2]}), ActiveSupport::JSON.encode('a' => [1,2])
assert_equal %({"1":2}), ActiveSupport::JSON.encode(1 => 2)
- sorted_json = '{' + ActiveSupport::JSON.encode(:a => :b, :c => :d)[1..-2].split(',').sort.join(',') + '}'
- assert_equal %({\"a\":\"b\",\"c\":\"d\"}), sorted_json
+ assert_equal %({\"a\":\"b\",\"c\":\"d\"}), sorted_json(ActiveSupport::JSON.encode(:a => :b, :c => :d))
end
def test_utf8_string_encoded_properly_when_kcode_is_utf8

0 comments on commit a3eaaf6

Please sign in to comment.