diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-14 15:52:55 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-14 15:52:55 +0000 |
| commit | 28709a4d531013dd6c99274483f6fae51a493eec (patch) | |
| tree | 251eddb4221ee6e7ac0bd960b109981d5c5975f1 /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | 0618ad12e2b50dd01ec1c5ce440345cb64e26133 (diff) | |
| parent | 706d99aed8985d0a278107295f5f1d26f0b42383 (diff) | |
| download | gitlab-ce-28709a4d531013dd6c99274483f6fae51a493eec.tar.gz | |
Merge branch '34075-pipelines-count-mt' into 'master'
Update Pipeline's badge count in Merge Request and Commits view to match real-time content
Closes #34075
See merge request !12789
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 6f9ce60cf75..c193babead0 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -481,7 +481,8 @@ describe Projects::MergeRequestsController do end it 'responds with serialized pipelines' do - expect(json_response).not_to be_empty + expect(json_response['pipelines']).not_to be_empty + expect(json_response['count']['all']).to eq 1 end end |