diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-12 15:14:02 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-12 15:14:02 +0300 |
| commit | 2475019b4adf1875eb6adc953d0c69b2717559ff (patch) | |
| tree | 55677e123d737143488aaf2af170a6b509145711 /spec/features/merge_request | |
| parent | bd26e012fcd50d0ff5c1ad7febc9d6355e43a6fc (diff) | |
| parent | aba1c07a3ea9284df911338461d8b1e2d2d6607e (diff) | |
Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'
Fix "Remove source branch" button in MR widget during MWPS state
Closes #42814 and #4281
See merge request gitlab-org/gitlab-ce!17192
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | 6 |
1 files changed, 6 insertions, 0 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 890774922aa..db92a3504f3 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 @@ -125,6 +125,12 @@ describe 'Merge request > User merges when pipeline succeeds', :js do expect(page).to have_content "canceled the automatic merge" end + it 'allows to remove source branch' do + click_link "Remove source branch" + + expect(page).to have_content "The source branch will be removed" + end + context 'when pipeline succeeds' do before do build.success |