diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-17 05:28:35 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-17 10:05:55 -0300 |
commit | 07c8055dc05c954c7f61006fcad85997be2c04a1 (patch) | |
tree | 1c33917cd1527fff698342edd246ed91ec0e8f0c | |
parent | 8432d03460b8fde30f203fdff2431a091f8347dd (diff) | |
download | rails-07c8055dc05c954c7f61006fcad85997be2c04a1.tar.gz rails-07c8055dc05c954c7f61006fcad85997be2c04a1.tar.bz2 rails-07c8055dc05c954c7f61006fcad85997be2c04a1.zip |
Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b23835665
Fix warning: method redefine. Testcase name are duplicated.
-rw-r--r-- | activerecord/test/cases/associations/has_many_associations_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index 50c3021737..30cfcc53d2 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -42,7 +42,7 @@ class HasManyAssociationsTestForCountWithCountSql < ActiveRecord::TestCase end end -class HasManyAssociationsTestForCountWithFinderSql < ActiveRecord::TestCase +class HasManyAssociationsTestForCountWithVariousFinderSqls < ActiveRecord::TestCase class Invoice < ActiveRecord::Base has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT DISTINCT line_items.amount from line_items" has_many :custom_full_line_items, :class_name => 'LineItem', :finder_sql => "SELECT line_items.invoice_id, line_items.amount from line_items" |