diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-01-13 23:42:07 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-01-16 21:17:17 +0000 |
| commit | d13627d532f23b248a9141511c16abdf5746a486 (patch) | |
| tree | b307474e4ba22771acaedf9cba0a237e2219aad4 /activerecord/test/cases/associations/nested_through_associations_test.rb | |
| parent | 247d274cabae827766c1c5b9deb34fb34548fc5e (diff) | |
| download | rails-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/associations/nested_through_associations_test.rb')
| -rw-r--r-- | activerecord/test/cases/associations/nested_through_associations_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/associations/nested_through_associations_test.rb b/activerecord/test/cases/associations/nested_through_associations_test.rb index b879ac9fb8..f920e09410 100644 --- a/activerecord/test/cases/associations/nested_through_associations_test.rb +++ b/activerecord/test/cases/associations/nested_through_associations_test.rb @@ -515,7 +515,7 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase end def test_nested_has_many_through_with_conditions_on_source_associations_preload - authors = assert_queries(2) { Author.includes(:misc_post_first_blue_tags_2).to_a.sort_by(&:id) } + authors = assert_queries(4) { Author.includes(:misc_post_first_blue_tags_2).to_a.sort_by(&:id) } blue = tags(:blue) assert_no_queries do @@ -560,7 +560,7 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase actual = assert_queries(1) { query.joins(association).to_a.uniq } assert_equal expected, actual - actual = assert_queries(1) { query.eager_load(association).to_a.uniq } + actual = assert_queries(1) { query.includes(association).to_a.uniq } assert_equal expected, actual end end |