90a67a76d5
Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.
The cookie is set whenever the view is changed, so this value should
always be up-to-date.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
102 lines
3.1 KiB
Ruby
102 lines
3.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe DiffHelper do
|
|
include RepoHelpers
|
|
|
|
let(:project) { create(:project) }
|
|
let(:repository) { project.repository }
|
|
let(:commit) { project.commit(sample_commit.id) }
|
|
let(:diffs) { commit.diffs }
|
|
let(:diff) { diffs.first }
|
|
let(:diff_refs) { [commit.parent, commit] }
|
|
let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs) }
|
|
|
|
describe 'diff_view' do
|
|
it 'returns a valid value when cookie is set' do
|
|
helper.request.cookies[:diff_view] = 'parallel'
|
|
|
|
expect(helper.diff_view).to eq 'parallel'
|
|
end
|
|
|
|
it 'returns a default value when cookie is invalid' do
|
|
helper.request.cookies[:diff_view] = 'invalid'
|
|
|
|
expect(helper.diff_view).to eq 'inline'
|
|
end
|
|
|
|
it 'returns a default value when cookie is nil' do
|
|
expect(helper.request.cookies).to be_empty
|
|
|
|
expect(helper.diff_view).to eq 'inline'
|
|
end
|
|
end
|
|
|
|
describe 'diff_hard_limit_enabled?' do
|
|
it 'should return true if param is provided' do
|
|
allow(controller).to receive(:params) { { force_show_diff: true } }
|
|
expect(diff_hard_limit_enabled?).to be_truthy
|
|
end
|
|
|
|
it 'should return false if param is not provided' do
|
|
expect(diff_hard_limit_enabled?).to be_falsey
|
|
end
|
|
end
|
|
|
|
describe 'diff_options' do
|
|
it 'should return hard limit for a diff if force diff is true' do
|
|
allow(controller).to receive(:params) { { force_show_diff: true } }
|
|
expect(diff_options).to include(Commit.max_diff_options)
|
|
end
|
|
|
|
it 'should return safe limit for a diff if force diff is false' do
|
|
expect(diff_options).not_to include(:max_lines, :max_files)
|
|
end
|
|
end
|
|
|
|
describe 'unfold_bottom_class' do
|
|
it 'should return empty string when bottom line shouldnt be unfolded' do
|
|
expect(unfold_bottom_class(false)).to eq('')
|
|
end
|
|
|
|
it 'should return js class when bottom lines should be unfolded' do
|
|
expect(unfold_bottom_class(true)).to eq('js-unfold-bottom')
|
|
end
|
|
end
|
|
|
|
describe 'unfold_class' do
|
|
it 'returns empty on false' do
|
|
expect(unfold_class(false)).to eq('')
|
|
end
|
|
|
|
it 'returns a class on true' do
|
|
expect(unfold_class(true)).to eq('unfold js-unfold')
|
|
end
|
|
end
|
|
|
|
describe '#diff_line_content' do
|
|
it 'should return non breaking space when line is empty' do
|
|
expect(diff_line_content(nil)).to eq(' ')
|
|
end
|
|
|
|
it 'should return the line itself' do
|
|
expect(diff_line_content(diff_file.diff_lines.first.text)).
|
|
to eq('@@ -6,12 +6,18 @@ module Popen')
|
|
expect(diff_line_content(diff_file.diff_lines.first.type)).to eq('match')
|
|
expect(diff_file.diff_lines.first.new_pos).to eq(6)
|
|
end
|
|
end
|
|
|
|
describe "#mark_inline_diffs" do
|
|
let(:old_line) { %{abc 'def'} }
|
|
let(:new_line) { %{abc "def"} }
|
|
|
|
it "returns strings with marked inline diffs" do
|
|
marked_old_line, marked_new_line = mark_inline_diffs(old_line, new_line)
|
|
|
|
expect(marked_old_line).to eq("abc <span class='idiff left right'>'def'</span>")
|
|
expect(marked_old_line).to be_html_safe
|
|
expect(marked_new_line).to eq("abc <span class='idiff left right'>"def"</span>")
|
|
expect(marked_new_line).to be_html_safe
|
|
end
|
|
end
|
|
end
|