From 404d785d29680d03d8a7f99de9d5986706c4c2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 16 Mar 2012 17:05:35 -0300 Subject: Fix ActiveRecord::Relation#blank? tests --- activerecord/test/cases/relations_test.rb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 515f0b9d04..63d47f5162 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -1238,18 +1238,21 @@ class RelationTest < ActiveRecord::TestCase def test_presence topics = Topic.scoped - assert_queries(1) do - #checking if there are topics is used before you actually display them, - #thus it shouldn't invoke an extra count query - assert topics.present? - assert !topics.blank? - - #shows count of topics and loops after loading the query should not trigger extra queries either - assert_no_queries { topics.size } - assert_no_queries { topics.count } - assert_no_queries { topics.length } - assert_no_queries { topics.each } - end + # the fist query is triggered because there are no topics yet. + assert_queries(1) { assert topics.present? } + + # checking if there are topics is used before you actually display them, + # thus it shouldn't invoke an extra count query. + assert_no_queries { assert topics.present? } + assert_no_queries { assert !topics.blank? } + + # shows count of topics and loops after loading the query should not trigger extra queries either. + assert_no_queries { topics.size } + assert_no_queries { topics.length } + assert_no_queries { topics.each } + + # count always trigger the COUNT query. + assert_queries(1) { topics.count } assert topics.loaded? end -- cgit v1.2.3