Resolve "Automatically created MR uses wrong target branch (when branching from Tag)"

This commit is contained in:
Athar Hameed 2018-06-08 12:28:43 +00:00 committed by Sean McGivern
parent f068479e63
commit c22e51e8c1
3 changed files with 16 additions and 4 deletions

View File

@ -41,7 +41,9 @@ module MergeRequests
end
def ref
@ref || project.default_branch || 'master'
return @ref if project.repository.branch_exists?(@ref)
project.default_branch || 'master'
end
def merge_request

View File

@ -0,0 +1,5 @@
---
title: Set MR target branch to default branch if target branch is not valid
merge_request: 19067
author:
type: fixed

View File

@ -125,9 +125,14 @@ describe MergeRequests::CreateFromIssueService do
end
context 'when ref branch does not exist' do
it 'does not create a merge request' do
expect { described_class.new(project, user, issue_iid: issue.iid, ref: 'nobr').execute }
.not_to change { project.merge_requests.count }
subject { described_class.new(project, user, issue_iid: issue.iid, ref: 'no-such-branch').execute }
it 'creates a merge request' do
expect { subject }.to change(project.merge_requests, :count).by(1)
end
it 'sets the merge request target branch to the project default branch' do
expect(subject[:merge_request].target_branch).to eq(project.default_branch)
end
end
end