diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-01-23 19:08:10 -0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-01-28 18:50:43 -0200 |
| commit | 2944896466ea89a334556c19c82b5403ab6b9f32 (patch) | |
| tree | 7413c4207a6ce24bedff4e39e3f68ca51dd74cac /spec/requests | |
| parent | 60f372859d0771d7a6f484d64649e9f250699225 (diff) | |
| download | gitlab-ce-2944896466ea89a334556c19c82b5403ab6b9f32.tar.gz | |
Return more consistent values for merge_status on MR APIosw-consistent-values-on-api-merge-status
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 8e2982f1a5d..14dd9da119d 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -198,6 +198,8 @@ describe API::MergeRequests do create(:merge_request, state: 'closed', milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time) + create(:merge_request, milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time) + expect do get api("/projects/#{project.id}/merge_requests", user) end.not_to exceed_query_limit(control) |