mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-18 17:16:08 +10:00
Merge branch 'fix-merge-requests-without-source-projects' into 'master'
Handle removed source projects in MR CI commits Fixes #3599 @dzaporozhets assigning this to you since you wrote the original code. Perhaps checking for the source project isn't the right way, but I'm not sure if there's a better way (e.g. somewhere earlier in the process) that we can detect this. See merge request !1859
This commit is contained in:
committed by
Robert Speicher
parent
94b33caf84
commit
aeaa5b5037
@@ -473,7 +473,7 @@ class MergeRequest < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def ci_commit
|
||||
if last_commit
|
||||
if last_commit and source_project
|
||||
source_project.ci_commit(last_commit.id)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -193,4 +193,29 @@ describe MergeRequest do
|
||||
it_behaves_like 'a Taskable' do
|
||||
subject { create :merge_request, :simple }
|
||||
end
|
||||
|
||||
describe '#ci_commit' do
|
||||
describe 'when the source project exists' do
|
||||
it 'returns the latest commit' do
|
||||
commit = double(:commit, id: '123abc')
|
||||
ci_commit = double(:ci_commit)
|
||||
|
||||
allow(subject).to receive(:last_commit).and_return(commit)
|
||||
|
||||
expect(subject.source_project).to receive(:ci_commit).
|
||||
with('123abc').
|
||||
and_return(ci_commit)
|
||||
|
||||
expect(subject.ci_commit).to eq(ci_commit)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'when the source project does not exist' do
|
||||
it 'returns nil' do
|
||||
allow(subject).to receive(:source_project).and_return(nil)
|
||||
|
||||
expect(subject.ci_commit).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user