Commit 099a9e01 authored by Bryce Johnson's avatar Bryce Johnson

Update MWPS feature spec per change to remove source branch default.

parent 08a7073e
...@@ -42,7 +42,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do ...@@ -42,7 +42,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
click_button "Merge when pipeline succeeds" click_button "Merge when pipeline succeeds"
expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds." 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 be removed." expect(page).to have_content "The source branch will not be removed."
expect(page).to have_selector ".js-cancel-auto-merge" expect(page).to have_selector ".js-cancel-auto-merge"
visit_merge_request(merge_request) # Needed to refresh the page visit_merge_request(merge_request) # Needed to refresh the page
expect(page).to have_content /enabled an automatic merge when the pipeline for \h{8} succeeds/i expect(page).to have_content /enabled an automatic merge when the pipeline for \h{8} succeeds/i
...@@ -101,7 +101,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do ...@@ -101,7 +101,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
click_link 'Merge when pipeline succeeds' click_link 'Merge when pipeline succeeds'
expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds." 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 be removed." 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 end
......
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