diff options
author | Bryce Johnson <bryce@gitlab.com> | 2017-05-25 14:43:53 -0400 |
---|---|---|
committer | Bryce Johnson <bryce@gitlab.com> | 2017-05-25 14:43:53 -0400 |
commit | 099a9e016e8c09609fbbbc96c6bca4781f87d487 (patch) | |
tree | 87c6d751cbb30a5bac497b4cf63457c617059949 /spec/features | |
parent | 08a7073eb890f9a885aa6a78caefcec3090644b2 (diff) | |
download | gitlab-ce-099a9e016e8c09609fbbbc96c6bca4781f87d487.tar.gz |
Update MWPS feature spec per change to remove source branch default.32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb | 4 |
1 files changed, 2 insertions, 2 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 dd87af06820..e1ba1df18a4 100644 --- a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb @@ -42,7 +42,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do 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 "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" 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 @@ -101,7 +101,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do 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 "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" end end |