From aa4ad404c6aa4feccc69b8d7222bcfd1b1903215 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 15 Dec 2007 02:28:20 +0000
Subject: Ruby 1.9 compat: shadowed vars, kcode

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8402 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activesupport/test/json/encoding_test.rb | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'activesupport/test/json')

diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index bf1b9893cb..4e4fe5703e 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -53,11 +53,10 @@ class TestJSONEncoding < Test::Unit::TestCase
   end
 
   def test_utf8_string_encoded_properly_when_kcode_is_utf8
-    old_kcode, $KCODE = $KCODE, 'UTF8'
-    assert_equal '"\\u20ac2.99"', '€2.99'.to_json
-    assert_equal '"\\u270e\\u263a"', '✎☺'.to_json
-  ensure
-    $KCODE = old_kcode
+    with_kcode 'UTF8' do
+      assert_equal '"\\u20ac2.99"', '€2.99'.to_json
+      assert_equal '"\\u270e\\u263a"', '✎☺'.to_json
+    end
   end
 
   def test_exception_raised_when_encoding_circular_reference
@@ -80,6 +79,19 @@ class TestJSONEncoding < Test::Unit::TestCase
   end
 
   protected
+    def with_kcode(code)
+      if RUBY_VERSION < '1.9'
+        begin
+          old_kcode, $KCODE = $KCODE, 'UTF8'
+          yield
+        ensure
+          $KCODE = old_kcode
+        end
+      else
+        yield
+      end
+    end
+
     def object_keys(json_object)
       json_object[1..-2].scan(/([^{}:,\s]+):/).flatten.sort
     end
-- 
cgit v1.2.3