Commit 862b74bc authored by Stan Hu's avatar Stan Hu

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
parents cf1beb00 35acd1e9
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
Select merge moment Select merge moment
%ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' } %ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' }
%li %li
= link_to "#", class: "merge_when_pipeline_succeeds" do = link_to "#", class: "merge-when-pipeline-succeeds" do
= icon('check fw') = icon('check fw')
Merge when pipeline succeeds Merge when pipeline succeeds
%li %li
......
---
title: Fix MR widget bug that merged a MR when Merge when pipeline succeeds was clicked
via the dropdown
merge_request: 10611
author:
...@@ -89,6 +89,19 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do ...@@ -89,6 +89,19 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
it_behaves_like 'Merge when pipeline succeeds activator' it_behaves_like 'Merge when pipeline succeeds activator'
end end
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 end
context 'when merge when pipeline succeeds is enabled' do context 'when merge when pipeline succeeds is enabled' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment