70af1e2e03
When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't always call `lines`, which meant that we didn't get the benefit of the side-effect from that, where it forced the conflict data itself to UTF-8. To fix that, make this explicit by separating the `raw_content` (any encoding) from the `content` (which is either UTF-8, or an exception is raised).
50 lines
1.8 KiB
Ruby
50 lines
1.8 KiB
Ruby
# coding: utf-8
|
|
require 'spec_helper'
|
|
|
|
describe Gitlab::Git::Conflict::File do
|
|
let(:conflict) { { theirs: { path: 'foo', mode: 33188 }, ours: { path: 'foo', mode: 33188 } } }
|
|
let(:invalid_content) { described_class.new(nil, nil, conflict, "a\xC4\xFC".force_encoding(Encoding::ASCII_8BIT)) }
|
|
let(:valid_content) { described_class.new(nil, nil, conflict, "Espa\xC3\xB1a".force_encoding(Encoding::ASCII_8BIT)) }
|
|
|
|
describe '#lines' do
|
|
context 'when the content contains non-UTF-8 characters' do
|
|
it 'raises UnsupportedEncoding' do
|
|
expect { invalid_content.lines }
|
|
.to raise_error(described_class::UnsupportedEncoding)
|
|
end
|
|
end
|
|
|
|
context 'when the content can be converted to UTF-8' do
|
|
it 'sets lines to the lines' do
|
|
expect(valid_content.lines).to eq([{
|
|
full_line: 'España',
|
|
type: nil,
|
|
line_obj_index: 0,
|
|
line_old: 1,
|
|
line_new: 1
|
|
}])
|
|
end
|
|
|
|
it 'sets the type to text' do
|
|
expect(valid_content.type).to eq('text')
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#content' do
|
|
context 'when the content contains non-UTF-8 characters' do
|
|
it 'raises UnsupportedEncoding' do
|
|
expect { invalid_content.content }
|
|
.to raise_error(described_class::UnsupportedEncoding)
|
|
end
|
|
end
|
|
|
|
context 'when the content can be converted to UTF-8' do
|
|
it 'returns a valid UTF-8 string' do
|
|
expect(valid_content.content).to eq('España')
|
|
expect(valid_content.content).to be_valid_encoding
|
|
expect(valid_content.content.encoding).to eq(Encoding::UTF_8)
|
|
end
|
|
end
|
|
end
|
|
end
|