debian-mirror-gitlab/spec/models/merge_request_diff_spec.rb

669 lines
21 KiB
Ruby
Raw Normal View History

2019-07-07 11:18:12 +05:30
# frozen_string_literal: true
2016-08-24 12:49:21 +05:30
require 'spec_helper'
2017-09-10 17:25:29 +05:30
describe MergeRequestDiff do
2019-05-03 19:53:19 +05:30
include RepoHelpers
2018-03-17 18:26:18 +05:30
let(:diff_with_commits) { create(:merge_request).merge_request_diff }
2019-03-13 22:55:13 +05:30
describe 'validations' do
subject { diff_with_commits }
it 'checks sha format of base_commit_sha, head_commit_sha and start_commit_sha' do
subject.base_commit_sha = subject.head_commit_sha = subject.start_commit_sha = 'foobar'
expect(subject.valid?).to be false
expect(subject.errors.count).to eq 3
expect(subject.errors).to all(include('is not a valid SHA'))
end
end
2016-09-29 09:46:39 +05:30
describe 'create new record' do
2018-03-17 18:26:18 +05:30
subject { diff_with_commits }
2016-09-29 09:46:39 +05:30
it { expect(subject).to be_valid }
it { expect(subject).to be_persisted }
2016-11-03 12:29:30 +05:30
it { expect(subject.commits.count).to eq(29) }
it { expect(subject.diffs.count).to eq(20) }
it { expect(subject.head_commit_sha).to eq('b83d6e391c22777fca1ed3012fce84f633d7fed0') }
2016-09-29 09:46:39 +05:30
it { expect(subject.base_commit_sha).to eq('ae73cb07c9eeaf35924a10f713b364d32b2dd34f') }
it { expect(subject.start_commit_sha).to eq('0b4bc9a49b562e85de7cc9e834518ea6828729b9') }
end
2018-03-17 18:26:18 +05:30
describe '.by_commit_sha' do
subject(:by_commit_sha) { described_class.by_commit_sha(sha) }
let!(:merge_request) { create(:merge_request, :with_diffs) }
context 'with sha contained in' do
let(:sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' }
it 'returns merge request diffs' do
expect(by_commit_sha).to eq([merge_request.merge_request_diff])
end
end
context 'with sha not contained in' do
let(:sha) { 'b83d6e3' }
it 'returns empty result' do
expect(by_commit_sha).to be_empty
end
end
end
2019-07-07 11:18:12 +05:30
describe '.ids_for_external_storage_migration' do
2020-03-13 15:44:24 +05:30
let_it_be(:merge_request) { create(:merge_request) }
let_it_be(:outdated) { merge_request.merge_request_diff }
let_it_be(:latest) { merge_request.create_merge_request_diff }
2019-07-07 11:18:12 +05:30
2020-03-13 15:44:24 +05:30
let_it_be(:closed_mr) { create(:merge_request, :closed_last_month) }
2019-07-07 11:18:12 +05:30
let(:closed) { closed_mr.merge_request_diff }
2020-03-13 15:44:24 +05:30
let_it_be(:merged_mr) { create(:merge_request, :merged_last_month) }
2019-07-07 11:18:12 +05:30
let(:merged) { merged_mr.merge_request_diff }
2020-03-13 15:44:24 +05:30
let_it_be(:recently_closed_mr) { create(:merge_request, :closed) }
2019-07-07 11:18:12 +05:30
let(:closed_recently) { recently_closed_mr.merge_request_diff }
2020-03-13 15:44:24 +05:30
let_it_be(:recently_merged_mr) { create(:merge_request, :merged) }
2019-07-07 11:18:12 +05:30
let(:merged_recently) { recently_merged_mr.merge_request_diff }
before do
merge_request.update!(latest_merge_request_diff: latest)
end
subject { described_class.ids_for_external_storage_migration(limit: 1000) }
context 'external diffs are disabled' do
before do
stub_external_diffs_setting(enabled: false)
end
it { is_expected.to be_empty }
end
context 'external diffs are misconfigured' do
before do
stub_external_diffs_setting(enabled: true, when: 'every second tuesday')
end
it { is_expected.to be_empty }
end
context 'external diffs are enabled unconditionally' do
before do
stub_external_diffs_setting(enabled: true)
end
it { is_expected.to contain_exactly(outdated.id, latest.id, closed.id, merged.id, closed_recently.id, merged_recently.id) }
2020-01-01 13:55:28 +05:30
it 'ignores diffs with 0 files' do
MergeRequestDiffFile.where(merge_request_diff_id: [closed_recently.id, merged_recently.id]).delete_all
is_expected.to contain_exactly(outdated.id, latest.id, closed.id, merged.id)
end
2019-07-07 11:18:12 +05:30
end
context 'external diffs are enabled for outdated diffs' do
before do
stub_external_diffs_setting(enabled: true, when: 'outdated')
end
it 'returns records for outdated merge request versions' do
is_expected.to contain_exactly(outdated.id, closed.id, merged.id)
end
end
context 'with limit' do
it 'respects the limit' do
stub_external_diffs_setting(enabled: true)
expect(described_class.ids_for_external_storage_migration(limit: 3).count).to eq(3)
end
end
end
describe '#migrate_files_to_external_storage!' do
let(:diff) { create(:merge_request).merge_request_diff }
it 'converts from in-database to external storage' do
expect(diff).not_to be_stored_externally
stub_external_diffs_setting(enabled: true)
expect(diff).to receive(:save!)
diff.migrate_files_to_external_storage!
expect(diff).to be_stored_externally
end
it 'does nothing with an external diff' do
stub_external_diffs_setting(enabled: true)
expect(diff).to be_stored_externally
expect(diff).not_to receive(:save!)
diff.migrate_files_to_external_storage!
end
it 'does nothing if external diffs are disabled' do
expect(diff).not_to be_stored_externally
expect(diff).not_to receive(:save!)
diff.migrate_files_to_external_storage!
end
end
2020-04-22 19:07:51 +05:30
describe '#migrate_files_to_database!' do
let(:diff) { create(:merge_request).merge_request_diff }
it 'converts from external to in-database storage' do
stub_external_diffs_setting(enabled: true)
expect(diff).to be_stored_externally
expect(diff).to receive(:update!).and_call_original
file = diff.external_diff
file_data = file.read
diff.migrate_files_to_database!
expect(diff).not_to be_stored_externally
expect(file).not_to exist
expect(diff.merge_request_diff_files.map(&:diff).join('')).to eq(file_data)
end
it 'does nothing with an in-database diff' do
expect(diff).not_to be_stored_externally
expect(diff).not_to receive(:update!)
diff.migrate_files_to_database!
end
it 'does nothing with an empty diff' do
stub_external_diffs_setting(enabled: true)
MergeRequestDiffFile.where(merge_request_diff_id: diff.id).delete_all
expect(diff).not_to receive(:update!)
diff.migrate_files_to_database!
end
end
2019-07-07 11:18:12 +05:30
describe '#latest?' do
2016-09-29 09:46:39 +05:30
let!(:mr) { create(:merge_request, :with_diffs) }
let!(:first_diff) { mr.merge_request_diff }
let!(:last_diff) { mr.create_merge_request_diff }
2018-03-17 18:26:18 +05:30
it { expect(last_diff.reload).to be_latest }
it { expect(first_diff.reload).not_to be_latest }
2016-09-29 09:46:39 +05:30
end
2019-03-02 22:35:43 +05:30
shared_examples_for 'merge request diffs' do
2018-11-08 19:23:39 +05:30
let(:merge_request) { create(:merge_request, :with_diffs) }
let!(:diff) { merge_request.merge_request_diff.reload }
context 'when it was not cleaned by the system' do
it 'returns persisted diffs' do
2018-12-13 13:39:08 +05:30
expect(diff).to receive(:load_diffs).and_call_original
2018-11-08 19:23:39 +05:30
2018-12-13 13:39:08 +05:30
diff.diffs.diff_files
2018-11-08 19:23:39 +05:30
end
end
context 'when diff was cleaned by the system' do
before do
diff.clean!
end
it 'returns diffs from repository if can compare with current diff refs' do
expect(diff).not_to receive(:load_diffs)
expect(Compare)
.to receive(:new)
.with(instance_of(Gitlab::Git::Compare), merge_request.target_project,
base_sha: diff.base_commit_sha, straight: false)
.and_call_original
diff.diffs
end
it 'returns persisted diffs if cannot compare with diff refs' do
2018-12-13 13:39:08 +05:30
expect(diff).to receive(:load_diffs).and_call_original
2018-11-08 19:23:39 +05:30
2019-03-13 22:55:13 +05:30
diff.update!(head_commit_sha: Digest::SHA1.hexdigest(SecureRandom.hex))
2018-11-08 19:23:39 +05:30
2018-12-13 13:39:08 +05:30
diff.diffs.diff_files
2018-11-08 19:23:39 +05:30
end
it 'returns persisted diffs if diff refs does not exist' do
2018-12-13 13:39:08 +05:30
expect(diff).to receive(:load_diffs).and_call_original
2018-11-08 19:23:39 +05:30
diff.update!(start_commit_sha: nil, base_commit_sha: nil)
2018-12-13 13:39:08 +05:30
diff.diffs.diff_files
2018-11-08 19:23:39 +05:30
end
end
2020-01-01 13:55:28 +05:30
describe '#diffs_in_batch' do
let(:diff_options) { {} }
shared_examples_for 'fetching full diffs' do
it 'returns diffs from repository comparison' do
expect_next_instance_of(Compare) do |comparison|
expect(comparison).to receive(:diffs_in_batch)
.with(1, 10, diff_options: diff_options)
.and_call_original
end
diff_with_commits.diffs_in_batch(1, 10, diff_options: diff_options)
end
it 'returns a Gitlab::Diff::FileCollection::Compare with full diffs' do
diffs = diff_with_commits.diffs_in_batch(1, 10, diff_options: diff_options)
expect(diffs).to be_a(Gitlab::Diff::FileCollection::Compare)
expect(diffs.diff_files.size).to be > 10
end
it 'returns empty pagination data' do
diffs = diff_with_commits.diffs_in_batch(1, 10, diff_options: diff_options)
expect(diffs.pagination_data).to eq(current_page: nil,
next_page: nil,
total_pages: nil)
end
end
context 'when no persisted files available' do
before do
diff_with_commits.clean!
end
it_behaves_like 'fetching full diffs'
end
context 'when diff_options include ignore_whitespace_change' do
it_behaves_like 'fetching full diffs' do
let(:diff_options) do
{ ignore_whitespace_change: true }
end
end
end
context 'when persisted files available' do
it 'returns paginated diffs' do
diffs = diff_with_commits.diffs_in_batch(1, 10, diff_options: {})
expect(diffs).to be_a(Gitlab::Diff::FileCollection::MergeRequestDiffBatch)
expect(diffs.diff_files.size).to eq(10)
expect(diffs.pagination_data).to eq(current_page: 1,
next_page: 2,
total_pages: 2)
end
end
end
2019-03-02 22:35:43 +05:30
describe '#raw_diffs' do
context 'when the :ignore_whitespace_change option is set' do
it 'creates a new compare object instead of using preprocessed data' do
expect(diff_with_commits).not_to receive(:load_diffs)
expect(diff_with_commits.compare).to receive(:diffs).and_call_original
2016-08-24 12:49:21 +05:30
2019-03-02 22:35:43 +05:30
diff_with_commits.raw_diffs(ignore_whitespace_change: true)
end
2016-08-24 12:49:21 +05:30
end
2019-03-02 22:35:43 +05:30
context 'when the raw diffs are empty' do
before do
MergeRequestDiffFile.where(merge_request_diff_id: diff_with_commits.id).delete_all
end
2016-08-24 12:49:21 +05:30
2019-03-02 22:35:43 +05:30
it 'returns an empty DiffCollection' do
expect(diff_with_commits.raw_diffs).to be_a(Gitlab::Git::DiffCollection)
expect(diff_with_commits.raw_diffs).to be_empty
end
2016-11-03 12:29:30 +05:30
end
2019-03-02 22:35:43 +05:30
context 'when the raw diffs exist' do
it 'returns the diffs' do
expect(diff_with_commits.raw_diffs).to be_a(Gitlab::Git::DiffCollection)
expect(diff_with_commits.raw_diffs).not_to be_empty
end
2016-08-24 12:49:21 +05:30
2019-03-02 22:35:43 +05:30
context 'when the :paths option is set' do
let(:diffs) { diff_with_commits.raw_diffs(paths: ['files/ruby/popen.rb', 'files/ruby/popen.rb']) }
2016-08-24 12:49:21 +05:30
2019-03-02 22:35:43 +05:30
it 'only returns diffs that match the (old path, new path) given' do
expect(diffs.map(&:new_path)).to contain_exactly('files/ruby/popen.rb')
end
2016-08-24 12:49:21 +05:30
2019-03-02 22:35:43 +05:30
it 'only serializes diff files found by query' do
expect(diff_with_commits.merge_request_diff_files.count).to be > 10
expect_any_instance_of(MergeRequestDiffFile).to receive(:to_hash).once
2018-11-18 11:00:15 +05:30
2019-03-02 22:35:43 +05:30
diffs
end
2018-11-18 11:00:15 +05:30
2019-03-02 22:35:43 +05:30
it 'uses the preprocessed diffs' do
expect(diff_with_commits).to receive(:load_diffs)
2016-08-24 12:49:21 +05:30
2019-03-02 22:35:43 +05:30
diffs
end
2016-08-24 12:49:21 +05:30
end
end
end
2016-09-29 09:46:39 +05:30
2019-03-02 22:35:43 +05:30
describe '#save_diffs' do
it 'saves collected state' do
mr_diff = create(:merge_request).merge_request_diff
2016-09-29 09:46:39 +05:30
2019-03-02 22:35:43 +05:30
expect(mr_diff.collected?).to be_truthy
end
2016-09-29 09:46:39 +05:30
2019-03-02 22:35:43 +05:30
it 'saves overflow state' do
allow(Commit).to receive(:max_diff_options)
.and_return(max_lines: 0, max_files: 0)
2017-08-17 22:00:37 +05:30
2019-03-02 22:35:43 +05:30
mr_diff = create(:merge_request).merge_request_diff
2016-09-29 09:46:39 +05:30
2019-03-02 22:35:43 +05:30
expect(mr_diff.overflow?).to be_truthy
end
2016-11-03 12:29:30 +05:30
2019-03-02 22:35:43 +05:30
it 'saves empty state' do
allow_any_instance_of(described_class).to receive_message_chain(:compare, :commits)
.and_return([])
2017-08-17 22:00:37 +05:30
2019-03-02 22:35:43 +05:30
mr_diff = create(:merge_request).merge_request_diff
2017-08-17 22:00:37 +05:30
2019-03-02 22:35:43 +05:30
expect(mr_diff.empty?).to be_truthy
end
2017-09-10 17:25:29 +05:30
2019-03-02 22:35:43 +05:30
it 'expands collapsed diffs before saving' do
mr_diff = create(:merge_request, source_branch: 'expand-collapse-lines', target_branch: 'master').merge_request_diff
diff_file = mr_diff.merge_request_diff_files.find_by(new_path: 'expand-collapse/file-5.txt')
2018-11-08 19:23:39 +05:30
2019-03-02 22:35:43 +05:30
expect(diff_file.diff).not_to be_empty
end
it 'saves binary diffs correctly' do
path = 'files/images/icn-time-tracking.pdf'
mr_diff = create(:merge_request, source_branch: 'add-pdf-text-binary', target_branch: 'master').merge_request_diff
diff_file = mr_diff.merge_request_diff_files.find_by(new_path: path)
expect(diff_file).to be_binary
expect(diff_file.diff).to eq(mr_diff.compare.diffs(paths: [path]).to_a.first.diff)
end
2019-05-03 19:53:19 +05:30
context 'with diffs that contain a null byte' do
let(:filename) { 'test-null.txt' }
let(:content) { "a" * 10000 + "\x00" }
let(:project) { create(:project, :repository) }
let(:branch) { 'null-data' }
let(:target_branch) { 'master' }
it 'saves diffs correctly' do
create_file_in_repo(project, target_branch, branch, filename, content)
mr_diff = create(:merge_request, target_project: project, source_project: project, source_branch: branch, target_branch: target_branch).merge_request_diff
diff_file = mr_diff.merge_request_diff_files.find_by(new_path: filename)
expect(diff_file).to be_binary
expect(diff_file.diff).to eq(mr_diff.compare.diffs(paths: [filename]).to_a.first.diff)
expect(diff_file.diff).to include(content)
end
end
2018-11-08 19:23:39 +05:30
end
2019-03-02 22:35:43 +05:30
end
2018-11-08 19:23:39 +05:30
2019-03-02 22:35:43 +05:30
describe 'internal diffs configured' do
include_examples 'merge request diffs'
end
2017-09-10 17:25:29 +05:30
2019-07-07 11:18:12 +05:30
describe 'external diffs always enabled' do
2019-05-18 00:54:41 +05:30
before do
2019-07-07 11:18:12 +05:30
stub_external_diffs_setting(enabled: true, when: 'always')
end
include_examples 'merge request diffs'
end
describe 'exernal diffs enabled for outdated diffs' do
before do
stub_external_diffs_setting(enabled: true, when: 'outdated')
2017-09-10 17:25:29 +05:30
end
2019-03-02 22:35:43 +05:30
include_examples 'merge request diffs'
2019-07-07 11:18:12 +05:30
it 'stores up-to-date diffs in the database' do
expect(diff).not_to be_stored_externally
end
it 'stores diffs for recently closed MRs in the database' do
mr = create(:merge_request, :closed)
expect(mr.merge_request_diff).not_to be_stored_externally
end
it 'stores diffs for recently merged MRs in the database' do
mr = create(:merge_request, :merged)
expect(mr.merge_request_diff).not_to be_stored_externally
end
it 'stores diffs for old MR versions in external storage' do
old_diff = diff
merge_request.create_merge_request_diff
old_diff.migrate_files_to_external_storage!
expect(old_diff).to be_stored_externally
end
it 'stores diffs for old closed MRs in external storage' do
mr = create(:merge_request, :closed_last_month)
expect(mr.merge_request_diff).to be_stored_externally
end
it 'stores diffs for old merged MRs in external storage' do
mr = create(:merge_request, :merged_last_month)
expect(mr.merge_request_diff).to be_stored_externally
end
2017-08-17 22:00:37 +05:30
end
2017-09-10 17:25:29 +05:30
describe '#commit_shas' do
2018-03-17 18:26:18 +05:30
it 'returns all commit SHAs using commits from the DB' do
expect(diff_with_commits.commit_shas).not_to be_empty
expect(diff_with_commits.commit_shas).to all(match(/\h{40}/))
2016-11-03 12:29:30 +05:30
end
2019-12-26 22:10:19 +05:30
context 'with limit attribute' do
it 'returns limited number of shas' do
expect(diff_with_commits.commit_shas(limit: 2).size).to eq(2)
expect(diff_with_commits.commit_shas(limit: 100).size).to eq(29)
expect(diff_with_commits.commit_shas.size).to eq(29)
end
end
2016-11-03 12:29:30 +05:30
end
describe '#compare_with' do
it 'delegates compare to the service' do
expect(CompareService).to receive(:new).and_call_original
2018-03-17 18:26:18 +05:30
diff_with_commits.compare_with(nil)
2016-11-03 12:29:30 +05:30
end
it 'uses git diff A..B approach by default' do
2018-03-17 18:26:18 +05:30
diffs = diff_with_commits.compare_with('0b4bc9a49b562e85de7cc9e834518ea6828729b9').diffs
2016-11-03 12:29:30 +05:30
2018-03-17 18:26:18 +05:30
expect(diffs.size).to eq(21)
2016-09-29 09:46:39 +05:30
end
2016-08-24 12:49:21 +05:30
end
2017-08-17 22:00:37 +05:30
describe '#commits_count' do
it 'returns number of commits using serialized commits' do
2018-03-17 18:26:18 +05:30
expect(diff_with_commits.commits_count).to eq(29)
2017-09-10 17:25:29 +05:30
end
end
2018-12-13 13:39:08 +05:30
2019-12-04 20:38:33 +05:30
describe '#first_commit' do
it 'returns first commit' do
expect(diff_with_commits.first_commit.sha).to eq(diff_with_commits.merge_request_diff_commits.last.sha)
end
end
describe '#last_commit' do
it 'returns last commit' do
expect(diff_with_commits.last_commit.sha).to eq(diff_with_commits.merge_request_diff_commits.first.sha)
end
end
2020-01-01 13:55:28 +05:30
describe '#includes_any_commits?' do
let(:non_existent_shas) do
Array.new(30) { Digest::SHA1.hexdigest(SecureRandom.hex) }
2018-12-13 13:39:08 +05:30
end
2020-01-01 13:55:28 +05:30
subject { diff_with_commits }
context 'processes the passed shas in batches' do
context 'number of existing commits is greater than batch size' do
it 'performs a separate request for each batch' do
stub_const('MergeRequestDiff::BATCH_SIZE', 5)
commit_shas = subject.commit_shas
query_count = ActiveRecord::QueryRecorder.new do
subject.includes_any_commits?(non_existent_shas + commit_shas)
end.count
expect(query_count).to eq(7)
end
end
end
2018-12-13 13:39:08 +05:30
2020-01-01 13:55:28 +05:30
it 'returns false if passed commits do not exist' do
expect(subject.includes_any_commits?([])).to eq(false)
expect(subject.includes_any_commits?([Gitlab::Git::BLANK_SHA])).to eq(false)
2018-12-13 13:39:08 +05:30
end
2020-01-01 13:55:28 +05:30
it 'returns true if passed commits exists' do
args_with_existing_commits = non_existent_shas << subject.head_commit_sha
2018-12-13 13:39:08 +05:30
2020-01-01 13:55:28 +05:30
expect(subject.includes_any_commits?(args_with_existing_commits)).to eq(true)
2018-12-13 13:39:08 +05:30
end
end
describe '#modified_paths' do
subject do
diff = create(:merge_request_diff)
create(:merge_request_diff_file, :new_file, merge_request_diff: diff)
create(:merge_request_diff_file, :renamed_file, merge_request_diff: diff)
diff
end
it 'returns affected file paths' do
expect(subject.modified_paths).to eq(%w{foo bar baz})
end
2020-04-22 19:07:51 +05:30
context "when fallback_on_overflow is true" do
let(:merge_request) { create(:merge_request, source_branch: 'feature', target_branch: 'master') }
let(:diff) { merge_request.merge_request_diff }
# before do
# # Temporarily unstub diff.modified_paths in favor of original code
# #
# allow(diff).to receive(:modified_paths).and_call_original
# end
context "when the merge_request_diff is overflowed" do
before do
expect(diff).to receive(:overflow?).and_return(true)
end
it "returns file paths via project.repository#diff_stats" do
expect(diff.project.repository).to receive(:diff_stats).and_call_original
expect(
diff.modified_paths(fallback_on_overflow: true)
).to eq(diff.modified_paths)
end
end
context "when the merge_request_diff is not overflowed" do
before do
expect(subject).to receive(:overflow?).and_return(false)
end
it "returns expect file paths withoout called #modified_paths_for_overflowed_mr" do
expect(subject.project.repository).not_to receive(:diff_stats)
expect(
subject.modified_paths(fallback_on_overflow: true)
).to eq(subject.modified_paths)
end
end
end
2018-12-13 13:39:08 +05:30
end
2019-03-02 22:35:43 +05:30
describe '#opening_external_diff' do
subject(:diff) { diff_with_commits }
context 'external diffs disabled' do
it { expect(diff.external_diff).not_to be_exists }
it 'yields nil' do
expect { |b| diff.opening_external_diff(&b) }.to yield_with_args(nil)
end
end
context 'external diffs enabled' do
let(:test_dir) { 'tmp/tests/external-diffs' }
around do |example|
FileUtils.mkdir_p(test_dir)
begin
example.run
ensure
FileUtils.rm_rf(test_dir)
end
end
before do
stub_external_diffs_setting(enabled: true, storage_path: test_dir)
end
it { expect(diff.external_diff).to be_exists }
it 'yields an open file' do
expect { |b| diff.opening_external_diff(&b) }.to yield_with_args(File)
end
it 'is re-entrant' do
outer_file_a =
diff.opening_external_diff do |outer_file|
diff.opening_external_diff do |inner_file|
expect(outer_file).to eq(inner_file)
end
outer_file
end
diff.opening_external_diff do |outer_file_b|
expect(outer_file_a).not_to eq(outer_file_b)
end
end
end
end
2019-10-12 21:52:04 +05:30
describe '#lines_count' do
subject { diff_with_commits }
it 'returns sum of all changed lines count in diff files' do
2019-12-04 20:38:33 +05:30
expect(subject.lines_count).to eq 189
2019-10-12 21:52:04 +05:30
end
end
2016-08-24 12:49:21 +05:30
end