5 files changed, 92 insertions, 2 deletions
diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
new file mode 100644
index 0000000000..c0bf03efc7
--- /dev/null
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -0,0 +1,53 @@
+# encoding: utf-8
+require 'cases/helper'
+require 'models/person'
+require 'models/person_with_validator'
+require 'validators/email_validator'
+
+class ValidatesTest < ActiveRecord::TestCase  
+  def test_validates_with_built_in_validation
+    Person.validates :title, :numericality => true
+    person = Person.new
+    person.valid?
+    assert person.errors[:title].include?('is not a number')
+  end
+  
+  def test_validates_with_built_in_validation_and_options
+    Person.validates :title, :numericality => { :message => 'my custom message' }
+    person = Person.new
+    person.valid?
+    assert person.errors[:title].include?('my custom message')
+  end
+  
+  def test_validates_with_validator_class
+    Person.validates :karma, :email => true
+    person = Person.new
+    person.valid?
+    assert person.errors[:karma].include?('is not an email')
+  end
+  
+  def test_validates_with_validator_class_and_options
+    Person.validates :karma, :email => { :message => 'my custom message' }
+    person = Person.new
+    person.valid?
+    assert person.errors[:karma].include?('my custom message')
+  end
+  
+  def test_validates_with_unknown_validator
+    assert_raise(ArgumentError) { Person.validates :karma, :unknown => true }
+  end
+  
+  def test_validates_with_included_validator
+    PersonWithValidator.validates :title, :presence => true
+    person = PersonWithValidator.new
+    person.valid?
+    assert person.errors[:title].include?('Local validator')
+  end
+  
+  def test_validates_with_included_validator_and_options
+    PersonWithValidator.validates :title, :presence => { :custom => ' please' }
+    person = PersonWithValidator.new
+    person.valid?
+    assert person.errors[:title].include?('Local validator please')
+  end
+end
+\ No newline at end of file
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 7540ccb580..66b072ea38 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -120,6 +120,28 @@ class ValidatesWithTest < ActiveRecord::TestCase
     Topic.validates_with(validator, :if => "1 == 1", :foo => :bar)
     assert topic.valid?
   end
+ 
+  test "calls setup method of validator passing in self when validator has setup method" do
+    topic = Topic.new
+    validator = stub_everything
+    validator.stubs(:new).returns(validator)
+    validator.stubs(:validate)
+    validator.stubs(:respond_to?).with(:setup).returns(true)
+    validator.expects(:setup).with(Topic).once
+    Topic.validates_with(validator)
+    assert topic.valid?
+  end
+  
+  test "doesn't call setup method of validator when validator has no setup method" do
+    topic = Topic.new
+    validator = stub_everything
+    validator.stubs(:new).returns(validator)
+    validator.stubs(:validate)
+    validator.stubs(:respond_to?).with(:setup).returns(false)
+    validator.expects(:setup).with(Topic).never
+    Topic.validates_with(validator)
+    assert topic.valid?
+  end
 
   test "validates_with with options" do
     Topic.validates_with(ValidatorThatValidatesOptions, :field => :first_name)
diff --git a/activemodel/test/models/custom_reader.rb b/activemodel/test/models/custom_reader.rb
index 7ac70e6167..14a8be9ebc 100644
--- a/activemodel/test/models/custom_reader.rb
+++ b/activemodel/test/models/custom_reader.rb
@@ -8,8 +8,6 @@ class CustomReader
   def []=(key, value)
     @data[key] = value
   end
-
-  private
   
   def read_attribute_for_validation(key)
     @data[key]
diff --git a/activemodel/test/models/person_with_validator.rb b/activemodel/test/models/person_with_validator.rb
new file mode 100644
index 0000000000..f9763ea853
--- /dev/null
+++ b/activemodel/test/models/person_with_validator.rb
@@ -0,0 +1,11 @@
+class PersonWithValidator
+  include ActiveModel::Validations
+  
+  class PresenceValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      record.errors[attribute] << "Local validator#{options[:custom]}" if value.blank?
+    end
+  end
+
+  attr_accessor :title, :karma
+end
diff --git a/activemodel/test/validators/email_validator.rb b/activemodel/test/validators/email_validator.rb
new file mode 100644
index 0000000000..cff47ac230
--- /dev/null
+++ b/activemodel/test/validators/email_validator.rb
@@ -0,0 +1,6 @@
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors[attribute] << (options[:message] || "is not an email") unless
+      value =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+  end
+end
+\ No newline at end of file