From 1edd358177b718c969b41d6cb58c8f229f72d500 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 30 Mar 2012 14:37:37 +0100 Subject: fix test Conflicts: activerecord/test/cases/locking_test.rb --- activerecord/test/cases/locking_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/test/cases/locking_test.rb') diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index c74986eb69..066a60f81a 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -7,6 +7,7 @@ require 'models/ship' require 'models/legacy_thing' require 'models/reference' require 'models/string_key_object' +require 'models/treasure' class LockWithoutDefault < ActiveRecord::Base; end @@ -267,16 +268,15 @@ class SetLockingColumnTest < ActiveRecord::TestCase assert_equal "omg", k.original_locking_column end end - + def test_removing_has_and_belongs_to_many_associations_upon_destroy - p = RichPerson.create! + p = RichPerson.create! :first_name => 'Jon' p.treasures.create! assert !p.treasures.empty? p.destroy assert p.treasures.empty? assert RichPerson.connection.select_all("SELECT * FROM peoples_treasures WHERE rich_person_id = 1").empty? end - end class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase -- cgit v1.2.3