b44eaf8e07
- Previously, we sorted commits by date, which seemed to work okay. - The one edge case where this failed was when multiple commits have the same commit date (for example: when a range of commits are cherry picked with a single command, they all have the same commit date [and different author dates]). - Commits with the same commit date would be sorted arbitrarily, and usually break the network graph. - This commit solves the problem by both sorting by date, and by sorting topographically (parents aren't displayed until all their children are displayed) - Include review comments from @adamniedzielski A more detailed explanation is present here: https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
48 lines
1.6 KiB
Ruby
48 lines
1.6 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Network::Graph, models: true do
|
|
let(:project) { create(:project, :repository) }
|
|
let!(:note_on_commit) { create(:note_on_commit, project: project) }
|
|
|
|
it '#initialize' do
|
|
graph = described_class.new(project, 'refs/heads/master', project.repository.commit, nil)
|
|
|
|
expect(graph.notes).to eq( { note_on_commit.commit_id => 1 } )
|
|
end
|
|
|
|
describe '#commits' do
|
|
let(:graph) { described_class.new(project, 'refs/heads/master', project.repository.commit, nil) }
|
|
|
|
it 'returns a list of commits' do
|
|
commits = graph.commits
|
|
|
|
expect(commits).not_to be_empty
|
|
expect(commits).to all( be_kind_of(Network::Commit) )
|
|
end
|
|
|
|
it 'it the commits by commit date (descending)' do
|
|
# Remove duplicate timestamps because they make it harder to
|
|
# assert that the commits are sorted as expected.
|
|
commits = graph.commits.uniq(&:date)
|
|
sorted_commits = commits.sort_by(&:date).reverse
|
|
|
|
expect(commits).not_to be_empty
|
|
expect(commits.map(&:id)).to eq(sorted_commits.map(&:id))
|
|
end
|
|
|
|
it 'sorts children before parents for commits with the same timestamp' do
|
|
commits_by_time = graph.commits.group_by(&:date)
|
|
|
|
commits_by_time.each do |time, commits|
|
|
commit_ids = commits.map(&:id)
|
|
|
|
commits.each_with_index do |commit, index|
|
|
parent_indexes = commit.parent_ids.map { |parent_id| commit_ids.find_index(parent_id) }.compact
|
|
|
|
# All parents of the current commit should appear after it
|
|
expect(parent_indexes).to all( be > index )
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|