diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-08-18 08:50:59 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-08-18 08:50:59 +0000 |
commit | cc543b6c85d25cf7959f6d08cc353601f5655bed (patch) | |
tree | 23239439bfeea6d686e67d528f5949b3a970d63e /spec/lib/gitlab/string_range_marker_spec.rb | |
parent | 6ed01ebf9198a0652ad7e0825415706745c74b2c (diff) | |
parent | c271fdc80fd17e1931a1d912e231bec2b8e3d098 (diff) | |
download | gitlab-ce-cc543b6c85d25cf7959f6d08cc353601f5655bed.tar.gz |
Merge branch '36041-notification-title' into 'master'
Don't escape html entities in InlineDiffMarkdownMarker
Closes #36041
See merge request !13553
Diffstat (limited to 'spec/lib/gitlab/string_range_marker_spec.rb')
-rw-r--r-- | spec/lib/gitlab/string_range_marker_spec.rb | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/spec/lib/gitlab/string_range_marker_spec.rb b/spec/lib/gitlab/string_range_marker_spec.rb index abeaa7f0ddb..6bc02459dbd 100644 --- a/spec/lib/gitlab/string_range_marker_spec.rb +++ b/spec/lib/gitlab/string_range_marker_spec.rb @@ -2,34 +2,39 @@ require 'spec_helper' describe Gitlab::StringRangeMarker do describe '#mark' do + def mark_diff(rich = nil) + raw = 'abc <def>' + inline_diffs = [2..5] + + described_class.new(raw, rich).mark(inline_diffs) do |text, left:, right:| + "LEFT#{text}RIGHT" + end + end + context "when the rich text is html safe" do - let(:raw) { "abc <def>" } let(:rich) { %{<span class="abc">abc</span><span class="space"> </span><span class="def"><def></span>}.html_safe } - let(:inline_diffs) { [2..5] } - subject do - described_class.new(raw, rich).mark(inline_diffs) do |text, left:, right:| - "LEFT#{text}RIGHT" - end - end it 'marks the inline diffs' do - expect(subject).to eq(%{<span class="abc">abLEFTcRIGHT</span><span class="space">LEFT RIGHT</span><span class="def">LEFT<dRIGHTef></span>}) - expect(subject).to be_html_safe + expect(mark_diff(rich)).to eq(%{<span class="abc">abLEFTcRIGHT</span><span class="space">LEFT RIGHT</span><span class="def">LEFT<dRIGHTef></span>}) + expect(mark_diff(rich)).to be_html_safe end end context "when the rich text is not html safe" do - let(:raw) { "abc <def>" } - let(:inline_diffs) { [2..5] } - subject do - described_class.new(raw).mark(inline_diffs) do |text, left:, right:| - "LEFT#{text}RIGHT" + context 'when rich text equals raw text' do + it 'marks the inline diffs' do + expect(mark_diff).to eq(%{abLEFTc <dRIGHTef>}) + expect(mark_diff).not_to be_html_safe end end - it 'marks the inline diffs' do - expect(subject).to eq(%{abLEFTc <dRIGHTef>}) - expect(subject).to be_html_safe + context 'when rich text doeas not equal raw text' do + let(:rich) { "abc <def> differs" } + + it 'marks the inline diffs' do + expect(mark_diff(rich)).to eq(%{abLEFTc <dRIGHTef> differs}) + expect(mark_diff(rich)).to be_html_safe + end end end end |