diff options
author | Stan Hu <stanhu@gmail.com> | 2017-04-11 12:15:26 +0000 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-04-19 11:22:02 +0200 |
commit | d02b0e3a4c3fcaf4505c3f276bcf8e848bac2c41 (patch) | |
tree | 48c4c61e2fbec4a858ded3f46b4650971aecff37 | |
parent | a6b9899d4d6440bed20e01ffc2f07ed61ce3c748 (diff) | |
download | gitlab-ce-d02b0e3a4c3fcaf4505c3f276bcf8e848bac2c41.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
3 files changed, 19 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml index c94c7944c0b..178220bccef 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -18,7 +18,7 @@ Select Merge Moment %ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' } %li - = link_to "#", class: "merge_when_pipeline_succeeds" do + = link_to "#", class: "merge-when-pipeline-succeeds" do = icon('check fw') Merge When Pipeline Succeeds %li diff --git a/changelogs/unreleased/mr-widget-bug-fix.yml b/changelogs/unreleased/mr-widget-bug-fix.yml new file mode 100644 index 00000000000..9af29d3927e --- /dev/null +++ b/changelogs/unreleased/mr-widget-bug-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fix MR widget bug that merged a MR when Merge when pipeline succeeds was clicked + via the dropdown +merge_request: 10611 +author: 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 ed7193b9777..e4d605d11c9 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 |