diff options
author | José Valim <jose.valim@gmail.com> | 2009-09-01 13:11:15 +0200 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-01 10:15:23 -0700 |
commit | da636809daca9c338200811d3590e446f57c8e81 (patch) | |
tree | ac2a678c61836fa695542343591fbbc145c3d7d5 /activerecord/test/cases/associations/habtm_join_table_test.rb | |
parent | c5f6e038daf2221ddd5a7534e68f4158d84a5975 (diff) | |
download | rails-da636809daca9c338200811d3590e446f57c8e81.tar.gz rails-da636809daca9c338200811d3590e446f57c8e81.tar.bz2 rails-da636809daca9c338200811d3590e446f57c8e81.zip |
Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted.
[#3128 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord/test/cases/associations/habtm_join_table_test.rb')
-rw-r--r-- | activerecord/test/cases/associations/habtm_join_table_test.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/activerecord/test/cases/associations/habtm_join_table_test.rb b/activerecord/test/cases/associations/habtm_join_table_test.rb index bf3e04c3eb..745f169ad7 100644 --- a/activerecord/test/cases/associations/habtm_join_table_test.rb +++ b/activerecord/test/cases/associations/habtm_join_table_test.rb @@ -36,21 +36,9 @@ class HabtmJoinTableTest < ActiveRecord::TestCase uses_transaction :test_should_raise_exception_when_join_table_has_a_primary_key def test_should_raise_exception_when_join_table_has_a_primary_key if ActiveRecord::Base.connection.supports_primary_key? - assert_raise ActiveRecord::ConfigurationError do - jaime = MyReader.create(:name=>"Jaime") - jaime.my_books << MyBook.create(:name=>'Great Expectations') + assert_raise ActiveRecord::HasAndBelongsToManyAssociationWithPrimaryKeyError do + MyReader.has_and_belongs_to_many :my_books end end end - - uses_transaction :test_should_cache_result_of_primary_key_check - def test_should_cache_result_of_primary_key_check - if ActiveRecord::Base.connection.supports_primary_key? - ActiveRecord::Base.connection.stubs(:primary_key).with('my_books_my_readers').returns(false).once - weaz = MyReader.create(:name=>'Weaz') - - weaz.my_books << MyBook.create(:name=>'Great Expectations') - weaz.my_books << MyBook.create(:name=>'Greater Expectations') - end - end end |