aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@gmail.com>2016-02-20 09:36:04 -0500
committerEileen M. Uchitelle <eileencodes@gmail.com>2016-02-20 09:36:04 -0500
commiteb65f04fb2d53c8bd89e48d0fce731eb1ac1a196 (patch)
tree3175310ce272cba4f2143e79f1e27261f86291b4 /activerecord
parent6f15b276cb69ae1241e5c021fdc8e73fd3fe1197 (diff)
parentb2d1de2697f70239e2e80d93c0d728cd8509eae9 (diff)
downloadrails-eb65f04fb2d53c8bd89e48d0fce731eb1ac1a196.tar.gz
rails-eb65f04fb2d53c8bd89e48d0fce731eb1ac1a196.tar.bz2
rails-eb65f04fb2d53c8bd89e48d0fce731eb1ac1a196.zip
Merge pull request #23793 from qazbnm456/master
fix typo
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb2
1 files changed, 1 insertions, 1 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 bae4197aaf..9096cbc0ab 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
@@ -146,7 +146,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
assert_equal 1, country.treaties.count
end
- def test_join_table_composit_primary_key_should_not_warn
+ def test_join_table_composite_primary_key_should_not_warn
country = Country.new(:name => 'India')
country.country_id = 'c1'
country.save!