diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-04 13:36:06 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-04 13:36:06 +0300 |
| commit | d026441b3c68e682a136d09d68b18fa0a73684fe (patch) | |
| tree | a1d0ba9d475179a4279232f22314d75949e7b537 | |
| parent | b2f2241c0cc269ffad42fe36ac926d77d828d46b (diff) | |
| parent | b7e6e4e48bdb723ca56e1ae31e12a43395bb8157 (diff) | |
Merge branch 'ccr/flaky_mr_list_spec' into 'master'
Fix flaky spec for merge request lists
See merge request gitlab-org/gitlab-ce!20316
| -rw-r--r-- | spec/support/shared_examples/requests/api/merge_requests_list.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/support/shared_examples/requests/api/merge_requests_list.rb b/spec/support/shared_examples/requests/api/merge_requests_list.rb index a401f7541f0..1aed8ab0113 100644 --- a/spec/support/shared_examples/requests/api/merge_requests_list.rb +++ b/spec/support/shared_examples/requests/api/merge_requests_list.rb @@ -136,8 +136,9 @@ shared_examples 'merge requests list' do it 'returns an array of merge requests in given milestone' do get api(endpoint_path, user), milestone: '0.9' - expect(json_response.first['title']).to eq merge_request_closed.title - expect(json_response.first['id']).to eq merge_request_closed.id + closed_issues = json_response.select { |mr| mr['id'] == merge_request_closed.id } + expect(closed_issues.length).to eq(1) + expect(closed_issues.first['title']).to eq merge_request_closed.title end it 'returns an array of merge requests matching state in milestone' do |