2016-07-25 14:47:09 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
describe Gitlab::Conflict::File, lib: true do
|
|
|
|
let(:project) { create(:project) }
|
|
|
|
let(:repository) { project.repository }
|
|
|
|
let(:rugged) { repository.rugged }
|
2016-08-05 07:15:06 -04:00
|
|
|
let(:their_commit) { rugged.branches['conflict-start'].target }
|
|
|
|
let(:our_commit) { rugged.branches['conflict-resolvable'].target }
|
|
|
|
let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start', source_project: project) }
|
2016-07-25 14:47:09 -04:00
|
|
|
let(:index) { rugged.merge_commits(our_commit, their_commit) }
|
|
|
|
let(:conflict) { index.conflicts.last }
|
2016-07-27 07:42:18 -04:00
|
|
|
let(:merge_file_result) { index.merge_file('files/ruby/regex.rb') }
|
2016-08-03 07:02:20 -04:00
|
|
|
let(:conflict_file) { Gitlab::Conflict::File.new(merge_file_result, conflict, merge_request: merge_request) }
|
2016-07-25 14:47:09 -04:00
|
|
|
|
2016-07-27 12:54:04 -04:00
|
|
|
describe '#resolve_lines' do
|
|
|
|
let(:section_keys) { conflict_file.sections.map { |section| section[:id] }.compact }
|
|
|
|
|
|
|
|
context 'when resolving everything to the same side' do
|
2016-08-02 08:56:50 -04:00
|
|
|
let(:resolution_hash) { section_keys.map { |key| [key, 'head'] }.to_h }
|
2016-07-27 12:54:04 -04:00
|
|
|
let(:resolved_lines) { conflict_file.resolve_lines(resolution_hash) }
|
|
|
|
let(:expected_lines) { conflict_file.lines.reject { |line| line.type == 'old' } }
|
|
|
|
|
|
|
|
it 'has the correct number of lines' do
|
|
|
|
expect(resolved_lines.length).to eq(expected_lines.length)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has content matching the chosen lines' do
|
|
|
|
expect(resolved_lines.map(&:text)).to eq(expected_lines.map(&:text))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with mixed resolutions' do
|
|
|
|
let(:resolution_hash) do
|
2016-08-02 08:56:50 -04:00
|
|
|
section_keys.map.with_index { |key, i| [key, i.even? ? 'head' : 'origin'] }.to_h
|
2016-07-27 12:54:04 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
let(:resolved_lines) { conflict_file.resolve_lines(resolution_hash) }
|
|
|
|
|
|
|
|
it 'has the correct number of lines' do
|
|
|
|
file_lines = conflict_file.lines.reject { |line| line.type == 'new' }
|
|
|
|
|
|
|
|
expect(resolved_lines.length).to eq(file_lines.length)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns a file containing only the chosen parts of the resolved sections' do
|
|
|
|
expect(resolved_lines.chunk { |line| line.type || 'both' }.map(&:first)).
|
|
|
|
to eq(['both', 'new', 'both', 'old', 'both', 'new', 'both'])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'raises MissingResolution when passed a hash without resolutions for all sections' do
|
|
|
|
empty_hash = section_keys.map { |key| [key, nil] }.to_h
|
|
|
|
invalid_hash = section_keys.map { |key| [key, 'invalid'] }.to_h
|
|
|
|
|
|
|
|
expect { conflict_file.resolve_lines({}) }.
|
|
|
|
to raise_error(Gitlab::Conflict::File::MissingResolution)
|
|
|
|
|
|
|
|
expect { conflict_file.resolve_lines(empty_hash) }.
|
|
|
|
to raise_error(Gitlab::Conflict::File::MissingResolution)
|
|
|
|
|
|
|
|
expect { conflict_file.resolve_lines(invalid_hash) }.
|
|
|
|
to raise_error(Gitlab::Conflict::File::MissingResolution)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-29 08:29:14 -04:00
|
|
|
describe '#highlight_lines!' do
|
2016-07-25 14:47:09 -04:00
|
|
|
def html_to_text(html)
|
2016-07-27 07:42:18 -04:00
|
|
|
CGI.unescapeHTML(ActionView::Base.full_sanitizer.sanitize(html)).delete("\n")
|
2016-07-25 14:47:09 -04:00
|
|
|
end
|
|
|
|
|
2016-07-29 08:29:14 -04:00
|
|
|
it 'modifies the existing lines' do
|
|
|
|
expect { conflict_file.highlight_lines! }.to change { conflict_file.lines.map(&:instance_variables) }
|
2016-07-25 14:47:09 -04:00
|
|
|
end
|
|
|
|
|
2016-07-29 08:29:14 -04:00
|
|
|
it 'is called implicitly when rich_text is accessed on a line' do
|
|
|
|
expect(conflict_file).to receive(:highlight_lines!).once.and_call_original
|
|
|
|
|
|
|
|
conflict_file.lines.each(&:rich_text)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'sets the rich_text of the lines matching the text content' do
|
|
|
|
conflict_file.lines.each do |line|
|
2016-07-25 14:47:09 -04:00
|
|
|
expect(line.text).to eq(html_to_text(line.rich_text))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#sections' do
|
2016-08-04 09:12:08 -04:00
|
|
|
it 'only inserts match lines when there is a gap between sections' do
|
|
|
|
conflict_file.sections.each_with_index do |section, i|
|
|
|
|
previous_line_number = 0
|
|
|
|
current_line_number = section[:lines].map(&:old_line).compact.min
|
2016-07-25 14:47:09 -04:00
|
|
|
|
2016-08-04 09:12:08 -04:00
|
|
|
if i > 0
|
|
|
|
previous_line_number = conflict_file.sections[i - 1][:lines].map(&:old_line).compact.last
|
|
|
|
end
|
2016-07-25 14:47:09 -04:00
|
|
|
|
2016-08-04 09:12:08 -04:00
|
|
|
if current_line_number == previous_line_number + 1
|
|
|
|
expect(section[:lines].first.type).not_to eq('match')
|
|
|
|
else
|
|
|
|
expect(section[:lines].first.type).to eq('match')
|
|
|
|
expect(section[:lines].first.text).to match(/\A@@ -#{current_line_number},\d+ \+\d+,\d+ @@ module Gitlab\Z/)
|
2016-07-25 14:47:09 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'sets conflict to false for sections with only unchanged lines' do
|
|
|
|
conflict_file.sections.reject { |section| section[:conflict] }.each do |section|
|
|
|
|
without_match = section[:lines].reject { |line| line.type == 'match' }
|
|
|
|
|
|
|
|
expect(without_match).to all(have_attributes(type: nil))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'only includes a maximum of CONTEXT_LINES (plus an optional match line) in context sections' do
|
|
|
|
conflict_file.sections.reject { |section| section[:conflict] }.each do |section|
|
|
|
|
without_match = section[:lines].reject { |line| line.type == 'match' }
|
|
|
|
|
|
|
|
expect(without_match.length).to be <= Gitlab::Conflict::File::CONTEXT_LINES * 2
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'sets conflict to true for sections with only changed lines' do
|
|
|
|
conflict_file.sections.select { |section| section[:conflict] }.each do |section|
|
|
|
|
section[:lines].each do |line|
|
|
|
|
expect(line.type).to be_in(['new', 'old'])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-07-27 12:54:04 -04:00
|
|
|
|
|
|
|
it 'adds unique IDs to conflict sections, and not to other sections' do
|
|
|
|
section_ids = []
|
|
|
|
|
|
|
|
conflict_file.sections.each do |section|
|
|
|
|
if section[:conflict]
|
|
|
|
expect(section).to have_key(:id)
|
|
|
|
section_ids << section[:id]
|
|
|
|
else
|
|
|
|
expect(section).not_to have_key(:id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
expect(section_ids.uniq).to eq(section_ids)
|
|
|
|
end
|
2016-07-25 14:47:09 -04:00
|
|
|
end
|
2016-08-03 07:02:20 -04:00
|
|
|
|
|
|
|
describe '#as_json' do
|
|
|
|
it 'includes the blob path for the file' do
|
|
|
|
expect(conflict_file.as_json[:blob_path]).
|
|
|
|
to eq("/#{project.namespace.to_param}/#{merge_request.project.to_param}/blob/#{our_commit.oid}/files/ruby/regex.rb")
|
|
|
|
end
|
2016-08-03 07:10:42 -04:00
|
|
|
|
|
|
|
it 'includes the blob icon for the file' do
|
|
|
|
expect(conflict_file.as_json[:blob_icon]).to eq('file-text-o')
|
|
|
|
end
|
2016-08-03 07:02:20 -04:00
|
|
|
end
|
2016-07-25 14:47:09 -04:00
|
|
|
end
|