aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/json
diff options
context:
space:
mode:
authorUbiratan Pires Alberton <u.alberton@gmail.com>2009-03-11 06:12:08 -0300
committerJeremy Kemper <jeremy@bitsweat.net>2009-03-11 14:36:14 -0700
commit7b382cb9e5c5706f8d15216159a2873375915c9c (patch)
tree9c21c1e251e5269920648e799c30f01ca27805c0 /activesupport/test/json
parentf2c7508befb085ffe19ec7fb9ca2e6919cc919c9 (diff)
downloadrails-7b382cb9e5c5706f8d15216159a2873375915c9c.tar.gz
rails-7b382cb9e5c5706f8d15216159a2873375915c9c.tar.bz2
rails-7b382cb9e5c5706f8d15216159a2873375915c9c.zip
Reverted affe50105f7027a44eb6e9cfb56f5b3fc070b19b and added more JSON decoding tests.
Works on Ruby 1.8 and 1.9 [#1100 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activesupport/test/json')
-rw-r--r--activesupport/test/json/decoding_test.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index c5816ea168..8fe40557d6 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -30,7 +30,9 @@ class TestJSONDecoding < Test::Unit::TestCase
%(false) => false,
%q("http:\/\/test.host\/posts\/1") => "http://test.host/posts/1",
%q("\u003cunicode\u0020escape\u003e") => "<unicode escape>",
- %q("\\\\u0020skip double backslashes") => "\\u0020skip double backslashes"
+ %q("\\\\u0020skip double backslashes") => "\\u0020skip double backslashes",
+ %q({a: "\u003cbr /\u003e"}) => {'a' => "<br />"},
+ %q({b:["\u003ci\u003e","\u003cb\u003e","\u003cu\u003e"]}) => {'b' => ["<i>","<b>","<u>"]}
}
TESTS.each do |json, expected|