test/debug.log test/fixtures/people.yml test/fixtures/places.yml @@ -16,9 +16,4 @@ category_4: id: 4 widget_id: 2 title: 'category 4' - deleted_at: '2005-01-01 00:00:00' -category_5: - id: 4 - widget_id: 2 - title: 'category 1' deleted_at: '2005-01-01 00:00:00' \ No newline at end of file test/fixtures/categories.yml @@ -6,7 +6,3 @@ widget_2: title: 'deleted widget 2' deleted_at: '2005-01-01 00:00:00' category_id: 3 -widget_3: - id: 3 - title: 'widget 1' - deleted_at: '2005-01-01 00:00:00' test/fixtures/widgets.yml @@ -2,7 +2,6 @@ require File.join(File.dirname(__FILE__), 'test_helper') class Widget < ActiveRecord::Base acts_as_paranoid - validates_uniqueness_of :title has_many :categories, :dependent => :destroy has_and_belongs_to_many :habtm_categories, :class_name => 'Category' has_one :category @@ -13,7 +12,6 @@ class Widget < ActiveRecord::Base end class Category < ActiveRecord::Base - validates_uniqueness_of :title, :without_deleted => true belongs_to :widget belongs_to :any_widget, :class_name => 'Widget', :foreign_key => 'widget_id', :with_deleted => true acts_as_paranoid @@ -38,17 +36,24 @@ class Tagging < ActiveRecord::Base acts_as_paranoid end +class Person < ActiveRecord::Base + validates_uniqueness_of :name #include deleted items +end +class Place < ActiveRecord::Base + validates_uniqueness_of :location, :without_deleted => true #ignores deleted items +end + class NonParanoidAndroid < ActiveRecord::Base end class ValidatesUniquenessTest < Test::Unit::TestCase - fixtures :widgets, :categories, :categories_widgets, :tags, :taggings + fixtures :people, :places def test_should_recognize_without_deleted_option - #validates_uniqueness_of :title - assert_equal widgets(:widget_1).valid?, false - # validates_uniqueness_of :title, :without_deleted => true - assert_equal categories(:category_1).valid?, true + #validates_uniqueness_of :title #include deleted items + assert_equal people(:person_1).valid?, false + #validates_uniqueness_of :title, :without_deleted => true #ignores deleted items + assert_equal places(:place_1).valid?, true end end test/paranoid_test.rb @@ -26,5 +26,14 @@ ActiveRecord::Schema.define(:version => 1) do t.column :widget_id, :integer t.column :deleted_at, :timestamp end + + create_table :places, :force => true do |t| + t.column :location, :string + t.column :deleted_at, :timestamp + end + create_table :people, :force => true do |t| + t.column :name, :string + t.column :deleted_at, :timestamp + end end \ No newline at end of file test/schema.rb @@ -7,7 +7,7 @@ require 'active_record/fixtures' config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml')) ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log") -ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite']) +ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite3']) load(File.dirname(__FILE__) + "/schema.rb") test/test_helper.rb 17b33f0b51efebad390dc70e1e374b772039e26f Lindsay lindsay@ooochie.com http://github.com/ooochie/acts_as_paranoid/commit/e7b2b1421fecf1da9082965b173a7f064de089d8 e7b2b1421fecf1da9082965b173a7f064de089d8 2008-11-18T23:39:54-08:00 2008-11-18T23:39:54-08:00 added tests that dont interfere with original tests 4531395669ccad3df0cbe44311a904643a82eb17 Lindsay lindsay@ooochie.com