Merge pull request #13598 from zirni/remove_ar_warnings

Remove method redefined warnings for test suite

Closes #13526

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,