Merge branch 'master' of github.com:rails/rails

14 files changed, 143 insertions, 230 deletions

diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index fe1ea36450..dc39b84ed8 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -1,8 +1,9 @@
 require 'cases/helper'
+require 'models/track_back'
 
 class NamingTest < ActiveModel::TestCase
   def setup
-    @model_name = ActiveModel::Name.new(self, 'Post::TrackBack')
+    @model_name = ActiveModel::Name.new(Post::TrackBack)
   end
 
   def test_singular
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index d171784963..bfc1ca12e6 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -1,11 +1,5 @@
 require 'cases/helper'
-
-class SuperUser
-  extend ActiveModel::Translation
-end
-
-class User < SuperUser
-end
+require 'models/person'
 
 class ActiveModelI18nTests < ActiveModel::TestCase
 
@@ -14,38 +8,38 @@ class ActiveModelI18nTests < ActiveModel::TestCase
   end
   
   def test_translated_model_attributes
-    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
-    assert_equal 'super_user name attribute', SuperUser.human_attribute_name('name')
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:name => 'person name attribute'} } }
+    assert_equal 'person name attribute', Person.human_attribute_name('name')
   end
   
   def test_translated_model_attributes_with_symbols
-    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
-    assert_equal 'super_user name attribute', SuperUser.human_attribute_name(:name)
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:name => 'person name attribute'} } }
+    assert_equal 'person name attribute', Person.human_attribute_name(:name)
   end
 
   def test_translated_model_attributes_with_ancestor
-    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:user => {:name => 'user name attribute'} } }
-    assert_equal 'user name attribute', User.human_attribute_name('name')
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:child => {:name => 'child name attribute'} } }
+    assert_equal 'child name attribute', Child.human_attribute_name('name')
   end
 
   def test_translated_model_attributes_with_ancestors_fallback
-    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
-    assert_equal 'super_user name attribute', User.human_attribute_name('name')
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:name => 'person name attribute'} } }
+    assert_equal 'person name attribute', Child.human_attribute_name('name')
   end
 
   def test_translated_model_names
-    I18n.backend.store_translations 'en', :activemodel => {:models => {:super_user => 'super_user model'} }
-    assert_equal 'super_user model', SuperUser.model_name.human
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:person => 'person model'} }
+    assert_equal 'person model', Person.model_name.human
   end
 
   def test_translated_model_names_with_sti
-    I18n.backend.store_translations 'en', :activemodel => {:models => {:user => 'user model'} }
-    assert_equal 'user model', User.model_name.human
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:child => 'child model'} }
+    assert_equal 'child model', Child.model_name.human
   end
 
   def test_translated_model_names_with_ancestors_fallback
-    I18n.backend.store_translations 'en', :activemodel => {:models => {:super_user => 'super_user model'} }
-    assert_equal 'super_user model', User.model_name.human
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:person => 'person model'} }
+    assert_equal 'person model', Child.model_name.human
   end
 end
 
diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index 88e5fdb358..11c9c1edfd 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -9,9 +9,10 @@ require 'models/person'
 
 class AcceptanceValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_terms_of_service_agreement_no_acceptance
     Topic.validates_acceptance_of(:terms_of_service, :on => :create)
@@ -53,28 +54,18 @@ class AcceptanceValidationTest < ActiveModel::TestCase
     assert t.save
   end
 
-  def test_validates_acceptance_of_with_custom_error_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_acceptance_of :salary, :message=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.salary = "0"
-      assert !d.valid?
-      assert_equal "This string contains 'single' and \"double\" quotes", d.errors[:salary].last
-    end
-  end
-
   def test_validates_acceptance_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_acceptance_of :karma
+    Person.validates_acceptance_of :karma
 
-      p = Person.new
-      p.karma = ""
+    p = Person.new
+    p.karma = ""
 
-      assert p.invalid?
-      assert_equal ["must be accepted"], p.errors[:karma]
+    assert p.invalid?
+    assert_equal ["must be accepted"], p.errors[:karma]
 
