2018-02-27 19:10:43 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
describe DiffFileEntity do
|
|
|
|
include RepoHelpers
|
|
|
|
|
|
|
|
let(:project) { create(:project, :repository) }
|
|
|
|
let(:repository) { project.repository }
|
|
|
|
let(:commit) { project.commit(sample_commit.id) }
|
|
|
|
let(:diff_refs) { commit.diff_refs }
|
|
|
|
let(:diff) { commit.raw_diffs.first }
|
|
|
|
let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs: diff_refs, repository: repository) }
|
2018-06-21 08:22:40 -04:00
|
|
|
let(:entity) { described_class.new(diff_file, request: {}) }
|
2018-02-27 19:10:43 -05:00
|
|
|
|
|
|
|
subject { entity.as_json }
|
|
|
|
|
2018-06-21 08:22:40 -04:00
|
|
|
shared_examples 'diff file entity' do
|
|
|
|
it 'exposes correct attributes' do
|
|
|
|
expect(subject).to include(
|
|
|
|
:submodule, :submodule_link, :submodule_tree_url, :file_path,
|
|
|
|
:deleted_file, :old_path, :new_path, :mode_changed,
|
|
|
|
:a_mode, :b_mode, :text, :old_path_html,
|
|
|
|
:new_path_html, :highlighted_diff_lines, :parallel_diff_lines,
|
|
|
|
:blob, :file_hash, :added_lines, :removed_lines, :diff_refs, :content_sha,
|
|
|
|
:stored_externally, :external_storage, :too_large, :collapsed, :new_file,
|
|
|
|
:context_lines_path
|
|
|
|
)
|
|
|
|
end
|
2018-07-04 11:34:41 -04:00
|
|
|
|
2018-10-05 18:36:20 -04:00
|
|
|
it 'includes viewer' do
|
|
|
|
expect(subject[:viewer].with_indifferent_access)
|
|
|
|
.to match_schema('entities/diff_viewer')
|
|
|
|
end
|
|
|
|
|
2018-07-04 11:34:41 -04:00
|
|
|
# Converted diff files from GitHub import does not contain blob file
|
|
|
|
# and content sha.
|
|
|
|
context 'when diff file does not have a blob and content sha' do
|
|
|
|
it 'exposes some attributes as nil' do
|
|
|
|
allow(diff_file).to receive(:content_sha).and_return(nil)
|
|
|
|
allow(diff_file).to receive(:blob).and_return(nil)
|
|
|
|
|
|
|
|
expect(subject[:context_lines_path]).to be_nil
|
|
|
|
expect(subject[:view_path]).to be_nil
|
|
|
|
expect(subject[:highlighted_diff_lines]).to be_nil
|
|
|
|
expect(subject[:can_modify_blob]).to be_nil
|
|
|
|
end
|
|
|
|
end
|
2018-06-21 08:22:40 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'when there is no merge request' do
|
|
|
|
it_behaves_like 'diff file entity'
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when there is a merge request' do
|
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:request) { EntityRequest.new(project: project, current_user: user) }
|
|
|
|
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
|
|
|
|
let(:entity) { described_class.new(diff_file, request: request, merge_request: merge_request) }
|
|
|
|
let(:exposed_urls) { %i(load_collapsed_diff_url edit_path view_path context_lines_path) }
|
|
|
|
|
|
|
|
it_behaves_like 'diff file entity'
|
|
|
|
|
|
|
|
it 'exposes additional attributes' do
|
|
|
|
expect(subject).to include(*exposed_urls)
|
|
|
|
expect(subject).to include(:replaced_view_path)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'points all urls to merge request target project' do
|
|
|
|
response = subject
|
|
|
|
|
|
|
|
exposed_urls.each do |attribute|
|
|
|
|
expect(response[attribute]).to include(merge_request.target_project.to_param)
|
|
|
|
end
|
|
|
|
end
|
2018-02-27 19:10:43 -05:00
|
|
|
end
|
2018-08-16 14:53:33 -04:00
|
|
|
|
|
|
|
context '#parallel_diff_lines' do
|
|
|
|
it 'exposes parallel diff lines correctly' do
|
|
|
|
response = subject
|
|
|
|
|
|
|
|
lines = response[:parallel_diff_lines]
|
|
|
|
|
|
|
|
# make sure at least one line is present for each side
|
|
|
|
expect(lines.map { |line| line[:right] }.compact).to be_present
|
|
|
|
expect(lines.map { |line| line[:left] }.compact).to be_present
|
|
|
|
# make sure all lines are in correct format
|
|
|
|
lines.each do |parallel_line|
|
|
|
|
expect(parallel_line[:left].as_json).to match_schema('entities/diff_line') if parallel_line[:left]
|
|
|
|
expect(parallel_line[:right].as_json).to match_schema('entities/diff_line') if parallel_line[:right]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2018-02-27 19:10:43 -05:00
|
|
|
end
|