From ec44763f03b49e8c6e3bff71772ba32863a01306 Mon Sep 17 00:00:00 2001 From: Mohammad El-Abid Date: Thu, 26 May 2011 00:54:51 -0400 Subject: Removes the restriction on primary key when joining in a habtm && test that it was properly removed --- activerecord/test/cases/associations/habtm_join_table_test.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'activerecord/test') diff --git a/activerecord/test/cases/associations/habtm_join_table_test.rb b/activerecord/test/cases/associations/habtm_join_table_test.rb index 745f169ad7..85bb7d57bb 100644 --- a/activerecord/test/cases/associations/habtm_join_table_test.rb +++ b/activerecord/test/cases/associations/habtm_join_table_test.rb @@ -33,12 +33,11 @@ class HabtmJoinTableTest < ActiveRecord::TestCase 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 + uses_transaction :test_should_not_raise_exception_when_join_table_has_a_primary_key + def test_should_not_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 + # This test is to confirm that this feature is now gone + assert MyReader.has_and_belongs_to_many(:my_books).is_a?(ActiveRecord::Reflection::AssociationReflection) end end end -- cgit v1.2.3