diff options
author | Jeroen Jacobs <git@jeroenj.be> | 2016-02-12 23:41:31 +0300 |
---|---|---|
committer | Jeroen Jacobs <git@jeroenj.be> | 2016-05-20 12:30:03 +0300 |
commit | 7880a300dc9ef3fcceb7f1a6af6a6500b0b46e5c (patch) | |
tree | 3aac27ae9ecedf438cd36356985ea4ca02c21153 /spec/services/merge_requests/create_service_spec.rb | |
parent | f26389a02a48a53cccb3bb7dd1d7bcd4858c118d (diff) |
Allows MR authors to have the source branch removed when merging the MR
Diffstat (limited to 'spec/services/merge_requests/create_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/create_service_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index 120f4d6a669..e433f49872d 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -12,7 +12,8 @@ describe MergeRequests::CreateService, services: true do title: 'Awesome merge_request', description: 'please fix', source_branch: 'feature', - target_branch: 'master' + target_branch: 'master', + force_remove_source_branch: '1' } end @@ -29,6 +30,7 @@ describe MergeRequests::CreateService, services: true do it { expect(@merge_request).to be_valid } it { expect(@merge_request.title).to eq('Awesome merge_request') } it { expect(@merge_request.assignee).to be_nil } + it { expect(@merge_request.merge_params['force_remove_source_branch']).to eq('1') } it 'should execute hooks with default action' do expect(service).to have_received(:execute_hooks).with(@merge_request) |