diff options
Diffstat (limited to 'spec/services/merge_requests/create_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/create_service_spec.rb | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index 723cc860d0c..53022fb9eb7 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -197,6 +197,24 @@ describe MergeRequests::CreateService do expect(merge_request.actual_head_pipeline).to be_merge_request end + context 'when there are no commits between source branch and target branch' do + let(:opts) do + { + title: 'Awesome merge_request', + description: 'please fix', + source_branch: 'not-merged-branch', + target_branch: 'master' + } + end + + it 'does not create a merge request pipeline' do + expect(merge_request).to be_persisted + + merge_request.reload + expect(merge_request.merge_request_pipelines.count).to eq(0) + end + end + context "when branch pipeline was created before a merge request pipline has been created" do before do create(:ci_pipeline, project: merge_request.source_project, @@ -226,24 +244,6 @@ describe MergeRequests::CreateService do end end - context 'when there are no commits between source branch and target branch' do - let(:opts) do - { - title: 'Awesome merge_request', - description: 'please fix', - source_branch: 'not-merged-branch', - target_branch: 'master' - } - end - - it 'does not create a merge request pipeline' do - expect(merge_request).to be_persisted - - merge_request.reload - expect(merge_request.merge_request_pipelines.count).to eq(0) - end - end - context "when .gitlab-ci.yml does not have merge_requests keywords" do let(:config) do { |