diff options
| author | Mike Scott <mike@homelyfe.com> | 2019-05-30 09:32:20 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-30 09:32:20 +0000 |
| commit | 852738a4984edef4006a91b6b007a4c85fb3282e (patch) | |
| tree | 3520b2981be357ad0e84053b03c0dcab1f22b8ad /spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | |
| parent | 847fd2a5c17c0590878bdccc2542c72c412bb515 (diff) | |
| download | gitlab-ce-852738a4984edef4006a91b6b007a4c85fb3282e.tar.gz | |
Add Pipeline IID to views
* Add Pipeline IID to MR's
* Add Pipeline IID to commit box
* Add Pipeline IID to builds page
* Add Pipeline IID to job sidebar
* Add Pipeline IID to header on view pipeline pages
* Add changelog entry
* Update tests
Diffstat (limited to 'spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb index 6e54aa6006b..d4ad11b3585 100644 --- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb @@ -52,7 +52,7 @@ describe 'Merge request > User merges when pipeline succeeds', :js do # so we have to wait for asynchronous call to reload it # and have_content expectation handles that. # - expect(page).to have_content "Pipeline ##{pipeline.id} running" + expect(page).to have_content "Pipeline ##{pipeline.id} (##{pipeline.iid}) running" end it_behaves_like 'Merge when pipeline succeeds activator' |