aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/base_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-26 17:02:45 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-26 17:02:45 +0000
commita0bf0195a5c27c8c8493b1a44987154a9dc0d526 (patch)
tree9c48753be9e25512a3dd58fde92af218fb0f5db7 /activerecord/test/base_test.rb
parentc554a9cabaa3c8bbed5a0dccb381fdc6d516972d (diff)
downloadrails-a0bf0195a5c27c8c8493b1a44987154a9dc0d526.tar.gz
rails-a0bf0195a5c27c8c8493b1a44987154a9dc0d526.tar.bz2
rails-a0bf0195a5c27c8c8493b1a44987154a9dc0d526.zip
Deprecation: count class method should be called with an options hash rather than two args for conditions and joins. Closes #6287.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5192 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/base_test.rb')
-rwxr-xr-xactiverecord/test/base_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index c1dc89a611..055f5e8670 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -1159,7 +1159,7 @@ 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_nothing_raised do
+ assert_deprecated 'count' do
res2 = Post.count("posts.#{QUOTED_TYPE} = 'Post'",
"LEFT JOIN comments ON posts.id=comments.post_id")
end