aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Bates <ryan@railscasts.com>2008-08-07 19:33:44 -0700
committerMichael Koziarski <michael@koziarski.com>2008-08-08 10:33:29 +0200
commit1db7c9cf4a153bbc9001d69508f58b3e8b288c34 (patch)
treea1b2e1e5fe32f4550ae787127190a72a87f070b3
parenta8057669ff6ba11e228fc73eef7390b826d0de25 (diff)
downloadrails-1db7c9cf4a153bbc9001d69508f58b3e8b288c34.tar.gz
rails-1db7c9cf4a153bbc9001d69508f58b3e8b288c34.tar.bz2
rails-1db7c9cf4a153bbc9001d69508f58b3e8b288c34.zip
fixing "test_any_should_not_load_results" so it doesn't depend on latest version of Mocha
Signed-off-by: Michael Koziarski <michael@koziarski.com>
-rw-r--r--activerecord/test/cases/named_scope_test.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index e21ffbbdba..7bd712e11e 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -186,9 +186,10 @@ class NamedScopeTest < ActiveRecord::TestCase
def test_any_should_not_load_results
topics = Topic.base
- assert_queries(1) do
- topics.expects(:empty?).returns(true)
- assert !topics.any?
+ assert_queries(2) do
+ topics.any? # use count query
+ topics.collect # force load
+ topics.any? # use loaded (no query)
end
end