Merge pull request rails#55196 from skipkayhil/hm-fix-strict-habtm-include-p

Fix `include?` on strict-loaded HABTM association

Author: eileencodes

activerecord/lib/active_record/associations/collection_association.rb

@@ -259,10 +259,10 @@ def include?(record)
         klass = reflection.klass
         return false unless record.is_a?(klass)
 
-        if record.new_record?
-          include_in_memory?(record)
-        elsif loaded?
+        if loaded?
           target.include?(record)
+        elsif record.new_record?
+          include_in_memory?(record)
         else
           record_id = klass.composite_primary_key? ? klass.primary_key.zip(record.id).to_h : record.id
           scope.exists?(record_id)

activerecord/test/cases/strict_loading_test.rb

@@ -636,6 +636,14 @@ def test_does_not_raise_on_eager_loading_a_habtm_relation_if_strict_loading_by_d
     end
   end
 
+  def test_does_not_raise_when_checking_if_new_record_included_in_eager_loaded_habtm_relation
+    Developer.first.projects << Project.first
+
+    developer = Developer.includes(:projects).strict_loading.first
+
+    assert_nothing_raised { developer.projects.include?(Project.new) }
+  end
+
   def test_strict_loading_violation_raises_by_default
     assert_equal :raise, ActiveRecord.action_on_strict_loading_violation