aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-03-31 15:06:22 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-03-31 15:06:22 -0300
commitbaa176e3f043dbea4e64dbc25dfa1b7ee02a9831 (patch)
tree081657325d768bb3e0d14a892464f2fe52cb616f /activerecord/test
parent7f6af33de837eeaad21f485b34ee09f682a99dbc (diff)
parent4596e16f1a55629ed2934abcd4fc386641d32c30 (diff)
downloadrails-baa176e3f043dbea4e64dbc25dfa1b7ee02a9831.tar.gz
rails-baa176e3f043dbea4e64dbc25dfa1b7ee02a9831.tar.bz2
rails-baa176e3f043dbea4e64dbc25dfa1b7ee02a9831.zip
Merge pull request #19586 from mechanicles/fix-eager-loading-for-find-methods
Fix eager loading association using default_scope for finder methods.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/associations/eager_test.rb17
1 files changed, 17 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 7d8b933992..0ecf2ddfd1 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -759,6 +759,23 @@ class EagerAssociationTest < ActiveRecord::TestCase
end
end
+ def test_eager_with_default_scope_as_class_method_using_find_method
+ david = developers(:david)
+ developer = EagerDeveloperWithClassMethodDefaultScope.find(david.id)
+ projects = Project.order(:id).to_a
+ assert_no_queries do
+ assert_equal(projects, developer.projects)
+ end
+ end
+
+ def test_eager_with_default_scope_as_class_method_using_find_by_method
+ developer = EagerDeveloperWithClassMethodDefaultScope.find_by(name: 'David')
+ projects = Project.order(:id).to_a
+ assert_no_queries do
+ assert_equal(projects, developer.projects)
+ end
+ end
+
def test_eager_with_default_scope_as_lambda
developer = EagerDeveloperWithLambdaDefaultScope.where(:name => 'David').first
projects = Project.order(:id).to_a