diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-02-26 20:59:26 +0300 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-02-26 20:59:26 +0300 |
commit | f4be2d4e1bd4ac456610c72862f20ff29b3820a8 (patch) | |
tree | 3c581fe26b071b2b3084daed9ae46597b01ac701 /spec/requests | |
parent | f5201a816f2eff9393e16f362403451e5d86ee6c (diff) |
Revert "Merge branch '56726-fix-n+1-in-issues-and-merge-requests-api' into 'master'"
This reverts merge request !25042
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index edeb52adbb2..b4cd3130dc5 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -320,18 +320,6 @@ describe API::MergeRequests do expect(json_response.first['title']).to eq merge_request_closed.title expect(json_response.first['id']).to eq merge_request_closed.id end - - it 'avoids N+1 queries' do - control = ActiveRecord::QueryRecorder.new do - get api("/projects/#{project.id}/merge_requests", user) - end.count - - create(:merge_request, author: user, assignee: user, source_project: project, target_project: project, created_at: base_time) - - expect do - get api("/projects/#{project.id}/merge_requests", user) - end.not_to exceed_query_limit(control) - end end describe "GET /groups/:id/merge_requests" do |