diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2016-07-11 11:25:01 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2016-07-11 14:08:06 -0400 |
| commit | eac19b289384a6281c75781e79bad21408063c1c (patch) | |
| tree | 00d4a1a41aba1b6b958eb0f80e79919113f3e9bc /spec/requests/api/merge_requests_spec.rb | |
| parent | 3239c5f666fb93cbd66cf9b1d02b8a9d6e8b0d51 (diff) | |
| download | gitlab-ce-eac19b289384a6281c75781e79bad21408063c1c.tar.gz | |
api: expose {should,force}_remove_source_branch
Workflows which use a bot to merge should remove branches if requested.
Expose the flag so that bots can request know this.
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 4a1b5600bdf..651b91e9f68 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -138,6 +138,8 @@ describe API::API, api: true do expect(json_response['work_in_progress']).to be_falsy expect(json_response['merge_when_build_succeeds']).to be_falsy expect(json_response['merge_status']).to eq('can_be_merged') + expect(json_response['should_close_merge_request']).to be_falsy + expect(json_response['force_close_merge_request']).to be_falsy end it "should return merge_request" do @@ -147,6 +149,8 @@ describe API::API, api: true do expect(json_response['iid']).to eq(merge_request.iid) expect(json_response['work_in_progress']).to eq(false) expect(json_response['merge_status']).to eq('can_be_merged') + expect(json_response['should_close_merge_request']).to be_falsy + expect(json_response['force_close_merge_request']).to be_falsy end it 'should return merge_request by iid' do |