aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-03-26 12:41:41 +0900
committerGitHub <noreply@github.com>2019-03-26 12:41:41 +0900
commit5883a7209239dfe7e6de1b5db210ad4912bc01bc (patch)
treef4e87d0cb018bd1bef3c4821a314d2b48da6ad60
parent15ca8ad0c1e94d11d0deb02535bc286e077d43ce (diff)
parent4dd3b2bd9a16431d2c90edcc474006d6af467f9a (diff)
downloadrails-5883a7209239dfe7e6de1b5db210ad4912bc01bc.tar.gz
rails-5883a7209239dfe7e6de1b5db210ad4912bc01bc.tar.bz2
rails-5883a7209239dfe7e6de1b5db210ad4912bc01bc.zip
Merge pull request #35754 from yahonda/diag35665
Use `assert_queries(0)` instead of `assert_no_queries`
-rw-r--r--activerecord/test/cases/associations/cascaded_eager_loading_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index b9e16cab21..49f754be63 100644
--- a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -121,7 +121,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
assert reply.save
topics = Topic.all.merge!(includes: :replies, order: ["topics.id", "replies_topics.id"]).to_a
- assert_no_queries do
+ assert_queries(0) do
assert_equal 2, topics[0].replies.size
assert_equal 0, topics[1].replies.size
end