summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-05-18 17:14:48 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-05-18 19:23:05 -0300
commite8841e8dbc6a14af3ce98b7033136249dd9de265 (patch)
tree3ac55602021722e13a185110cc268ab46e60e053 /spec/controllers/projects
parente4eec191565a053f687911d80865ad43241453f8 (diff)
downloadgitlab-ce-e8841e8dbc6a14af3ce98b7033136249dd9de265.tar.gz
Drop merge_check endpoint and use only MR show instead
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 0b3492a8fed..7fe2f190790 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -119,6 +119,15 @@ describe Projects::MergeRequestsController do
expect(response).to match_response_schema('entities/merge_request')
end
end
+
+ context 'number of queries' do
+ it 'verifies number of queries' do
+ recorded = ActiveRecord::QueryRecorder.new { go(format: :json) }
+
+ expect(recorded.count).to be_within(1).of(94)
+ expect(recorded.cached_count).to eq(0)
+ end
+ end
end
describe "as diff" do