From a89cf5b15181704749f3c235be3bdeb3cff61b35 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Tue, 6 Jun 2017 12:09:33 -0300 Subject: Use RequestStore on queries count test for MergeRequestController#show.json --- spec/controllers/projects/merge_requests_controller_spec.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 08024a2148b..ccd34cdc05d 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -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(1).of(29) expect(recorded.cached_count).to eq(0) + + RequestStore.end! + RequestStore.clear! end end end -- cgit v1.2.1