aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2011-02-15 12:43:15 -0300
committerEmilio Tagua <miloops@gmail.com>2011-02-15 12:43:15 -0300
commit90a850aea4c2c04df22be0aaad1144468fcc8078 (patch)
tree79f6b09b83b9e32539b230b126ca99796925703e /activerecord
parentc13b7c4a0f7ddbd11f7570338cbd669afdb5af13 (diff)
downloadrails-90a850aea4c2c04df22be0aaad1144468fcc8078.tar.gz
rails-90a850aea4c2c04df22be0aaad1144468fcc8078.tar.bz2
rails-90a850aea4c2c04df22be0aaad1144468fcc8078.zip
Fix expected queries in relation tests.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/relations_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index cb217a65db..0e45f5a374 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -300,7 +300,7 @@ class RelationTest < ActiveRecord::TestCase
assert posts.first.author
end
- assert_queries(ActiveRecord::IdentityMap.enabled? ? 2 : 3) do
+ assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 3) do
posts = Post.preload(:author, :comments).to_a
assert posts.first.author
assert posts.first.comments.first
@@ -323,7 +323,7 @@ class RelationTest < ActiveRecord::TestCase
assert posts.first.author
end
- assert_queries(ActiveRecord::IdentityMap.enabled? ? 2 : 3) do
+ assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 3) do
posts = Post.includes(:author, :comments).to_a
assert posts.first.author
assert posts.first.comments.first