f9565e3039
After installing a new gem, batch-loader, a construct can be used to queue data to be fetched in bulk. The gem was also introduced in both gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs are not merged yet. For the generation of diffs, both the old blob and the new blob need to be loaded. This for every file in the diff, too. Now we collect all these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed, which I expect to be valid, but this needs to be confirmed by a full CI run. Possibly closes: - https://gitlab.com/gitlab-org/gitlab-ce/issues/37445 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37599 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
35 lines
939 B
Ruby
35 lines
939 B
Ruby
require 'spec_helper'
|
|
|
|
describe DiffViewer::ServerSide do
|
|
set(:project) { create(:project, :repository) }
|
|
let(:commit) { project.commit_by(oid: '570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
|
|
let!(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
|
|
|
|
let(:viewer_class) do
|
|
Class.new(DiffViewer::Base) do
|
|
include DiffViewer::ServerSide
|
|
end
|
|
end
|
|
|
|
subject { viewer_class.new(diff_file) }
|
|
|
|
describe '#prepare!' do
|
|
it 'loads all diff file data' do
|
|
expect(Blob).to receive(:lazy).at_least(:twice)
|
|
|
|
subject.prepare!
|
|
end
|
|
end
|
|
|
|
describe '#render_error' do
|
|
context 'when the diff file is stored externally' do
|
|
before do
|
|
allow(diff_file).to receive(:stored_externally?).and_return(true)
|
|
end
|
|
|
|
it 'return :server_side_but_stored_externally' do
|
|
expect(subject.render_error).to eq(:server_side_but_stored_externally)
|
|
end
|
|
end
|
|
end
|
|
end
|