loaded should be aliased to loaded? in collection proxy

Fixes #39088.
rails · May 20, 2020 · 39de115 · 39de115
1 parent 9366f52
commit 39de115
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -51,6 +51,7 @@ def load_target
       def loaded?
         @association.loaded?
       end
+      alias :loaded :loaded?
 
       ##
       # :method: select

diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
@@ -269,8 +269,10 @@ def test_reset_unloads_target
     david.posts.reload
 
     assert_predicate david.posts, :loaded?
+    assert_predicate david.posts, :loaded
     david.posts.reset
     assert_not_predicate david.posts, :loaded?
+    assert_not_predicate david.posts, :loaded
   end
 end
 

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
@@ -93,11 +93,15 @@ def test_scoped_all
   def test_loaded_all
     topics = Topic.all
 
+    assert_not_predicate topics, :loaded?
+    assert_not_predicate topics, :loaded
+
     assert_queries(1) do
       2.times { assert_equal 5, topics.to_a.size }
     end
 
     assert_predicate topics, :loaded?
+    assert_predicate topics, :loaded
   end
 
   def test_scoped_first