diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
| commit | 25c959f94d3dda63120256735163e4a142b8711e (patch) | |
| tree | 4c6e544a665dab5b59106ace9638dca16b71d806 /spec/requests/api/projects_spec.rb | |
| parent | b20595b2bd0023ebbc2ec46017f5d1cb1533fb4f (diff) | |
| parent | 3dd2248605ce2183f02ab268fc1f8b0b164f0bed (diff) | |
| download | gitlab-ce-issue_37640.tar.gz | |
Merge branch 'master' into 'issue_37640'issue_37640
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/requests/api/projects_spec.rb')
| -rw-r--r-- | spec/requests/api/projects_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 9602584f546..92e7d797cbd 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -54,9 +54,9 @@ describe API::Projects do shared_examples_for 'projects response without N + 1 queries' do it 'avoids N + 1 queries' do - control_count = ActiveRecord::QueryRecorder.new do + control = ActiveRecord::QueryRecorder.new do get api('/projects', current_user) - end.count + end if defined?(additional_project) additional_project @@ -66,7 +66,7 @@ describe API::Projects do expect do get api('/projects', current_user) - end.not_to exceed_query_limit(control_count + 8) + end.not_to exceed_query_limit(control).with_threshold(8) end end |