From 2476c5312dcbd29f49672f71617a3d34c6a60cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 22 Dec 2009 23:12:21 +0100
Subject: Validator is simply sent to validate method. However, the API needs
 to change, so validate accepts a record.

---
 activemodel/test/cases/validations/with_validation_test.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'activemodel/test/cases/validations/with_validation_test.rb')

diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index fae87a6188..4350ad69ec 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -14,24 +14,24 @@ class ValidatesWithTest < ActiveRecord::TestCase
   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
@@ -101,8 +101,8 @@ class ValidatesWithTest < ActiveRecord::TestCase
   test "passes all non-standard 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}).returns(validator)
+    validator.expects(:validate).with(topic)
 
     Topic.validates_with(validator, :if => "1 == 1", :foo => :bar)
     assert topic.valid?
-- 
cgit v1.2.3


From f1085f41287687835659fa23079080204fe32e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Dec 2009 00:36:51 +0100
Subject: Move validations in ActiveModel to validators, however all validatity
 checks are still in the class method.

---
 activemodel/test/cases/validations/with_validation_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activemodel/test/cases/validations/with_validation_test.rb')

diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 4350ad69ec..953ff8aa2d 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -98,10 +98,10 @@ 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({:foo => :bar}).returns(validator)
+    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)
-- 
cgit v1.2.3


From 74098e4cb6de01745db8f1d8d567645553ade7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Dec 2009 13:30:58 +0100
Subject: No need to use ValidationsRepairHelper hack on ActiveModel anymore,
 Model.reset_callbacks(:validate) is enough. However, tests in ActiveRecord
 are still coupled, so moved ValidationsRepairHelper back there.

---
 activemodel/test/cases/validations/with_validation_test.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'activemodel/test/cases/validations/with_validation_test.rb')

diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 953ff8aa2d..9e9b925df2 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -6,9 +6,10 @@ 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"
-- 
cgit v1.2.3