Revert "Merge pull request #33729 from kddeisz/plural-automatic-inverse"

This reverts commit ed1eda271c7ac82ecb7bd94b6fa1b0093e648a3e, reversing
changes made to 3d2caab7dc92a13d4dd369678d5b4ce659df8e52.

Reason: 7c3da6e0030aa080fcb89af58b094ed50d861a44

2 files changed, 5 insertions, 27 deletions

diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index b2110f727c..6d2f75a3ae 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -612,21 +612,9 @@ module ActiveRecord
 
         # returns either +nil+ or the inverse association name that it finds.
         def automatic_inverse_of
-          return unless can_find_inverse_of_automatically?(self)
+          if can_find_inverse_of_automatically?(self)
+            inverse_name = ActiveSupport::Inflector.underscore(options[:as] || active_record.name.demodulize).to_sym
 
-          inverse_name_candidates =
-            if options[:as]
-              [options[:as]]
-            else
-              active_record_name = active_record.name.demodulize
-              [active_record_name, ActiveSupport::Inflector.pluralize(active_record_name)]
-            end
-
-          inverse_name_candidates.map! do |candidate|
-            ActiveSupport::Inflector.underscore(candidate).to_sym
-          end
-
-          inverse_name_candidates.detect do |inverse_name|
             begin
               reflection = klass._reflect_on_association(inverse_name)
             rescue NameError
@@ -635,7 +623,9 @@ module ActiveRecord
               reflection = false
             end
 
-            valid_inverse_reflection?(reflection)
+            if valid_inverse_reflection?(reflection)
+              return inverse_name
+            end
           end
         end
 
diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb
index eb4dc73423..da3a42e2b5 100644
--- a/activerecord/test/cases/associations/inverse_associations_test.rb
+++ b/activerecord/test/cases/associations/inverse_associations_test.rb
@@ -20,8 +20,6 @@ require "models/company"
 require "models/project"
 require "models/author"
 require "models/post"
-require "models/department"
-require "models/hotel"
 
 class AutomaticInverseFindingTests < ActiveRecord::TestCase
   fixtures :ratings, :comments, :cars
@@ -726,16 +724,6 @@ class InversePolymorphicBelongsToTests < ActiveRecord::TestCase
     # fails because Interest does have the correct inverse_of
     assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Face.first.polymorphic_man = Interest.first }
   end
-
-  def test_favors_has_one_associations_for_inverse_of
-    inverse_name = Post.reflect_on_association(:author).inverse_of.name
-    assert_equal :post, inverse_name
-  end
-
-  def test_finds_inverse_of_for_plural_associations
-    inverse_name = Department.reflect_on_association(:hotel).inverse_of.name
-    assert_equal :departments, inverse_name
-  end
 end
 
 # NOTE - these tests might not be meaningful, ripped as they were from the parental_control plugin