1 files changed, 52 insertions, 9 deletions
diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index de618902aa..959c58aa85 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -4,6 +4,7 @@ require 'models/topic'
 require 'models/reply'
 require 'models/person'
 require 'models/developer'
+require 'models/computer'
 require 'models/parrot'
 require 'models/company'
 
@@ -14,28 +15,28 @@ class ValidationsTest < ActiveRecord::TestCase
   # Other classes we mess with will be dealt with in the specific tests
   repair_validations(Topic)
 
-  def test_error_on_create
+  def test_valid_uses_create_context_when_new
     r = WrongReply.new
     r.title = "Wrong Create"
-    assert !r.save
+    assert_not r.valid?
     assert r.errors[:title].any?, "A reply with a bad title should mark that attribute as invalid"
     assert_equal ["is Wrong Create"], r.errors[:title], "A reply with a bad content should contain an error"
   end
 
-  def test_error_on_update
+  def test_valid_uses_update_context_when_persisted
     r = WrongReply.new
     r.title = "Bad"
     r.content = "Good"
-    assert r.save, "First save should be successful"
+    assert r.save, "First validation should be successful"
 
     r.title = "Wrong Update"
-    assert !r.save, "Second save should fail"
+    assert_not r.valid?, "Second validation should fail"
 
     assert r.errors[:title].any?, "A reply with a bad title should mark that attribute as invalid"
     assert_equal ["is Wrong Update"], r.errors[:title], "A reply with a bad content should contain an error"
   end
 
-  def test_error_on_given_context
+  def test_valid_using_special_context
     r = WrongReply.new(:title => "Valid title")
     assert !r.valid?(:special_case)
     assert_equal "Invalid", r.errors[:author_name].join
@@ -45,11 +46,26 @@ class ValidationsTest < ActiveRecord::TestCase
     assert r.valid?(:special_case)
 
     r.author_name = nil
-    assert !r.save(:context => :special_case)
+    assert_not r.valid?(:special_case)
     assert_equal "Invalid", r.errors[:author_name].join
 
     r.author_name = "secret"
-    assert r.save(:context => :special_case)
+    assert r.valid?(:special_case)
+  end
+
+  def test_validate
+    r = WrongReply.new
+
+    r.validate
+    assert_empty r.errors[:author_name]
+
+    r.validate(:special_case)
+    assert_not_empty r.errors[:author_name]
+
+    r.author_name = "secret"
+
+    r.validate(:special_case)
+    assert_empty r.errors[:author_name]
   end
 
   def test_invalid_record_exception
@@ -63,6 +79,20 @@ class ValidationsTest < ActiveRecord::TestCase
     assert_equal r, invalid.record
   end
 
+  def test_validate_with_bang
+    assert_raise(ActiveRecord::RecordInvalid) do
+      WrongReply.new.validate!
+    end
+  end
+
+  def test_validate_with_bang_and_context
+    assert_raise(ActiveRecord::RecordInvalid) do
+      WrongReply.new.validate!(:special_case)
+    end
+    r = WrongReply.new(:title => "Valid title", :author_name => "secret", :content => "Good")
+    assert r.validate!(:special_case)
+  end
+
   def test_exception_on_create_bang_many
     assert_raise(ActiveRecord::RecordInvalid) do
       WrongReply.create!([ { "title" => "OK" }, { "title" => "Wrong Create" }])
@@ -85,7 +115,7 @@ class ValidationsTest < ActiveRecord::TestCase
     end
   end
 
-  def test_create_without_validation
+  def test_save_without_validation
     reply = WrongReply.new
     assert !reply.save
     assert reply.save(:validate => false)
@@ -119,4 +149,17 @@ class ValidationsTest < ActiveRecord::TestCase
     assert_equal 1, Company.validators_on(:name).size
   end
 
+  def test_numericality_validation_with_mutation
+    Topic.class_eval do
+      attribute :wibble, ActiveRecord::Type::String.new
+      validates_numericality_of :wibble, only_integer: true
+    end
+
+    topic = Topic.new(wibble: '123-4567')
+    topic.wibble.gsub!('-', '')
+
+    assert topic.valid?
+  ensure
+    Topic.reset_column_information
+  end
 end