-      p.karma = "1"
-      assert p.valid?
-    end
+    p.karma = "1"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb
index 4c716d5d48..5260162a58 100644
--- a/activemodel/test/cases/validations/conditional_validation_test.rb
+++ b/activemodel/test/cases/validations/conditional_validation_test.rb
@@ -6,9 +6,10 @@ require 'models/topic'
 
 class ConditionalValidationTest < ActiveModel::TestCase
  include ActiveModel::TestsDatabase
- include ActiveModel::ValidationsRepairHelper
 
- repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
   
   def test_if_validation_using_method_true
     # When the method returns true
diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index 1d6f2a6ec5..55554d5054 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class ConfirmationValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_no_title_confirmation
     Topic.validates_confirmation_of(:title)
@@ -39,30 +40,19 @@ class ConfirmationValidationTest < ActiveModel::TestCase
     assert t.save
   end
 
-  def test_validates_confirmation_of_with_custom_error_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_confirmation_of :name, :message=> "confirm 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = "John"
-      d.name_confirmation = "Johnny"
-      assert !d.valid?
-      assert_equal ["confirm 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
   def test_validates_confirmation_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_confirmation_of :karma
+    Person.validates_confirmation_of :karma
 
-      p = Person.new
-      p.karma_confirmation = "None"
-      assert p.invalid?
+    p = Person.new
+    p.karma_confirmation = "None"
+    assert p.invalid?
 
-      assert_equal ["doesn't match confirmation"], p.errors[:karma]
+    assert_equal ["doesn't match confirmation"], p.errors[:karma]
 
-      p.karma = "None"
-      assert p.valid?
-    end
+    p.karma = "None"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 
 end
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 584f009e84..7d851f546c 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -7,9 +7,10 @@ require 'models/person'
 
 class ExclusionValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_validates_exclusion_of
     Topic.validates_exclusion_of( :title, :in => %w( abe monkey ) )
@@ -30,17 +31,17 @@ class ExclusionValidationTest < ActiveModel::TestCase
   end
 
   def test_validates_exclusion_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_exclusion_of :karma, :in => %w( abe monkey )
+    Person.validates_exclusion_of :karma, :in => %w( abe monkey )
 
-      p = Person.new
-      p.karma = "abe"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "abe"
+    assert p.invalid?
 
-      assert_equal ["is reserved"], p.errors[:karma]
+    assert_equal ["is reserved"], p.errors[:karma]
 
-      p.karma = "Lifo"
-      assert p.valid?
-    end
+    p.karma = "Lifo"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index e19e4bf7b3..e10089208a 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class PresenceValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_validate_format
     Topic.validates_format_of(:title, :content, :with => /^Validation\smacros \w+!$/, :message => "is bad data")
@@ -100,28 +101,18 @@ class PresenceValidationTest < ActiveModel::TestCase
     assert_raise(ArgumentError) { Topic.validates_format_of(:title, :without => "clearly not a regexp") }
   end
 
-  def test_validates_format_of_with_custom_error_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "format 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = d.name_confirmation = "John 32"
-      assert !d.valid?
-      assert_equal ["format 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
   def test_validates_format_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_format_of :karma, :with => /\A\d+\Z/
+    Person.validates_format_of :karma, :with => /\A\d+\Z/
 
-      p = Person.new
-      p.karma = "Pixies"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "Pixies"
+    assert p.invalid?
 
-      assert_equal ["is invalid"], p.errors[:karma]
+    assert_equal ["is invalid"], p.errors[:karma]
 
-      p.karma = "1234"
-      assert p.valid?
-    end
+    p.karma = "1234"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index 68b1b27f75..2717a09331 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -1,6 +1,5 @@
 require "cases/helper"
 require 'cases/tests_database'
-
 require 'models/person'
 
 class I18nValidationTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index bc1b0365d2..6b2bcd9c60 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class InclusionValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_validates_inclusion_of
     Topic.validates_inclusion_of( :title, :in => %w( a b c d e f g ) )
@@ -53,28 +54,18 @@ class InclusionValidationTest < ActiveModel::TestCase
     assert_equal ["option uhoh is not in the list"], t.errors[:title]
   end
 
-  def test_validates_inclusion_of_with_custom_error_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_inclusion_of :salary, :in => 1000..80000, :message=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.salary = "90,000"
-      assert !d.valid?
-      assert_equal "This string contains 'single' and \"double\" quotes", d.errors[:salary].last
-    end
-  end
-
   def test_validates_inclusion_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_inclusion_of :karma, :in => %w( abe monkey )
+    Person.validates_inclusion_of :karma, :in => %w( abe monkey )
 
-      p = Person.new
-      p.karma = "Lifo"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "Lifo"
+    assert p.invalid?
 
-      assert_equal ["is not included in the list"], p.errors[:karma]
+    assert_equal ["is not included in the list"], p.errors[:karma]
 
-      p.karma = "monkey"
-      assert p.valid?
-    end
+    p.karma = "monkey"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb
index 2c97b762f1..f3ef5e648a 100644
--- a/activemodel/test/cases/validations/length_validation_test.rb
+++ b/activemodel/test/cases/validations/length_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class LengthValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_validates_length_of_with_allow_nil
     Topic.validates_length_of( :title, :is => 5, :allow_nil=>true )
@@ -419,48 +420,18 @@ class LengthValidationTest < ActiveModel::TestCase
     assert_equal ["Your essay must be at least 5 words."], t.errors[:content]
   end
 
-  def test_validates_length_of_with_custom_too_long_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_length_of :name, :maximum => 4, :too_long=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = "Jeffrey"
-      assert !d.valid?
-      assert_equal ["This string contains 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
-  def test_validates_length_of_with_custom_too_short_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_length_of :name, :minimum => 4, :too_short=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = "Joe"
-      assert !d.valid?
-      assert_equal ["This string contains 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
-  def test_validates_length_of_with_custom_message_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_length_of :name, :minimum => 4, :message=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = "Joe"
-      assert !d.valid?
-      assert_equal ["This string contains 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
   def test_validates_length_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_length_of :karma, :minimum => 5
+    Person.validates_length_of :karma, :minimum => 5
 
-      p = Person.new
-      p.karma = "Pix"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "Pix"
+    assert p.invalid?
 
-      assert_equal ["is too short (minimum is 5 characters)"], p.errors[:karma]
+    assert_equal ["is too short (minimum is 5 characters)"], p.errors[:karma]
 
-      p.karma = "The Smiths"
-      assert p.valid?
-    end
+    p.karma = "The Smiths"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index d3201966dc..75cd654f98 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class NumericalityValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   NIL = [nil]
   BLANK = ["", " ", " \t \r \n"]
@@ -138,37 +139,19 @@ class NumericalityValidationTest < ActiveModel::TestCase
     assert_equal ["greater than 4"], topic.errors[:approved]
   end
 
-  def test_numericality_with_getter_method
-    repair_validations(Developer) do
-      Developer.validates_numericality_of( :salary )
-      developer = Developer.new("name" => "michael", "salary" => nil)
-      developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
-      assert developer.valid?
-    end
-  end
-
-  def test_numericality_with_allow_nil_and_getter_method
-    repair_validations(Developer) do
-      Developer.validates_numericality_of( :salary, :allow_nil => true)
-      developer = Developer.new("name" => "michael", "salary" => nil)
-      developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
-      assert developer.valid?
-    end
-  end
-
   def test_validates_numericality_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_numericality_of :karma, :allow_nil => false
+    Person.validates_numericality_of :karma, :allow_nil => false
 
-      p = Person.new
-      p.karma = "Pix"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "Pix"
+    assert p.invalid?
 
-      assert_equal ["is not a number"], p.errors[:karma]
+    assert_equal ["is not a number"], p.errors[:karma]
 
-      p.karma = "1234"
-      assert p.valid?
-    end
+    p.karma = "1234"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 
   private
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index 90b0951a77..8b9795a90c 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -9,9 +9,6 @@ require 'models/custom_reader'
 
 class PresenceValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
-
-  repair_validations(Topic)
 
   def test_validate_presences
     Topic.validates_presence_of(:title, :content)
@@ -30,43 +27,44 @@ class PresenceValidationTest < ActiveModel::TestCase
     t.content = "like stuff"
 
     assert t.save
+  ensure
+    Topic.reset_callbacks(:validate)
   end
 
-  # def test_validates_presence_of_with_custom_message_using_quotes
-  #   repair_validations(Developer) do
-  #     Developer.validates_presence_of :non_existent, :message=> "This string contains 'single' and \"double\" quotes"
-  #     d = Developer.new
-  #     d.name = "Joe"
-  #     assert !d.valid?
-  #     assert_equal ["This string contains 'single' and \"double\" quotes"], d.errors[:non_existent]
-  #   end
-  # end
+  def test_validates_acceptance_of_with_custom_error_using_quotes
+    Person.validates_presence_of :karma, :message=> "This string contains 'single' and \"double\" quotes"
+    p = Person.new
+    assert !p.valid?
+    assert_equal "This string contains 'single' and \"double\" quotes", p.errors[:karma].last
+  ensure
+    Person.reset_callbacks(:validate)
+  end
 
   def test_validates_presence_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_presence_of :karma
+    Person.validates_presence_of :karma
 
-      p = Person.new
-      assert p.invalid?
+    p = Person.new
+    assert p.invalid?
 
-      assert_equal ["can't be blank"], p.errors[:karma]
+    assert_equal ["can't be blank"], p.errors[:karma]
 
-      p.karma = "Cold"
-      assert p.valid?
-    end
+    p.karma = "Cold"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
   
   def test_validates_presence_of_for_ruby_class_with_custom_reader
-    repair_validations(Person) do
-      CustomReader.validates_presence_of :karma
+    CustomReader.validates_presence_of :karma
 
-      p = CustomReader.new
-      assert p.invalid?
+    p = CustomReader.new
+    assert p.invalid?
 
-      assert_equal ["can't be blank"], p.errors[:karma]
+    assert_equal ["can't be blank"], p.errors[:karma]
 
-      p[:karma] = "Cold"
-      assert p.valid?
-    end
+    p[:karma] = "Cold"
+    assert p.valid?
+  ensure
+    CustomReader.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index fae87a6188..9e9b925df2 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -6,32 +6,33 @@ require 'models/topic'
 
 class ValidatesWithTest < ActiveRecord::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   ERROR_MESSAGE = "Validation error from validator"
   OTHER_ERROR_MESSAGE = "Validation error from other validator"
 
   class ValidatorThatAddsErrors < ActiveModel::Validator
-    def validate()
+    def validate(record)
       record.errors[:base] << ERROR_MESSAGE
     end
   end
 
   class OtherValidatorThatAddsErrors < ActiveModel::Validator
-    def validate()
+    def validate(record)
       record.errors[:base] << OTHER_ERROR_MESSAGE
     end
   end
 
   class ValidatorThatDoesNotAddErrors < ActiveModel::Validator
-    def validate()
+    def validate(record)
     end
   end
 
   class ValidatorThatValidatesOptions < ActiveModel::Validator
-    def validate()
+    def validate(record)
       if options[:field] == :first_name
         record.errors[:base] << ERROR_MESSAGE
       end
@@ -98,11 +99,11 @@ class ValidatesWithTest < ActiveRecord::TestCase
     assert topic.errors[:base].include?(ERROR_MESSAGE)
   end
 
-  test "passes all non-standard configuration options to the validator class" do
+  test "passes all configuration options to the validator class" do
     topic = Topic.new
     validator = mock()
-    validator.expects(:new).with(topic, {:foo => :bar}).returns(validator)
-    validator.expects(:validate)
+    validator.expects(:new).with(:foo => :bar, :if => "1 == 1").returns(validator)
+    validator.expects(:validate).with(topic)
 
     Topic.validates_with(validator, :if => "1 == 1", :foo => :bar)
     assert topic.valid?
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index 78565177d8..61910395b5 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -9,11 +9,12 @@ require 'models/custom_reader'
 
 class ValidationsTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
   # Most of the tests mess with the validations of Topic, so lets repair it all the time.
   # Other classes we mess with will be dealt with in the specific tests
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_single_field_validation
     r = Reply.new