aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/eager_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-19 05:58:08 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-19 05:58:08 -0800
commit31436206d9fea09f6332d89e7863bc60e8db902f (patch)
tree33326c5ebad5df43f69321a02569287b27143b81 /activerecord/test/cases/associations/eager_test.rb
parentb4e053e867232e28c7b99b0d935161d1e4559ced (diff)
parent9be7f63db9063b004bc0645df1d49e23ee3ccae9 (diff)
downloadrails-31436206d9fea09f6332d89e7863bc60e8db902f.tar.gz
rails-31436206d9fea09f6332d89e7863bc60e8db902f.tar.bz2
rails-31436206d9fea09f6332d89e7863bc60e8db902f.zip
Merge pull request #9323 from senny/build_fix_from_9252
keep the build :green_heart:, #first on 1.8.7 and pg is different
Diffstat (limited to 'activerecord/test/cases/associations/eager_test.rb')
-rw-r--r--activerecord/test/cases/associations/eager_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 5d07ffa241..c125b89aee 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1114,7 +1114,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
end
test "preloading does not cache has many association subset when preloaded with a through association" do
- author = Author.includes(:comments_with_order_and_conditions, :posts).first
+ author = Author.where(:id => 1).includes(:comments_with_order_and_conditions, :posts).first
assert_no_queries { assert_equal 2, author.comments_with_order_and_conditions.size }
assert_no_queries { assert_equal 5, author.posts.size, "should not cache a subset of the association" }
end