aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/join_model_test.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-04-26 17:29:22 +0100
committerJon Leighton <j@jonathanleighton.com>2012-04-26 18:04:41 +0100
commit759d302db851754a73ec4c74e951f8a5faf2bee1 (patch)
treeb66b66f316f9cec57735197e59472f8ea52e9b0a /activerecord/test/cases/associations/join_model_test.rb
parentf6ddb13113ac5cb4e75a7d041a1ff15a036fa0f3 (diff)
downloadrails-759d302db851754a73ec4c74e951f8a5faf2bee1.tar.gz
rails-759d302db851754a73ec4c74e951f8a5faf2bee1.tar.bz2
rails-759d302db851754a73ec4c74e951f8a5faf2bee1.zip
remove deprecate #calculate calls
Diffstat (limited to 'activerecord/test/cases/associations/join_model_test.rb')
-rw-r--r--activerecord/test/cases/associations/join_model_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index d805ad6de7..95f03fc95a 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -46,7 +46,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
assert !authors(:mary).unique_categorized_posts.loaded?
assert_queries(1) { assert_equal 1, author.unique_categorized_posts.count }
assert_queries(1) { assert_equal 1, author.unique_categorized_posts.count(:title) }
- assert_queries(1) { assert_equal 0, author.unique_categorized_posts.count(:title, :conditions => "title is NULL") }
+ assert_queries(1) { assert_equal 0, author.unique_categorized_posts.where(title: nil).count(:title) }
assert !authors(:mary).unique_categorized_posts.loaded?
end