diff options
author | Shinya Maeda <shinya@gitlab.com> | 2019-06-26 15:24:09 +0300 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2019-07-05 09:19:30 +0300 |
commit | 587ffd11480db3ed492459ec2b6fac32a459ebaa (patch) | |
tree | f695dba44247ea39cf3cbd53b33943880cbb6659 /spec/services/auto_merge_service_spec.rb | |
parent | 9414a41f8390511005702ab4fec99239b6c3c6dd (diff) |
Split AutoMergeService interfaces into two `cancel` and `abort`
Create explicit endpoint - abort.
Diffstat (limited to 'spec/services/auto_merge_service_spec.rb')
-rw-r--r-- | spec/services/auto_merge_service_spec.rb | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/spec/services/auto_merge_service_spec.rb b/spec/services/auto_merge_service_spec.rb index 93a22e60498..50dfc49a59c 100644 --- a/spec/services/auto_merge_service_spec.rb +++ b/spec/services/auto_merge_service_spec.rb @@ -161,4 +161,29 @@ describe AutoMergeService do end end end + + describe '#abort' do + subject { service.abort(merge_request, error) } + + let(:merge_request) { create(:merge_request, :merge_when_pipeline_succeeds) } + let(:error) { 'an error' } + + it 'delegates to a relevant service instance' do + expect_next_instance_of(AutoMerge::MergeWhenPipelineSucceedsService) do |service| + expect(service).to receive(:abort).with(merge_request, error) + end + + subject + end + + context 'when auto merge is not enabled' do + let(:merge_request) { create(:merge_request) } + + it 'returns error' do + expect(subject[:message]).to eq("Can't abort the automatic merge") + expect(subject[:status]).to eq(:error) + expect(subject[:http_status]).to eq(406) + end + end + end end |