Completely remove potential global state leaks in ActiveModel tests.

ActiveModel tests can now be run in random order.

2 files changed, 11 insertions, 9 deletions

diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index 4c3d7a7615..65a2a1eb49 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -53,17 +53,17 @@ class ConfirmationValidationTest < ActiveModel::TestCase
   end
 
   def test_title_confirmation_with_i18n_attribute
-    @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
-    I18n.load_path.clear
-    I18n.backend = I18n::Backend::Simple.new
-    I18n.backend.store_translations('en', {
-      errors: { messages: { confirmation: "doesn't match %{attribute}" } },
-      activemodel: { attributes: { topic: { title: 'Test Title'} } }
-    })
+    begin
+      @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
+      I18n.load_path.clear
+      I18n.backend = I18n::Backend::Simple.new
+      I18n.backend.store_translations('en', {
+        errors: { messages: { confirmation: "doesn't match %{attribute}" } },
+        activemodel: { attributes: { topic: { title: 'Test Title'} } }
+      })
 
-    Topic.validates_confirmation_of(:title)
+      Topic.validates_confirmation_of(:title)
 
-    begin
       t = Topic.new("title" => "We should be confirmed","title_confirmation" => "")
       assert t.invalid?
       assert_equal ["doesn't match Test Title"], t.errors[:title_confirmation]
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index f77cf47fb7..e1657407cf 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -119,6 +119,7 @@ class NumericalityValidationTest < ActiveModel::TestCase
 
     invalid!([3, 4])
     valid!([5, 6])
+  ensure
     Topic.send(:remove_method, :min_approved)
   end
 
@@ -128,6 +129,7 @@ class NumericalityValidationTest < ActiveModel::TestCase
 
     invalid!([6])
     valid!([4, 5])
+  ensure
     Topic.send(:remove_method, :max_approved)
   end