diff options
Diffstat (limited to 'activerecord/test/base_test.rb')
| -rwxr-xr-x | activerecord/test/base_test.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb index 5a224bfbb8..2851665345 100755 --- a/activerecord/test/base_test.rb +++ b/activerecord/test/base_test.rb @@ -1330,11 +1330,8 @@ class BasicsTest < Test::Unit::TestCase def test_count_with_join res = Post.count_by_sql "SELECT COUNT(*) FROM posts LEFT JOIN comments ON posts.id=comments.post_id WHERE posts.#{QUOTED_TYPE} = 'Post'" - res2 = nil - assert_deprecated 'count' do - res2 = Post.count("posts.#{QUOTED_TYPE} = 'Post'", - "LEFT JOIN comments ON posts.id=comments.post_id") - end + + res2 = Post.count(:conditions => "posts.#{QUOTED_TYPE} = 'Post'", :joins => "LEFT JOIN comments ON posts.id=comments.post_id") assert_equal res, res2 res3 = nil |