aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-01 13:13:57 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-01 13:13:57 -0700
commitb6e061459b6a53959e26f94a750ccc9528116e05 (patch)
tree0004df6bffc5c73d64ad89ba6f37b36c1f8d92fe /activerecord/test
parent259161881fb5becaadfca47bda2dcf36cfb129f2 (diff)
parent2181832fca6171631f6c7ff700e14676c6d331e8 (diff)
downloadrails-b6e061459b6a53959e26f94a750ccc9528116e05.tar.gz
rails-b6e061459b6a53959e26f94a750ccc9528116e05.tar.bz2
rails-b6e061459b6a53959e26f94a750ccc9528116e05.zip
Merge pull request #11226 from senny/remove_deprecated_distinct_option
Remove deprecated `:distinct` option from `Relation#count`.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/calculations_test.rb10
1 files changed, 0 insertions, 10 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 0f3f9aecfc..73a183f9b4 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -351,16 +351,6 @@ class CalculationsTest < ActiveRecord::TestCase
assert_equal 5, Account.count(:firm_id)
end
- def test_count_distinct_option_is_deprecated
- assert_deprecated do
- assert_equal 4, Account.select(:credit_limit).count(distinct: true)
- end
-
- assert_deprecated do
- assert_equal 6, Account.select(:credit_limit).count(distinct: false)
- end
- end
-
def test_count_with_distinct
assert_equal 4, Account.select(:credit_limit).distinct.count
assert_equal 4, Account.select(:credit_limit).uniq.count