aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorMarian Rudzynski <mr@impaled.org>2011-05-26 12:40:09 +0200
committerMarian Rudzynski <mr@impaled.org>2011-05-26 12:40:09 +0200
commitf4ed56df43b1f88dca46b1a343ede55e649b327e (patch)
tree7ae04cf23777253b130e8b7b4f78ac91c543e702 /activerecord
parent1f7c3d02645c6b72e5d1428bc7da6668cdee5fa8 (diff)
downloadrails-f4ed56df43b1f88dca46b1a343ede55e649b327e.tar.gz
rails-f4ed56df43b1f88dca46b1a343ede55e649b327e.tar.bz2
rails-f4ed56df43b1f88dca46b1a343ede55e649b327e.zip
added assertion for non-standard primary_key on models used in the primary_key test
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index b8442656ee..839a7852fc 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -104,6 +104,9 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
def test_proper_usage_of_primary_keys_and_join_table
setup_data_for_habtm_case
+ assert_equal 'country_id', Country.primary_key
+ assert_equal 'treaty_id', Treaty.primary_key
+
country = Country.first
assert_equal 1, country.treaties.count
end