diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 14:37:37 +0100 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 20:22:35 -0200 |
commit | 1edd358177b718c969b41d6cb58c8f229f72d500 (patch) | |
tree | 0018800decd25fc93d18cb07224b4ba668a9549c | |
parent | 724020278480855bddfe749c91f1074d4f50f3c6 (diff) | |
download | rails-1edd358177b718c969b41d6cb58c8f229f72d500.tar.gz rails-1edd358177b718c969b41d6cb58c8f229f72d500.tar.bz2 rails-1edd358177b718c969b41d6cb58c8f229f72d500.zip |
fix test
Conflicts:
activerecord/test/cases/locking_test.rb
-rw-r--r-- | activerecord/test/cases/locking_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 |