From 34c125d774ed817d45bb11a5173f989ca16cc514 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Fri, 26 Oct 2007 03:22:02 +0000 Subject: Fix JSON encoding/decoding bugs dealing with /'s. Closes #9990 [Rick, theamazingrando] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8026 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/test/json/decoding_test.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'activesupport/test/json/decoding_test.rb') diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb index f0b0da32c8..93560fb5a2 100644 --- a/activesupport/test/json/decoding_test.rb +++ b/activesupport/test/json/decoding_test.rb @@ -2,10 +2,10 @@ require File.dirname(__FILE__) + '/../abstract_unit' class TestJSONDecoding < Test::Unit::TestCase TESTS = { - %({"returnTo":{"/categories":"/"}}) => {"returnTo" => {"/categories" => "/"}}, - %({returnTo:{"/categories":"/"}}) => {"returnTo" => {"/categories" => "/"}}, - %({"return\\"To\\":":{"/categories":"/"}}) => {"return\"To\":" => {"/categories" => "/"}}, - %({"returnTo":{"/categories":1}}) => {"returnTo" => {"/categories" => 1}}, + %q({"returnTo":{"\/categories":"\/"}}) => {"returnTo" => {"/categories" => "/"}}, + %q({returnTo:{"\/categories":"\/"}}) => {"returnTo" => {"/categories" => "/"}}, + %q({"return\\"To\\":":{"\/categories":"\/"}}) => {"return\"To\":" => {"/categories" => "/"}}, + %q({"returnTo":{"\/categories":1}}) => {"returnTo" => {"/categories" => 1}}, %({"returnTo":[1,"a"]}) => {"returnTo" => [1, "a"]}, %({"returnTo":[1,"\\"a\\",", "b"]}) => {"returnTo" => [1, "\"a\",", "b"]}, %({a: "'", "b": "5,000"}) => {"a" => "'", "b" => "5,000"}, @@ -23,11 +23,12 @@ class TestJSONDecoding < Test::Unit::TestCase %("\\"") => "\"", %(null) => nil, %(true) => true, - %(false) => false + %(false) => false, + %q("http:\/\/test.host\/posts\/1") => "http://test.host/posts/1" } - def test_json_decoding - TESTS.each do |json, expected| + TESTS.each do |json, expected| + define_method :"test_json_decoding_#{json}" do assert_nothing_raised do assert_equal expected, ActiveSupport::JSON.decode(json) end @@ -37,4 +38,4 @@ class TestJSONDecoding < Test::Unit::TestCase def test_failed_json_decoding assert_raises(ActiveSupport::JSON::ParseError) { ActiveSupport::JSON.decode(%({: 1})) } end -end \ No newline at end of file +end -- cgit v1.2.3