aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/finder_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-10-14 19:32:09 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-10-14 19:32:09 -0700
commitc09a5ffea7780a0f940f3f963c892f0ae1316802 (patch)
treee5908025ddccf62dc183f6e6ced4d87bf265b28a /activerecord/test/cases/finder_test.rb
parenta9f9ae385e2145b7f0d1ae43a7b66ed280b220b9 (diff)
parent6eee1dd62c85e23d84f16e8f300d8aba77bd5c64 (diff)
downloadrails-c09a5ffea7780a0f940f3f963c892f0ae1316802.tar.gz
rails-c09a5ffea7780a0f940f3f963c892f0ae1316802.tar.bz2
rails-c09a5ffea7780a0f940f3f963c892f0ae1316802.zip
Merge branch 'arel'
Diffstat (limited to 'activerecord/test/cases/finder_test.rb')
-rw-r--r--activerecord/test/cases/finder_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 7b6bf597a8..3de07797d4 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -1073,10 +1073,10 @@ class FinderTest < ActiveRecord::TestCase
end
def test_finder_with_scoped_from
- all_topics = Topic.all
+ all_topics = Topic.find(:all)
Topic.with_scope(:find => { :from => 'fake_topics' }) do
- assert_equal all_topics, Topic.all(:from => 'topics')
+ assert_equal all_topics, Topic.all(:from => 'topics').to_a
end
end