diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-02-16 15:51:38 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-03-08 14:44:25 -0600 |
| commit | aba1c07a3ea9284df911338461d8b1e2d2d6607e (patch) | |
| tree | f15b82c81a1c50a2c5154e5f1dd5414f6e291e6c /spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | |
| parent | 7734e85bc6592c5ad3330c611c5f83a051b680b0 (diff) | |
| download | gitlab-ce-aba1c07a3ea9284df911338461d8b1e2d2d6607e.tar.gz | |
Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwps
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/4281
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 | 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 |