aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/join_model_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/associations/join_model_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/associations/join_model_test.rb')
-rw-r--r--activerecord/test/cases/associations/join_model_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 244d01da7d..995afef796 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -362,7 +362,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
end
assert_raise ActiveRecord::EagerLoadPolymorphicError do
- tags(:general).taggings.eager_load(:taggable).where('bogus_table.column = 1').to_a
+ tags(:general).taggings.find(:all, :include => :taggable, :conditions => 'bogus_table.column = 1')
end
end
@@ -419,7 +419,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
end
def test_eager_load_has_many_through_has_many
- author = Author.where('name = ?', 'David').eager_load(:comments).order('comments.id').first
+ author = Author.find :first, :conditions => ['name = ?', 'David'], :include => :comments, :order => 'comments.id'
SpecialComment.new; VerySpecialComment.new
assert_no_queries do
assert_equal [1,2,3,5,6,7,8,9,10,12], author.comments.collect(&:id)