aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/validations
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-01-12 21:19:10 +0100
committerXavier Noria <fxn@hashref.com>2011-01-12 21:19:10 +0100
commit8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e (patch)
tree68afb497f317dab1652defe0f96bd20051b572cf /activerecord/test/cases/validations
parent5bc98c9510a369a22b856cbe952d640f3825bb5c (diff)
parent31293ba9d33f5b5f62ee760a548b4f5438183f22 (diff)
downloadrails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.tar.gz
rails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.tar.bz2
rails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/test/cases/validations')
-rw-r--r--activerecord/test/cases/validations/uniqueness_validation_test.rb13
1 files changed, 0 insertions, 13 deletions
diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb
index 679d67553b..b4f3dd034c 100644
--- a/activerecord/test/cases/validations/uniqueness_validation_test.rb
+++ b/activerecord/test/cases/validations/uniqueness_validation_test.rb
@@ -6,19 +6,6 @@ require 'models/warehouse_thing'
require 'models/guid'
require 'models/event'
-# The following methods in Topic are used in test_conditional_validation_*
-class Topic
- has_many :unique_replies, :dependent => :destroy, :foreign_key => "parent_id"
- has_many :silly_unique_replies, :dependent => :destroy, :foreign_key => "parent_id"
-end
-
-class UniqueReply < Reply
- validates_uniqueness_of :content, :scope => 'parent_id'
-end
-
-class SillyUniqueReply < UniqueReply
-end
-
class Wizard < ActiveRecord::Base
self.abstract_class = true