aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/eager_load_nested_include_test.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-10-05 03:07:12 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-10-05 04:11:13 +0900
commit811be477786455d144819a5e9fbb7f9f54b8da69 (patch)
tree95ccdab553e3a368f554c0276fc9af517d896a0f /activerecord/test/cases/associations/eager_load_nested_include_test.rb
parent5c7c3fe0d7059ba62e14bf6ac4ddfbdcabd905a6 (diff)
downloadrails-811be477786455d144819a5e9fbb7f9f54b8da69.tar.gz
rails-811be477786455d144819a5e9fbb7f9f54b8da69.tar.bz2
rails-811be477786455d144819a5e9fbb7f9f54b8da69.zip
Use `assert_no_queries` not to ignore BEGIN/COMMIT queries
`test_update_does_not_run_sql_if_record_has_not_changed` would pass without #18501 since `assert_queries` ignores BEGIN/COMMIT unless `ignore_none: true` is given. Since #32647, empty BEGIN/COMMIT is ommited. So we no longer need to use `assert_queries(0)` to ignore BEGIN/COMMIT in the queries.
Diffstat (limited to 'activerecord/test/cases/associations/eager_load_nested_include_test.rb')
-rw-r--r--activerecord/test/cases/associations/eager_load_nested_include_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/eager_load_nested_include_test.rb b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
index c5b2b77bd4..525ad3197a 100644
--- a/activerecord/test/cases/associations/eager_load_nested_include_test.rb
+++ b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
@@ -92,7 +92,7 @@ class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
def test_include_query
res = ShapeExpression.all.merge!(includes: [ :shape, { paint: :non_poly } ]).to_a
assert_equal NUM_SHAPE_EXPRESSIONS, res.size
- assert_queries(0) do
+ assert_no_queries do
res.each do |se|
assert_not_nil se.paint.non_poly, "this is the association that was loading incorrectly before the change"
assert_not_nil se.shape, "just making sure other associations still work"