Deprecate Model#validate/validate_on_create/validate_on_update. Use Model.validate :method and likewise

1 files changed, 34 insertions, 0 deletions

diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index a220580a8d..a4e874e5e6 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -16,6 +16,24 @@ class ProtectedPerson < ActiveRecord::Base
   attr_protected :first_name
 end
 
+class DeprecatedPerson < ActiveRecord::Base
+  set_table_name 'people'
+
+  protected
+
+  def validate
+    errors[:name] << "always invalid"
+  end
+
+  def validate_on_create
+    errors[:name] << "invalid on create"
+  end
+
+  def validate_on_update
+    errors[:name] << "invalid on update"
+  end
+end
+
 class ValidationsTest < ActiveRecord::TestCase
   fixtures :topics, :developers
 
@@ -150,4 +168,20 @@ class ValidationsTest < ActiveRecord::TestCase
       assert_equal "Dan Brown", reply["author_name"]
     end
   end
+
+  def test_deprecated_validation_instance_methods
+    tom = DeprecatedPerson.new
+
+    assert_deprecated do
+      assert tom.invalid?
+      assert_equal ["always invalid", "invalid on create"], tom.errors[:name]
+    end
+
+    tom.save(false)
+
+    assert_deprecated do
+      assert tom.invalid?
+      assert_equal ["always invalid", "invalid on update"], tom.errors[:name]
+    end
+  end
 end