Commit 6987ec29 authored by Lin Jen-Shin's avatar Lin Jen-Shin

For empty merge_request_diff st_commits would be nil

Closes #22438
parent 73b4eecd
......@@ -120,8 +120,10 @@ def head_commit
def commits_sha
if @commits
commits.map(&:sha)
else
elsif st_commits
st_commits.map { |commit| commit[:id] }
else
[]
end
end
......
......@@ -517,7 +517,7 @@
context 'with multiple irrelevant merge_request_diffs' do
before do
subject.update(target_branch: 'markdown')
subject.update(target_branch: 'v1.0.0')
end
it_behaves_like 'returning pipelines with proper ordering'
......@@ -544,13 +544,28 @@
subject.merge_request_diffs.flat_map(&:commits).map(&:sha).uniq
end
before do
subject.update(target_branch: 'markdown')
shared_examples 'returning all SHA' do
it 'returns all SHA from all merge_request_diffs' do
expect(subject.merge_request_diffs.size).to eq(2)
expect(subject.all_commits_sha).to eq(all_commits_sha)
end
end
context 'with a completely different branch' do
before do
subject.update(target_branch: 'v1.0.0')
end
it_behaves_like 'returning all SHA'
end
it 'returns all SHA from all merge_request_diffs' do
expect(subject.merge_request_diffs.size).to eq(2)
expect(subject.all_commits_sha).to eq(all_commits_sha)
context 'with a branch having no difference' do
before do
subject.update(target_branch: 'v1.1.0')
subject.reload # make sure commits were not cached
end
it_behaves_like 'returning all SHA'
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment