1 files changed, 43 insertions, 4 deletions

diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
index b85e491a9c..779f6c8448 100644
--- a/activemodel/test/cases/validations/validates_test.rb
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -1,8 +1,10 @@
 # encoding: utf-8
 require 'cases/helper'
 require 'models/person'
+require 'models/topic'
 require 'models/person_with_validator'
 require 'validators/email_validator'
+require 'validators/namespace/email_validator'
 
 class ValidatesTest < ActiveModel::TestCase
   setup :reset_callbacks
@@ -10,6 +12,7 @@ class ValidatesTest < ActiveModel::TestCase
 
   def reset_callbacks
     Person.reset_callbacks(:validate)
+    Topic.reset_callbacks(:validate)
     PersonWithValidator.reset_callbacks(:validate)
   end
 
@@ -20,13 +23,24 @@ class ValidatesTest < ActiveModel::TestCase
     assert_equal ['is not a number'], person.errors[:title]
   end
 
+  def test_validates_with_attribute_specified_as_string
+    Person.validates "title", :numericality => true
+    person = Person.new
+    person.valid?
+    assert_equal ['is not a number'], person.errors[:title]
+
+    person = Person.new
+    person.title = 123
+    assert person.valid?
+  end
+
   def test_validates_with_built_in_validation_and_options
     Person.validates :salary, :numericality => { :message => 'my custom message' }
     person = Person.new
     person.valid?
     assert_equal ['my custom message'], person.errors[:salary]
   end
-  
+
   def test_validates_with_validator_class
     Person.validates :karma, :email => true
     person = Person.new
@@ -34,6 +48,13 @@ class ValidatesTest < ActiveModel::TestCase
     assert_equal ['is not an email'], person.errors[:karma]
   end
 
+  def test_validates_with_namespaced_validator_class
+    Person.validates :karma, :'namespace/email' => true
+    person = Person.new
+    person.valid?
+    assert_equal ['is not an email'], person.errors[:karma]
+  end
+
   def test_validates_with_if_as_local_conditions
     Person.validates :karma, :presence => true, :email => { :unless => :condition_is_true }
     person = Person.new
@@ -93,22 +114,40 @@ class ValidatesTest < ActiveModel::TestCase
     person.valid?
     assert_equal ['my custom message'], person.errors[:karma]
   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_equal ['Local validator'], person.errors[:title]
   end
-  
+
   def test_validates_with_included_validator_and_options
     PersonWithValidator.validates :title, :presence => { :custom => ' please' }
     person = PersonWithValidator.new
     person.valid?
     assert_equal ['Local validator please'], person.errors[:title]
   end
+
+  def test_validates_with_included_validator_and_wildcard_shortcut
+    # Shortcut for PersonWithValidator.validates :title, :like => { :with => "Mr." }
+    PersonWithValidator.validates :title, :like => "Mr."
+    person = PersonWithValidator.new
+    person.title = "Ms. Pacman"
+    person.valid?
+    assert_equal ['does not appear to be like Mr.'], person.errors[:title]
+  end
+
+  def test_defining_extra_default_keys_for_validates
+    Topic.validates :title, :confirmation => true, :message => 'Y U NO CONFIRM'
+    topic = Topic.new
+    topic.title = "What's happening"
+    topic.title_confirmation = "Not this"
+    assert !topic.valid?
+    assert_equal ['Y U NO CONFIRM'], topic.errors[:title]
+  end
 end