diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-25 03:40:59 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-25 03:40:59 -0800 |
| commit | 97636d95227b73e3875732fa61fa1d44157d32f1 (patch) | |
| tree | d4ccf417d4ed7c999b574ba941cf9ecb68f7882c /activesupport/test/json/encoding_test.rb | |
| parent | 4c1701c0ca6ae77a8274f59460751d1b1d83ce1b (diff) | |
| parent | 1e9e88fcd335c7d5a99159d592c3e1b605510a16 (diff) | |
| download | rails-97636d95227b73e3875732fa61fa1d44157d32f1.tar.gz rails-97636d95227b73e3875732fa61fa1d44157d32f1.tar.bz2 rails-97636d95227b73e3875732fa61fa1d44157d32f1.zip | |
Merge pull request #4180 from lest/remove-encoding-related
remove checks for encodings availability
Diffstat (limited to 'activesupport/test/json/encoding_test.rb')
| -rw-r--r-- | activesupport/test/json/encoding_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb index ad9a497515..a6435a763a 100644 --- a/activesupport/test/json/encoding_test.rb +++ b/activesupport/test/json/encoding_test.rb @@ -91,11 +91,11 @@ class TestJSONEncoding < Test::Unit::TestCase def test_utf8_string_encoded_properly result = ActiveSupport::JSON.encode('€2.99') assert_equal '"\\u20ac2.99"', result - assert_equal(Encoding::UTF_8, result.encoding) if result.respond_to?(:encoding) + assert_equal(Encoding::UTF_8, result.encoding) result = ActiveSupport::JSON.encode('✎☺') assert_equal '"\\u270e\\u263a"', result - assert_equal(Encoding::UTF_8, result.encoding) if result.respond_to?(:encoding) + assert_equal(Encoding::UTF_8, result.encoding) end def test_non_utf8_string_transcodes |