Commit 92d290c9 authored by Bryce Johnson's avatar Bryce Johnson

Set merge params to force_remove_source_branch by default.

parent ff5044d8
...@@ -7,7 +7,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do ...@@ -7,7 +7,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
let(:merge_request) do let(:merge_request) do
create(:merge_request_with_diffs, source_project: project, create(:merge_request_with_diffs, source_project: project,
author: user, author: user,
title: 'Bug NS-04') title: 'Bug NS-04',
merge_params: { force_remove_source_branch: '1' })
end end
let(:pipeline) do let(:pipeline) do
...@@ -82,7 +83,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do ...@@ -82,7 +83,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
source_project: project, source_project: project,
title: 'Bug NS-04', title: 'Bug NS-04',
author: user, author: user,
merge_user: user) merge_user: user,
merge_params: { force_remove_source_branch: '1' })
end end
before do before 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