From cc6bc1cc46538d14ef65c14a5d0a2484d7b59977 Mon Sep 17 00:00:00 2001
From: Zuhao Wan <wanzuhao@gmail.com>
Date: Mon, 10 Mar 2014 21:22:22 +0800
Subject: Completely remove potential global state leaks in ActiveModel tests.

ActiveModel tests can now be run in random order.
---
 .../cases/serializers/json_serialization_test.rb   | 48 ++++++++++++----------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'activemodel/test/cases/serializers/json_serialization_test.rb')

diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb
index bc185c737f..60414a6570 100644
--- a/activemodel/test/cases/serializers/json_serialization_test.rb
+++ b/activemodel/test/cases/serializers/json_serialization_test.rb
@@ -30,11 +30,6 @@ class JsonSerializationTest < ActiveModel::TestCase
     @contact.preferences = { 'shows' => 'anime' }
   end
 
-  def teardown
-    # set to the default value
-    Contact.include_root_in_json = false
-  end
-
   test "should not include root in json (class method)" do
     json = @contact.to_json
 
@@ -47,19 +42,25 @@ class JsonSerializationTest < ActiveModel::TestCase
   end
 
   test "should include root in json if include_root_in_json is true" do
-    Contact.include_root_in_json = true
-    json = @contact.to_json
-
-    assert_match %r{^\{"contact":\{}, json
-    assert_match %r{"name":"Konata Izumi"}, json
-    assert_match %r{"age":16}, json
-    assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
-    assert_match %r{"awesome":true}, json
-    assert_match %r{"preferences":\{"shows":"anime"\}}, json
+    begin
+      original_include_root_in_json = Contact.include_root_in_json
+      Contact.include_root_in_json = true
+      json = @contact.to_json
+
+      assert_match %r{^\{"contact":\{}, json
+      assert_match %r{"name":"Konata Izumi"}, json
+      assert_match %r{"age":16}, json
+      assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+      assert_match %r{"awesome":true}, json
+      assert_match %r{"preferences":\{"shows":"anime"\}}, json
+    ensure
+      Contact.include_root_in_json = original_include_root_in_json
+    end
   end
 
   test "should include root in json (option) even if the default is set to false" do
     json = @contact.to_json(root: true)
+
     assert_match %r{^\{"contact":\{}, json
   end
 
@@ -145,13 +146,18 @@ class JsonSerializationTest < ActiveModel::TestCase
   end
 
   test "as_json should return a hash if include_root_in_json is true" do
-    Contact.include_root_in_json = true
-    json = @contact.as_json
-
-    assert_kind_of Hash, json
-    assert_kind_of Hash, json['contact']
-    %w(name age created_at awesome preferences).each do |field|
-      assert_equal @contact.send(field), json['contact'][field]
+    begin
+      original_include_root_in_json = Contact.include_root_in_json
+      Contact.include_root_in_json = true
+      json = @contact.as_json
+
+      assert_kind_of Hash, json
+      assert_kind_of Hash, json['contact']
+      %w(name age created_at awesome preferences).each do |field|
+        assert_equal @contact.send(field), json['contact'][field]
+      end
+    ensure
+      Contact.include_root_in_json = original_include_root_in_json
     end
   end
 
-- 
cgit v1.2.3