Merge pull request #23793 from qazbnm456/master

fix typo
rails · Feb 20, 2016 · eb65f04 · eb65f04
2 parents 6f15b27 + b2d1de2
commit eb65f04
Showing 1 changed file with 1 addition and 1 deletion.
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
@@ -146,7 +146,7 @@ def test_proper_usage_of_primary_keys_and_join_table
     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!