Completely remove potential global state leaks in ActiveModel tests.

ActiveModel tests can now be run in random order.

2 files changed, 60 insertions, 54 deletions

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
 
diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index 11ee17bb27..73f316d5e0 100644
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -57,48 +57,48 @@ class XmlSerializationTest < ActiveModel::TestCase
   end
 
   test "should serialize default root" do
-    @xml = @contact.to_xml
-    assert_match %r{^<contact>},  @xml
-    assert_match %r{</contact>$}, @xml
+    xml = @contact.to_xml
+    assert_match %r{^<contact>},  xml
+    assert_match %r{</contact>$}, xml
   end
 
   test "should serialize namespaced root" do
-    @xml = Admin::Contact.new(@contact.attributes).to_xml
-    assert_match %r{^<contact>},  @xml
-    assert_match %r{</contact>$}, @xml
+    xml = Admin::Contact.new(@contact.attributes).to_xml
+    assert_match %r{^<contact>},  xml
+    assert_match %r{</contact>$}, xml
   end
 
   test "should serialize default root with namespace" do
-    @xml = @contact.to_xml namespace: "http://xml.rubyonrails.org/contact"
-    assert_match %r{^<contact xmlns="http://xml.rubyonrails.org/contact">}, @xml
-    assert_match %r{</contact>$}, @xml
+    xml = @contact.to_xml namespace: "http://xml.rubyonrails.org/contact"
+    assert_match %r{^<contact xmlns="http://xml.rubyonrails.org/contact">}, xml
+    assert_match %r{</contact>$}, xml
   end
 
   test "should serialize custom root" do
-    @xml = @contact.to_xml root: 'xml_contact'
-    assert_match %r{^<xml-contact>},  @xml
-    assert_match %r{</xml-contact>$}, @xml
+    xml = @contact.to_xml root: 'xml_contact'
+    assert_match %r{^<xml-contact>},  xml
+    assert_match %r{</xml-contact>$}, xml
   end
 
   test "should allow undasherized tags" do
-    @xml = @contact.to_xml root: 'xml_contact', dasherize: false
-    assert_match %r{^<xml_contact>},  @xml
-    assert_match %r{</xml_contact>$}, @xml
-    assert_match %r{<created_at},     @xml
+    xml = @contact.to_xml root: 'xml_contact', dasherize: false
+    assert_match %r{^<xml_contact>},  xml
+    assert_match %r{</xml_contact>$}, xml
+    assert_match %r{<created_at},     xml
   end
 
   test "should allow camelized tags" do
-    @xml = @contact.to_xml root: 'xml_contact', camelize: true
-    assert_match %r{^<XmlContact>},  @xml
-    assert_match %r{</XmlContact>$}, @xml
-    assert_match %r{<CreatedAt},     @xml
+    xml = @contact.to_xml root: 'xml_contact', camelize: true
+    assert_match %r{^<XmlContact>},  xml
+    assert_match %r{</XmlContact>$}, xml
+    assert_match %r{<CreatedAt},     xml
   end
 
   test "should allow lower-camelized tags" do
-    @xml = @contact.to_xml root: 'xml_contact', camelize: :lower
-    assert_match %r{^<xmlContact>},  @xml
-    assert_match %r{</xmlContact>$}, @xml
-    assert_match %r{<createdAt},     @xml
+    xml = @contact.to_xml root: 'xml_contact', camelize: :lower
+    assert_match %r{^<xmlContact>},  xml
+    assert_match %r{</xmlContact>$}, xml
+    assert_match %r{<createdAt},     xml
   end
 
   test "should use serializable hash" do
@@ -106,22 +106,22 @@ class XmlSerializationTest < ActiveModel::TestCase
     @contact.name = 'aaron stack'
     @contact.age = 25
 
-    @xml = @contact.to_xml
-    assert_match %r{<name>aaron stack</name>}, @xml
-    assert_match %r{<age type="integer">25</age>}, @xml
-    assert_no_match %r{<awesome>}, @xml
+    xml = @contact.to_xml
+    assert_match %r{<name>aaron stack</name>}, xml
+    assert_match %r{<age type="integer">25</age>}, xml
+    assert_no_match %r{<awesome>}, xml
   end
 
   test "should allow skipped types" do
-    @xml = @contact.to_xml skip_types: true
-    assert_match %r{<age>25</age>}, @xml
+    xml = @contact.to_xml skip_types: true
+    assert_match %r{<age>25</age>}, xml
   end
 
   test "should include yielded additions" do
-    @xml = @contact.to_xml do |xml|
+    xml = @contact.to_xml do |xml|
       xml.creator "David"
     end
-    assert_match %r{<creator>David</creator>}, @xml
+    assert_match %r{<creator>David</creator>}, xml
   end
 
   test "should serialize string" do
@@ -162,7 +162,7 @@ class XmlSerializationTest < ActiveModel::TestCase
     assert_match %r{<nationality>unknown</nationality>}, xml
   end
 
-  test 'should supply serializable to second proc argument' do
+  test "should supply serializable to second proc argument" do
     proc = Proc.new { |options, record| options[:builder].tag!('name-reverse', record.name.reverse) }
     xml = @contact.to_xml(procs: [ proc ])
     assert_match %r{<name-reverse>kcats noraa</name-reverse>}, xml