Commit edd8d911 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master'

Use RequestStore on MR show.json query count spec

See merge request !12024
parents b670f21c c3d5faa0
Pipeline #8876975 failed with stages
in 96 minutes and 44 seconds
......@@ -121,13 +121,18 @@ describe Projects::MergeRequestsController do
context 'number of queries' do
it 'verifies number of queries' do
RequestStore.begin!
# pre-create objects
merge_request
recorded = ActiveRecord::QueryRecorder.new { go(format: :json) }
expect(recorded.count).to be_within(5).of(50)
expect(recorded.count).to be_within(5).of(30)
expect(recorded.cached_count).to eq(0)
RequestStore.end!
RequestStore.clear!
end
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment