aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/json
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-07-01 16:22:17 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-07-01 16:22:19 -0700
commit49824e8ad64be17d6b8a0356bc30342aecc72216 (patch)
tree6330162760401a342999f4d85d158088fc60e14b /activesupport/test/json
parentf37a2ea84c291e7cf7921fb69b03419aa00c3d20 (diff)
downloadrails-49824e8ad64be17d6b8a0356bc30342aecc72216.tar.gz
rails-49824e8ad64be17d6b8a0356bc30342aecc72216.tar.bz2
rails-49824e8ad64be17d6b8a0356bc30342aecc72216.zip
JSON.escape returns UTF-8 strings
[#2849 state:resolved]
Diffstat (limited to 'activesupport/test/json')
-rw-r--r--activesupport/test/json/encoding_test.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 983235d06c..5d81d09f03 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -75,8 +75,13 @@ class TestJSONEncoding < Test::Unit::TestCase
def test_utf8_string_encoded_properly_when_kcode_is_utf8
with_kcode 'UTF8' do
- assert_equal '"\\u20ac2.99"', ActiveSupport::JSON.encode('€2.99')
- assert_equal '"\\u270e\\u263a"', ActiveSupport::JSON.encode('✎☺')
+ result = ActiveSupport::JSON.encode('€2.99')
+ assert_equal '"\\u20ac2.99"', result
+ assert_equal(Encoding::UTF_8, result.encoding) if result.respond_to?(:encoding)
+
+ result = ActiveSupport::JSON.encode('✎☺')
+ assert_equal '"\\u270e\\u263a"', result
+ assert_equal(Encoding::UTF_8, result.encoding) if result.respond_to?(:encoding)
end
end