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

1 files changed, 12 insertions, 0 deletions

diff --git a/activerecord/test/calculations_test.rb b/activerecord/test/calculations_test.rb
index 397b7a9026..23c45f8637 100644
--- a/activerecord/test/calculations_test.rb
+++ b/activerecord/test/calculations_test.rb
@@ -196,4 +196,16 @@ class CalculationsTest < Test::Unit::TestCase
     assert_equal 6, Account.count(:distinct => true, :include => :firm)
     assert_equal 4, Account.count(:distinct => true, :include => :firm, :select => :credit_limit)
   end
+
+  def test_deprecated_count_with_string_parameters
+    assert_deprecated('count') { Account.count('credit_limit > 50') }
+  end
+
+  def test_count_with_no_parameters_isnt_deprecated
+    assert_not_deprecated { Account.count }
+  end
+
+  def test_count_with_too_many_parameters_raises
+    assert_raise(ArgumentError) { Account.count(1, 2, 3) }
+  end
 end