| ... | ... | @@ -37,92 +37,12 @@ describe CommitCollection do |
|
|
|
|
|
|
|
describe '#without_merge_commits' do
|
|
|
|
it 'returns all commits except merge commits' do
|
|
|
|
merge_commit = project.commit("60ecb67744cb56576c30214ff52294f8ce2def98")
|
|
|
|
expect(merge_commit).to receive(:merge_commit?).and_return(true)
|
|
|
|
|
|
|
|
collection = described_class.new(project, [
|
|
|
|
commit,
|
|
|
|
merge_commit
|
|
|
|
build(:commit),
|
|
|
|
build(:commit, :merge_commit)
|
|
|
|
])
|
|
|
|
|
|
|
|
expect(collection.without_merge_commits).to contain_exactly(commit)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'enrichment methods' do
|
|
|
|
let(:gitaly_commit) { commit }
|
|
|
|
let(:hash_commit) { Commit.from_hash(gitaly_commit.to_hash, project) }
|
|
|
|
|
|
|
|
describe '#unenriched' do
|
|
|
|
it 'returns all commits that are not backed by gitaly data' do
|
|
|
|
collection = described_class.new(project, [gitaly_commit, hash_commit])
|
|
|
|
|
|
|
|
expect(collection.unenriched).to contain_exactly(hash_commit)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#fully_enriched?' do
|
|
|
|
it 'returns true when all commits are backed by gitaly data' do
|
|
|
|
collection = described_class.new(project, [gitaly_commit, gitaly_commit])
|
|
|
|
|
|
|
|
expect(collection.fully_enriched?).to eq(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false when any commits are not backed by gitaly data' do
|
|
|
|
collection = described_class.new(project, [gitaly_commit, hash_commit])
|
|
|
|
|
|
|
|
expect(collection.fully_enriched?).to eq(false)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true when the collection is empty' do
|
|
|
|
collection = described_class.new(project, [])
|
|
|
|
|
|
|
|
expect(collection.fully_enriched?).to eq(true)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#enrich!' do
|
|
|
|
it 'replaces commits in the collection with those backed by gitaly data' do
|
|
|
|
collection = described_class.new(project, [hash_commit])
|
|
|
|
|
|
|
|
collection.enrich!
|
|
|
|
|
|
|
|
new_commit = collection.commits.first
|
|
|
|
expect(new_commit.id).to eq(hash_commit.id)
|
|
|
|
expect(hash_commit.gitaly_commit?).to eq(false)
|
|
|
|
expect(new_commit.gitaly_commit?).to eq(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'maintains the original order of the commits' do
|
|
|
|
gitaly_commits = [gitaly_commit] * 3
|
|
|
|
hash_commits = [hash_commit] * 3
|
|
|
|
# Interleave the gitaly and hash commits together
|
|
|
|
original_commits = gitaly_commits.zip(hash_commits).flatten
|
|
|
|
collection = described_class.new(project, original_commits)
|
|
|
|
|
|
|
|
collection.enrich!
|
|
|
|
|
|
|
|
original_commits.each_with_index do |original_commit, i|
|
|
|
|
new_commit = collection.commits[i]
|
|
|
|
expect(original_commit.id).to eq(new_commit.id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'fetches data if there are unenriched commits' do
|
|
|
|
collection = described_class.new(project, [hash_commit])
|
|
|
|
|
|
|
|
expect(Commit).to receive(:lazy).exactly(:once)
|
|
|
|
|
|
|
|
collection.enrich!
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not fetch data if all commits are enriched' do
|
|
|
|
collection = described_class.new(project, [gitaly_commit])
|
|
|
|
|
|
|
|
expect(Commit).not_to receive(:lazy)
|
|
|
|
|
|
|
|
collection.enrich!
|
|
|
|
end
|
|
|
|
expect(collection.without_merge_commits.size).to eq(1)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
| ... | ... | |
| ... | ... | |