Skip to content
Snippets Groups Projects
Commit 23b39789 authored by James Lopez's avatar James Lopez
Browse files

Merge branch 'fix-dropdown-spec-failure-pipeline' into '9-0-stable'

Fix dropdown spec failure pipeline

See merge request !10829
parents 9cc8444a 711da30b
No related branches found
No related tags found
1 merge request!10829Fix dropdown spec failure pipeline
Pipeline #
Loading
Loading
@@ -92,14 +92,14 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
 
describe 'enabling Merge when pipeline succeeds via dropdown' do
it 'activates the Merge when pipeline succeeds feature' do
click_button 'Select merge moment'
click_button 'Select Merge Moment'
within('.js-merge-dropdown') do
click_link 'Merge when pipeline succeeds'
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"
expect(page).to have_link "Cancel Automatic Merge"
end
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment