From 0bb824b7152c0a745dbec8983014b77eedb09726 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 15 Dec 2004 01:36:05 +0000 Subject: Changed validate_* to validates_*_of, so validate_acceptance becomes validates_acceptance_of, and added :on as a configuration option instead of using _on_create/update git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@157 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/validations_test.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'activerecord/test/validations_test.rb') diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb index e104573c25..06b4740012 100755 --- a/activerecord/test/validations_test.rb +++ b/activerecord/test/validations_test.rb @@ -1,4 +1,7 @@ require 'abstract_unit' +require 'fixtures/topic' +require 'fixtures/reply' +require 'fixtures/developer' class ValidationsTest < Test::Unit::TestCase fixtures :topics, :developers @@ -123,7 +126,7 @@ class ValidationsTest < Test::Unit::TestCase end def test_title_confirmation - Topic.validate_confirmation(:title) + Topic.validates_confirmation_of(:title) t = Topic.create("title" => "We should be confirmed") assert !t.save @@ -133,7 +136,7 @@ class ValidationsTest < Test::Unit::TestCase end def test_terms_of_service_agreement - Topic.validate_acceptance_on_create(:terms_of_service) + Topic.validates_acceptance_of(:terms_of_service, :on => :create) t = Topic.create("title" => "We should be confirmed") assert !t.save @@ -145,7 +148,7 @@ class ValidationsTest < Test::Unit::TestCase def test_eula - Topic.validate_acceptance_on_create(:eula, :message => "must be abided") + Topic.validates_acceptance_of(:eula, :message => "must be abided", :on => :create) t = Topic.create("title" => "We should be confirmed") assert !t.save @@ -156,7 +159,7 @@ class ValidationsTest < Test::Unit::TestCase end def test_validate_presences - Topic.validate_presence(:title, :content) + Topic.validates_presence_of(:title, :content) t = Topic.create assert !t.save @@ -170,7 +173,7 @@ class ValidationsTest < Test::Unit::TestCase end def test_validate_uniqueness - Topic.validate_uniqueness(:title) + Topic.validates_uniqueness_of(:title) t = Topic.new("title" => "I'm unique!") assert t.save, "Should save t as unique" -- cgit v1.2.3