aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/associations_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/associations_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/associations_test.rb')
-rwxr-xr-xactiverecord/test/associations_test.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb
index 5e9a39873d..b843f5bdf5 100755
--- a/activerecord/test/associations_test.rb
+++ b/activerecord/test/associations_test.rb
@@ -395,7 +395,9 @@ class HasManyAssociationsTest < Test::Unit::TestCase
end
def test_counting_with_single_conditions
- assert_equal 2, Firm.find(:first).plain_clients.count('1=1')
+ assert_deprecated 'count' do
+ assert_equal 2, Firm.find(:first).plain_clients.count('1=1')
+ end
end
def test_counting_with_single_hash