diff options
author | Stan Hu <stanhu@gmail.com> | 2017-04-11 12:15:26 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-04-11 12:15:26 +0000 |
commit | 862b74bc4688bcd572b32d9998cbfbedec39e053 (patch) | |
tree | 6b1939d7aca9f611317302139f5552eb61c44821 /spec | |
parent | cf1beb003bc538fded81c26bb360b1ec9525937e (diff) | |
parent | 35acd1e943a945de8a75fe4fa89f43d630c7bff7 (diff) | |
download | gitlab-ce-862b74bc4688bcd572b32d9998cbfbedec39e053.tar.gz |
Merge branch 'mr-widget-bug-fix' into 'master'
Fix the MR widget that merged any MR when choosing the option "Merge when pipeline succeeds" from the dropdown
Closes #29568
See merge request !10611
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb index 646e7bab265..cd540ca113a 100644 --- a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb @@ -89,6 +89,19 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do it_behaves_like 'Merge when pipeline succeeds activator' end end + + describe 'enabling Merge when pipeline succeeds via dropdown' do + it 'activates the Merge when pipeline succeeds feature' do + click_button 'Select merge moment' + within('.js-merge-dropdown') do + click_link 'Merge when pipeline succeeds' + end + + expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds." + expect(page).to have_content "The source branch will not be removed." + expect(page).to have_link "Cancel automatic merge" + end + end end context 'when merge when pipeline succeeds is enabled' do |