Permalink
Browse files

Merge pull request #13598 from zirni/remove_ar_warnings

Remove method redefined warnings for test suite

Closes #13526
  • Loading branch information...
2 parents 7a085da + bf55688 commit 6e867a4dfed31f364d3917dcb8d555f655a73f9e @rafaelfranca rafaelfranca committed Jan 5, 2014
@@ -42,7 +42,7 @@ def test_join_conditions_added_to_join_clause
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
@@ -29,7 +29,7 @@ def ratings
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,

0 comments on commit 6e867a4

Please sign in to comment.