diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-12-28 03:56:20 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-12-28 03:59:44 +0530 |
commit | 1c26ba486c23f229a12fea6ccad33e6cb3122b91 (patch) | |
tree | 87c964ab22dbeb1a517d293a5e4b7f696566d2db /activerecord/test | |
parent | 6a776dcc9df437c0bcc3c1ff1d2a79966264bac9 (diff) | |
download | rails-1c26ba486c23f229a12fea6ccad33e6cb3122b91.tar.gz rails-1c26ba486c23f229a12fea6ccad33e6cb3122b91.tar.bz2 rails-1c26ba486c23f229a12fea6ccad33e6cb3122b91.zip |
Add Model.from and association_collection#from finder methods
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 9 | ||||
-rw-r--r-- | activerecord/test/cases/finder_test.rb | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index d5a4d9007b..7fa5557b96 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -61,14 +61,7 @@ class EagerAssociationTest < ActiveRecord::TestCase end def test_with_two_tables_in_from_without_getting_double_quoted - posts = Post.find(:all, - :select => "posts.*", - :from => "authors, posts", - :include => :comments, - :conditions => "posts.author_id = authors.id", - :order => "posts.id" - ) - + posts = Post.select("posts.*").from("authors, posts").eager_load(:comments).where("posts.author_id = authors.id").order("posts.id").to_a assert_equal 2, posts.first.comments.size end 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 |