aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/finder_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 14:44:21 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 14:44:21 -0800
commit5012a1558dd1483df525f1fac1e649e089be886a (patch)
tree983136a50ee7bb135768038e33c9c226a3a167ed /activerecord/test/cases/finder_test.rb
parent1cd949006a419807d5ae3400442942b752780ca2 (diff)
parent12e43494a748e0144195be12dc19161cc3e4d39f (diff)
downloadrails-5012a1558dd1483df525f1fac1e649e089be886a.tar.gz
rails-5012a1558dd1483df525f1fac1e649e089be886a.tar.bz2
rails-5012a1558dd1483df525f1fac1e649e089be886a.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/test/cases/finder_test.rb')
-rw-r--r--activerecord/test/cases/finder_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index c531a2dec1..87a9630978 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -1023,7 +1023,7 @@ class FinderTest < ActiveRecord::TestCase
all_topics = Topic.find(:all)
Topic.with_scope(:find => { :from => 'fake_topics' }) do
- assert_equal all_topics, Topic.all(:from => 'topics').to_a
+ assert_equal all_topics, Topic.from('topics').to_a
end
end