From bfbabc59d55be94c4833aad3dbe36a9b332eb87e Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Fri, 6 Mar 2015 12:04:44 +0100
Subject: replace `repair_validations` with a disposable subclass.

---
 .../cases/validations/length_validation_test.rb    | 65 +++++++++++-----------
 1 file changed, 33 insertions(+), 32 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/test/cases/validations/length_validation_test.rb b/activerecord/test/cases/validations/length_validation_test.rb
index 952e1681a7..f95f8f0b8f 100644
--- a/activerecord/test/cases/validations/length_validation_test.rb
+++ b/activerecord/test/cases/validations/length_validation_test.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require "cases/helper"
 require 'models/owner'
 require 'models/pet'
@@ -5,49 +6,49 @@ require 'models/person'
 
 class LengthValidationTest < ActiveRecord::TestCase
   fixtures :owners
-  repair_validations(Owner)
 
-  def test_validates_size_of_association
-    repair_validations Owner do
-      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
-      o = Owner.new('name' => 'nopets')
-      assert !o.save
-      assert o.errors[:pets].any?
-      o.pets.build('name' => 'apet')
-      assert o.valid?
+  setup do
+    @owner = Class.new(Owner) do
+      def self.name; 'Owner'; end
     end
   end
 
+
+  def test_validates_size_of_association
+    assert_nothing_raised { @owner.validates_size_of :pets, minimum: 1 }
+    o = @owner.new('name' => 'nopets')
+    assert !o.save
+    assert o.errors[:pets].any?
+    o.pets.build('name' => 'apet')
+    assert o.valid?
+  end
+
   def test_validates_size_of_association_using_within
-    repair_validations Owner do
-      assert_nothing_raised { Owner.validates_size_of :pets, :within => 1..2 }
-      o = Owner.new('name' => 'nopets')
-      assert !o.save
-      assert o.errors[:pets].any?
+    assert_nothing_raised { @owner.validates_size_of :pets, within: 1..2 }
+    o = @owner.new('name' => 'nopets')
+    assert !o.save
+    assert o.errors[:pets].any?
 
-      o.pets.build('name' => 'apet')
-      assert o.valid?
+    o.pets.build('name' => 'apet')
+    assert o.valid?
 
-      2.times { o.pets.build('name' => 'apet') }
-      assert !o.save
-      assert o.errors[:pets].any?
-    end
+    2.times { o.pets.build('name' => 'apet') }
+    assert !o.save
+    assert o.errors[:pets].any?
   end
 
   def test_validates_size_of_association_utf8
-    repair_validations Owner do
-      Owner.validates_size_of :pets, :minimum => 1
-      o = Owner.new('name' => 'あいうえおかきくけこ')
-      assert !o.save
-      assert o.errors[:pets].any?
-      o.pets.build('name' => 'あいうえおかきくけこ')
-      assert o.valid?
-    end
+    @owner.validates_size_of :pets, minimum: 1
+    o = @owner.new('name' => 'あいうえおかきくけこ')
+    assert !o.save
+    assert o.errors[:pets].any?
+    o.pets.build('name' => 'あいうえおかきくけこ')
+    assert o.valid?
   end
 
   def test_validates_size_of_respects_records_marked_for_destruction
-    Owner.validates_size_of :pets, minimum: 1
-    owner = Owner.new
+    @owner.validates_size_of :pets, minimum: 1
+    owner = @owner.new
     assert_not owner.save
     assert owner.errors[:pets].any?
     pet = owner.pets.build
@@ -62,8 +63,8 @@ class LengthValidationTest < ActiveRecord::TestCase
   end
 
   def test_does_not_validate_length_of_if_parent_record_is_validate_false
-    Owner.validates_length_of :name, minimum: 1
-    owner = Owner.new
+    @owner.validates_length_of :name, minimum: 1
+    owner = @owner.new
     owner.save!(validate: false)
     assert owner.persisted?
 
-- 
cgit v1.2.3