aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-10-13 12:56:47 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-10-13 12:56:47 -0700
commitdcff027a5242b20c0c90eb062dddb22ccf51aed9 (patch)
tree4f48cbb994b67e07b1842f5e0efa0e875325b4ae /activerecord/test
parent3a2093984ff49d86db1efeff0c7581e788ecfb9f (diff)
parent42d3d3c217d158873409c50c429ae711a0306d99 (diff)
downloadrails-dcff027a5242b20c0c90eb062dddb22ccf51aed9.tar.gz
rails-dcff027a5242b20c0c90eb062dddb22ccf51aed9.tar.bz2
rails-dcff027a5242b20c0c90eb062dddb22ccf51aed9.zip
Merge pull request #12518 from vipulnsward/remove_count_options
`Relation#count` doesn't use options anymore.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/relations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 256ec60088..ec43ded690 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -295,7 +295,7 @@ class RelationTest < ActiveRecord::TestCase
def test_null_relation_calculations_methods
assert_no_queries do
assert_equal 0, Developer.none.count
- assert_equal 0, Developer.none.calculate(:count, nil, {})
+ assert_equal 0, Developer.none.calculate(:count, nil)
assert_equal nil, Developer.none.calculate(:average, 'salary')
end
end