diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-05-26 12:54:38 -0700 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-05-26 12:54:38 -0700 |
commit | 09e431aa893bb1d08705381e2bfcd006de22a70e (patch) | |
tree | 746bcadc52e2886b725183fd54b0b22c731c8795 /activerecord/test/cases | |
parent | 0731945e74380176d3af91549f09882814694260 (diff) | |
parent | ded7e35cb021512124f491c5ee90aa52829f9932 (diff) | |
download | rails-09e431aa893bb1d08705381e2bfcd006de22a70e.tar.gz rails-09e431aa893bb1d08705381e2bfcd006de22a70e.tar.bz2 rails-09e431aa893bb1d08705381e2bfcd006de22a70e.zip |
Merge pull request #1318 from TheEmpty/master
Resolve issue #534
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/associations/habtm_join_table_test.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/activerecord/test/cases/associations/habtm_join_table_test.rb b/activerecord/test/cases/associations/habtm_join_table_test.rb index 745f169ad7..fe2b82f2c1 100644 --- a/activerecord/test/cases/associations/habtm_join_table_test.rb +++ b/activerecord/test/cases/associations/habtm_join_table_test.rb @@ -32,13 +32,4 @@ class HabtmJoinTableTest < ActiveRecord::TestCase ActiveRecord::Base.connection.drop_table :my_readers ActiveRecord::Base.connection.drop_table :my_books_my_readers end - - 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::HasAndBelongsToManyAssociationWithPrimaryKeyError do - MyReader.has_and_belongs_to_many :my_books - end - end - end end |