diff options
| author | Matthias Zirnstein <matthias.zirnstein@googlemail.com> | 2014-01-05 17:55:39 +0100 |
|---|---|---|
| committer | Matthias Zirnstein <matthias.zirnstein@googlemail.com> | 2014-01-05 18:18:07 +0100 |
| commit | bf556880f22e759d5de6b203671636d82ecc2f18 (patch) | |
| tree | 6d8ba88353476208a38c5b1c06db5a0ed5ec537f /activerecord | |
| parent | 3713e433667ee95caccb53a4062f540405272234 (diff) | |
| download | rails-bf556880f22e759d5de6b203671636d82ecc2f18.tar.gz rails-bf556880f22e759d5de6b203671636d82ecc2f18.tar.bz2 rails-bf556880f22e759d5de6b203671636d82ecc2f18.zip | |
Remove method redefined warnings for test suite
has_many definitions with "name" as singular and as plural e.g.
has_many :welcome_posts_with_comment
has_many :welcome_posts_with_comments
Ruby mentions it with:
lib/active_record/associations/builder/collection_association.rb:65:
warning: method redefined; discarding old welcome_posts_with_comment_ids
lib/active_record/associations/builder/collection_association.rb:65:
warning: previous definition of welcome_posts_with_comment_ids was here
lib/active_record/associations/builder/collection_association.rb:75:
warning: method redefined; discarding old welcome_posts_with_comment_ids=
lib/active_record/associations/builder/collection_association.rb:75:
warning: previous definition of welcome_posts_with_comment_ids= was here
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/associations/inner_join_association_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/models/author.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb index dffee42e7d..a9efa6d86a 100644 --- a/activerecord/test/cases/associations/inner_join_association_test.rb +++ b/activerecord/test/cases/associations/inner_join_association_test.rb @@ -42,7 +42,7 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase end def test_join_association_conditions_support_string_and_arel_expressions - assert_equal 0, Author.joins(:welcome_posts_with_comment).count + assert_equal 0, Author.joins(:welcome_posts_with_one_comment).count assert_equal 1, Author.joins(:welcome_posts_with_comments).count end diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb index 794d1af43d..c197951c71 100644 --- a/activerecord/test/models/author.rb +++ b/activerecord/test/models/author.rb @@ -29,7 +29,7 @@ class Author < ActiveRecord::Base has_many :thinking_posts, -> { where(:title => 'So I was thinking') }, :dependent => :delete_all, :class_name => 'Post' has_many :welcome_posts, -> { where(:title => 'Welcome to the weblog') }, :class_name => 'Post' - has_many :welcome_posts_with_comment, + has_many :welcome_posts_with_one_comment, -> { where(title: 'Welcome to the weblog').where('comments_count = ?', 1) }, class_name: 'Post' has_many :welcome_posts_with_comments, |