summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-05-19 19:52:45 +0000
committerFatih Acet <acetfatih@gmail.com>2017-05-19 19:52:45 +0000
commit5460153c9f1a0b1679e4f31f1d588cb77857b714 (patch)
treebbee0c9665f835a7834995374b15ab32d86eded9 /spec/controllers/projects
parentdb4bbbabcafa78cfa0176fefac1b4c1dd33d098f (diff)
parentb3cf3d046b8a319c0dbca7cb9aeaea027c080e6f (diff)
downloadgitlab-ce-5460153c9f1a0b1679e4f31f1d588cb77857b714.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')
-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 0b3492a8fed..f0dc6df15ee 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