1 files changed, 13 insertions, 17 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 8cf1a54a99..ad9a497515 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -88,25 +88,21 @@ class TestJSONEncoding < Test::Unit::TestCase
     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
-    with_kcode 'UTF8' do
-      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
+  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)
+
+    result = ActiveSupport::JSON.encode('✎☺')
+    assert_equal '"\\u270e\\u263a"', result
+    assert_equal(Encoding::UTF_8, result.encoding) if result.respond_to?(:encoding)
   end
 
-  if '1.9'.respond_to?(:force_encoding)
-    def test_non_utf8_string_transcodes
-      s = '二'.encode('Shift_JIS')
-      result = ActiveSupport::JSON.encode(s)
-      assert_equal '"\\u4e8c"', result
-      assert_equal Encoding::UTF_8, result.encoding
-    end
+  def test_non_utf8_string_transcodes
+    s = '二'.encode('Shift_JIS')
+    result = ActiveSupport::JSON.encode(s)
+    assert_equal '"\\u4e8c"', result
+    assert_equal Encoding::UTF_8, result.encoding
   end
 
   def test_exception_raised_when_encoding_circular_reference_in_array