aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/eager_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-09 19:49:36 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-09 19:49:36 -0700
commitfdcc252e81629eb2d142da32d47037fc5cf4030d (patch)
tree426c59811f6cd6f3f1f4ec480ff9a615db44a12a /activerecord/test/cases/associations/eager_test.rb
parentd3a99c32d172a30709fd45506e120c335cb3d929 (diff)
parent88d6ae304e335bc3e6d34f053ef8f3324faa6c1b (diff)
downloadrails-fdcc252e81629eb2d142da32d47037fc5cf4030d.tar.gz
rails-fdcc252e81629eb2d142da32d47037fc5cf4030d.tar.bz2
rails-fdcc252e81629eb2d142da32d47037fc5cf4030d.zip
Merge pull request #6683 from stevecj/fix-fragile-assert-queries
Fix fragile #assert_queries implementation and usages.
Diffstat (limited to 'activerecord/test/cases/associations/eager_test.rb')
-rw-r--r--activerecord/test/cases/associations/eager_test.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 08467900f9..76d3eb8946 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1010,8 +1010,6 @@ class EagerAssociationTest < ActiveRecord::TestCase
end
def test_eager_loading_with_conditions_on_join_model_preloads
- Author.columns
-
authors = assert_queries(2) do
Author.scoped(:includes => :author_address, :joins => :comments, :where => "posts.title like 'Welcome%'").all
end