Completely remove potential global state leaks in ActiveModel tests.

ActiveModel tests can now be run in random order.

1 files changed, 52 insertions, 24 deletions

diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb
index e9cb5ccc96..e81b7ac424 100644
--- a/activemodel/test/cases/attribute_methods_test.rb
+++ b/activemodel/test/cases/attribute_methods_test.rb
@@ -104,10 +104,14 @@ class AttributeMethodsTest < ActiveModel::TestCase
   end
 
   test '#define_attribute_method generates attribute method' do
-    ModelWithAttributes.define_attribute_method(:foo)
+    begin
+      ModelWithAttributes.define_attribute_method(:foo)
 
-    assert_respond_to ModelWithAttributes.new, :foo
-    assert_equal "value of foo", ModelWithAttributes.new.foo
+      assert_respond_to ModelWithAttributes.new, :foo
+      assert_equal "value of foo", ModelWithAttributes.new.foo
+    ensure
+      ModelWithAttributes.undefine_attribute_methods
+    end
   end
 
   test '#define_attribute_method does not generate attribute method if already defined in attribute module' do
@@ -134,24 +138,36 @@ class AttributeMethodsTest < ActiveModel::TestCase
   end
 
   test '#define_attribute_method generates attribute method with invalid identifier characters' do
-    ModelWithWeirdNamesAttributes.define_attribute_method(:'a?b')
+    begin
+      ModelWithWeirdNamesAttributes.define_attribute_method(:'a?b')
 
-    assert_respond_to ModelWithWeirdNamesAttributes.new, :'a?b'
-    assert_equal "value of a?b", ModelWithWeirdNamesAttributes.new.send('a?b')
+      assert_respond_to ModelWithWeirdNamesAttributes.new, :'a?b'
+      assert_equal "value of a?b", ModelWithWeirdNamesAttributes.new.send('a?b')
+    ensure
+      ModelWithWeirdNamesAttributes.undefine_attribute_methods
+    end
   end
 
   test '#define_attribute_methods works passing multiple arguments' do
-    ModelWithAttributes.define_attribute_methods(:foo, :baz)
+    begin
+      ModelWithAttributes.define_attribute_methods(:foo, :baz)
 
-    assert_equal "value of foo", ModelWithAttributes.new.foo
-    assert_equal "value of baz", ModelWithAttributes.new.baz
+      assert_equal "value of foo", ModelWithAttributes.new.foo
+      assert_equal "value of baz", ModelWithAttributes.new.baz
+    ensure
+      ModelWithAttributes.undefine_attribute_methods
+    end
   end
 
   test '#define_attribute_methods generates attribute methods' do
-    ModelWithAttributes.define_attribute_methods(:foo)
+    begin
+      ModelWithAttributes.define_attribute_methods(:foo)
 
-    assert_respond_to ModelWithAttributes.new, :foo
-    assert_equal "value of foo", ModelWithAttributes.new.foo
+      assert_respond_to ModelWithAttributes.new, :foo
+      assert_equal "value of foo", ModelWithAttributes.new.foo
+    ensure
+      ModelWithAttributes.undefine_attribute_methods
+    end
   end
 
   test '#alias_attribute generates attribute_aliases lookup hash' do
@@ -164,26 +180,38 @@ class AttributeMethodsTest < ActiveModel::TestCase
   end
 
   test '#define_attribute_methods generates attribute methods with spaces in their names' do
-    ModelWithAttributesWithSpaces.define_attribute_methods(:'foo bar')
+    begin
+      ModelWithAttributesWithSpaces.define_attribute_methods(:'foo bar')
 
-    assert_respond_to ModelWithAttributesWithSpaces.new, :'foo bar'
-    assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.send(:'foo bar')
+      assert_respond_to ModelWithAttributesWithSpaces.new, :'foo bar'
+      assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.send(:'foo bar')
+    ensure
+      ModelWithAttributesWithSpaces.undefine_attribute_methods
+    end
   end
 
   test '#alias_attribute works with attributes with spaces in their names' do
-    ModelWithAttributesWithSpaces.define_attribute_methods(:'foo bar')
-    ModelWithAttributesWithSpaces.alias_attribute(:'foo_bar', :'foo bar')
+    begin
+      ModelWithAttributesWithSpaces.define_attribute_methods(:'foo bar')
+      ModelWithAttributesWithSpaces.alias_attribute(:'foo_bar', :'foo bar')
 
-    assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.foo_bar
+      assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.foo_bar
+    ensure
+      ModelWithAttributesWithSpaces.undefine_attribute_methods
+    end
   end
 
   test '#alias_attribute works with attributes named as a ruby keyword' do
-    ModelWithRubyKeywordNamedAttributes.define_attribute_methods([:begin, :end])
-    ModelWithRubyKeywordNamedAttributes.alias_attribute(:from, :begin)
-    ModelWithRubyKeywordNamedAttributes.alias_attribute(:to, :end)
-
-    assert_equal "value of begin", ModelWithRubyKeywordNamedAttributes.new.from
-    assert_equal "value of end", ModelWithRubyKeywordNamedAttributes.new.to
+    begin
+      ModelWithRubyKeywordNamedAttributes.define_attribute_methods([:begin, :end])
+      ModelWithRubyKeywordNamedAttributes.alias_attribute(:from, :begin)
+      ModelWithRubyKeywordNamedAttributes.alias_attribute(:to, :end)
+
+      assert_equal "value of begin", ModelWithRubyKeywordNamedAttributes.new.from
+      assert_equal "value of end", ModelWithRubyKeywordNamedAttributes.new.to
+    ensure
+      ModelWithRubyKeywordNamedAttributes.undefine_attribute_methods
+    end
   end
 
   test '#undefine_attribute_methods removes attribute methods' do