117 lines
3.7 KiB
Ruby
117 lines
3.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'spec_helper'
|
|
|
|
RSpec.describe SystemNotes::CommitService do
|
|
let_it_be(:group) { create(:group) }
|
|
let_it_be(:project) { create(:project, :repository, group: group) }
|
|
let_it_be(:author) { create(:user) }
|
|
|
|
let(:commit_service) { described_class.new(noteable: noteable, project: project, author: author) }
|
|
|
|
describe '#add_commits' do
|
|
subject { commit_service.add_commits(new_commits, old_commits, oldrev) }
|
|
|
|
let(:noteable) { create(:merge_request, source_project: project, target_project: project) }
|
|
let(:new_commits) { noteable.commits }
|
|
let(:old_commits) { [] }
|
|
let(:oldrev) { nil }
|
|
|
|
it_behaves_like 'a system note' do
|
|
let(:commit_count) { new_commits.size }
|
|
let(:action) { 'commit' }
|
|
end
|
|
|
|
describe 'note body' do
|
|
let(:note_lines) { subject.note.split("\n").reject(&:blank?) }
|
|
|
|
describe 'comparison diff link line' do
|
|
it 'adds the comparison text' do
|
|
expect(note_lines[2]).to match "[Compare with previous version]"
|
|
end
|
|
end
|
|
|
|
context 'without existing commits' do
|
|
it 'adds a message header' do
|
|
expect(note_lines[0]).to eq "added #{new_commits.size} commits"
|
|
end
|
|
|
|
it 'adds a message for each commit' do
|
|
decoded_note_content = HTMLEntities.new.decode(subject.note)
|
|
|
|
new_commits.each do |commit|
|
|
expect(decoded_note_content).to include("<li>#{commit.short_id} - #{commit.title}</li>")
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'summary line for existing commits' do
|
|
let(:summary_line) { note_lines[1] }
|
|
|
|
context 'with one existing commit' do
|
|
let(:old_commits) { [noteable.commits.last] }
|
|
|
|
it 'includes the existing commit' do
|
|
expect(summary_line).to start_with("<ul><li>#{old_commits.first.short_id} - 1 commit from branch <code>feature</code>")
|
|
end
|
|
end
|
|
|
|
context 'with multiple existing commits' do
|
|
let(:old_commits) { noteable.commits[3..] }
|
|
|
|
context 'with oldrev' do
|
|
let(:oldrev) { noteable.commits[2].id }
|
|
|
|
it 'includes a commit range and count' do
|
|
expect(summary_line)
|
|
.to start_with("<ul><li>#{Commit.truncate_sha(oldrev)}...#{old_commits.last.short_id} - 26 commits from branch <code>feature</code>")
|
|
end
|
|
end
|
|
|
|
context 'without oldrev' do
|
|
it 'includes a commit range and count' do
|
|
expect(summary_line)
|
|
.to start_with("<ul><li>#{old_commits[0].short_id}..#{old_commits[-1].short_id} - 26 commits from branch <code>feature</code>")
|
|
end
|
|
end
|
|
|
|
context 'on a fork' do
|
|
before do
|
|
expect(noteable).to receive(:for_fork?).and_return(true)
|
|
end
|
|
|
|
it 'includes the project namespace' do
|
|
expect(summary_line).to include("<code>#{noteable.target_project_namespace}:feature</code>")
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#tag_commit' do
|
|
let(:noteable) { project.commit }
|
|
let(:tag_name) { 'v1.2.3' }
|
|
|
|
subject { commit_service.tag_commit(tag_name) }
|
|
|
|
it_behaves_like 'a system note' do
|
|
let(:action) { 'tag' }
|
|
end
|
|
|
|
it 'sets the note text' do
|
|
link = "/#{project.full_path}/-/tags/#{tag_name}"
|
|
|
|
expect(subject.note).to eq "tagged commit #{noteable.sha} to [`#{tag_name}`](#{link})"
|
|
end
|
|
end
|
|
|
|
describe '#new_commit_summary' do
|
|
it 'escapes HTML titles' do
|
|
commit = double(title: '<pre>This is a test</pre>', short_id: '12345678')
|
|
escaped = '<pre>This is a test</pre>'
|
|
|
|
expect(described_class.new.new_commit_summary([commit])).to all(match(/- #{escaped}/))
|
|
end
|
|
end
|
|
end
|