summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-05-19 19:52:45 +0000
committerkushalpandya <kushal@gitlab.com>2017-05-23 20:21:15 +0530
commit677229bb4cce279149e983afdfb86ec18c27e710 (patch)
tree9686e7070a2c7880f0a588a6b271e665f940fc04 /spec/controllers/projects/merge_requests_controller_spec.rb
parent4a2ef6c95df573342bb44906a42bc94ecbc7c9b9 (diff)
downloadgitlab-ce-677229bb4cce279149e983afdfb86ec18c27e710.tar.gz
Merge branch '32536-mr-widget-performance-improvements' into 'master'
Load improvements related to MR widget See merge request !11518
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index fdee8c6e970..646ea876e5f 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -119,6 +119,18 @@ 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
+ # pre-create objects
+ merge_request
+
+ recorded = ActiveRecord::QueryRecorder.new { go(format: :json) }
+
+ expect(recorded.count).to be_within(1).of(51)
+ expect(recorded.cached_count).to eq(0)
+ end
+ end
end
describe "as diff" do