aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation_scoping_test.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-01-13 23:42:07 +0000
committerJon Leighton <j@jonathanleighton.com>2012-01-16 21:17:17 +0000
commitd13627d532f23b248a9141511c16abdf5746a486 (patch)
treeb307474e4ba22771acaedf9cba0a237e2219aad4 /activerecord/test/cases/relation_scoping_test.rb
parent247d274cabae827766c1c5b9deb34fb34548fc5e (diff)
downloadrails-d13627d532f23b248a9141511c16abdf5746a486.tar.gz
rails-d13627d532f23b248a9141511c16abdf5746a486.tar.bz2
rails-d13627d532f23b248a9141511c16abdf5746a486.zip
Revert "Deprecate implicit eager loading. Closes #950."
This reverts commit c99d507fccca2e9e4d12e49b4387e007c5481ae9.
Diffstat (limited to 'activerecord/test/cases/relation_scoping_test.rb')
-rw-r--r--activerecord/test/cases/relation_scoping_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 52dfea8fac..227b846c53 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -105,7 +105,7 @@ class RelationScopingTest < ActiveRecord::TestCase
def test_scoped_find_include
# with the include, will retrieve only developers for the given project
- scoped_developers = Developer.eager_load(:projects).scoping do
+ scoped_developers = Developer.includes(:projects).scoping do
Developer.where('projects.id = 2').all
end
assert scoped_developers.include?(developers(:david))
@@ -528,7 +528,7 @@ class DefaultScopingTest < ActiveRecord::TestCase
d = DeveloperWithIncludes.create!
d.audit_logs.create! :message => 'foo'
- assert_equal 1, DeveloperWithIncludes.eager_load(:audit_logs).where(:audit_logs => { :message => 'foo' }).count
+ assert_equal 1, DeveloperWithIncludes.where(:audit_logs => { :message => 'foo' }).count
end
def test_default_scope_is_threadsafe