From 71234daef1517cf190adfc5978e56882d2a57ea6 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 8 Jul 2006 18:14:49 +0000
Subject:  r4487@asus:  jeremy | 2006-04-29 12:21:39 -0700  Check whether
 @flash is defined? for warnings-safety.  r4488@asus:  jeremy | 2006-04-29
 12:23:15 -0700  Check whether @flash is defined? for warnings-safety.
 Obviates nil? check.  r4489@asus:  jeremy | 2006-04-29 12:45:18 -0700  Check
 whether @session is defined? for warnings-safety.  r4490@asus:  jeremy |
 2006-04-29 12:50:41 -0700  Check whether @rendering_runtime is defined? for
 warnings-safety.  r4491@asus:  jeremy | 2006-04-29 12:55:01 -0700  Check
 whether @_cycles is defined? for warnings-safety.  r4492@asus:  jeremy |
 2006-04-29 12:59:19 -0700  Check whether instance variables are defined? for
 warnings-safety.  r4493@asus:  jeremy | 2006-04-29 13:14:09 -0700  Add nil
 @template to PrototypeHelperTest to suppress unitialized instance variable
 warning.  r4494@asus:  jeremy | 2006-04-29 13:31:34 -0700  Check whether
 @auto_index defined? for warnings-safety.  r4495@asus:  jeremy | 2006-04-29
 13:32:24 -0700  Wrap content_columns redefinitions with silence_warnings. 
 r4496@asus:  jeremy | 2006-04-29 13:35:28 -0700  Wrap more redefinitions with
 silence_warnings.  r4829@asus:  jeremy | 2006-07-08 10:59:20 -0700  abstract
 unit, fix warnings  r4830@asus:  jeremy | 2006-07-08 11:06:12 -0700  Use
 parens to silence warning.  r4831@asus:  jeremy | 2006-07-08 11:06:48 -0700 
 Use parens to silence warning.

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

(limited to 'activesupport/test/json.rb')

diff --git a/activesupport/test/json.rb b/activesupport/test/json.rb
index fc4d7705b1..d9c3cebf32 100644
--- a/activesupport/test/json.rb
+++ b/activesupport/test/json.rb
@@ -1,6 +1,4 @@
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'active_support'
-require 'test/unit'
+require File.dirname(__FILE__) + '/abstract_unit'
 
 class Foo
   def initialize(a, b)
@@ -14,15 +12,15 @@ class TestJSONEmitters < Test::Unit::TestCase
   NilTests      = [[ nil,   %(null)  ]]
   NumericTests  = [[ 1,     %(1)     ],
                    [ 2.5,   %(2.5)   ]]
-                    
+
   StringTests   = [[ 'this is the string',     %("this is the string")         ],
                    [ 'a "string" with quotes', %("a \\"string\\" with quotes") ]]
-                 
+
   ArrayTests    = [[ ['a', 'b', 'c'],          %([\"a\", \"b\", \"c\"])          ],
                    [ [1, 'a', :b, nil, false], %([1, \"a\", \"b\", null, false]) ]]
-  
+
   HashTests     = [[ {:a => :b, :c => :d}, %({\"c\": \"d\", \"a\": \"b\"}) ]]
-                  
+
   SymbolTests   = [[ :a,     %("a")    ],
                    [ :this,  %("this") ],
                    [ :"a b", %("a b")  ]]
@@ -40,7 +38,7 @@ class TestJSONEmitters < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_utf8_string_encoded_properly_when_kcode_is_utf8
     old_kcode, $KCODE = $KCODE, 'UTF8'
     assert_equal '"\\u20ac2.99"', '€2.99'.to_json
@@ -48,7 +46,7 @@ class TestJSONEmitters < Test::Unit::TestCase
   ensure
     $KCODE = old_kcode
   end
-  
+
   def test_exception_raised_when_encoding_circular_reference
     a = [1]
     a << a
-- 
cgit v1.2.3