summaryrefslogtreecommitdiff
path: root/spec/helpers/diff_helper_spec.rb
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-08-15 07:09:05 +0200
committerJarka Kadlecova <jarka@gitlab.com>2017-08-17 19:55:07 +0200
commitc271fdc80fd17e1931a1d912e231bec2b8e3d098 (patch)
tree1e5372e9cb8bfc5a1429e3e96e127c4168c1c59a /spec/helpers/diff_helper_spec.rb
parent04f7f394d3825e3290f523dce28d42b7c87fc9bb (diff)
downloadgitlab-ce-c271fdc80fd17e1931a1d912e231bec2b8e3d098.tar.gz
Don't escape html entities when rich == raw line36041-notification-title
Diffstat (limited to 'spec/helpers/diff_helper_spec.rb')
-rw-r--r--spec/helpers/diff_helper_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb
index f81a9b6492c..0deea0ff6a3 100644
--- a/spec/helpers/diff_helper_spec.rb
+++ b/spec/helpers/diff_helper_spec.rb
@@ -135,10 +135,10 @@ describe DiffHelper do
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(%q{abc <span class="idiff left right deletion">&#39;def&#39;</span>})
- expect(marked_old_line).to be_html_safe
- expect(marked_new_line).to eq(%q{abc <span class="idiff left right addition">&quot;def&quot;</span>})
- expect(marked_new_line).to be_html_safe
+ expect(marked_old_line).to eq(%q{abc <span class="idiff left right deletion">'def'</span>})
+ expect(marked_old_line).not_to be_html_safe
+ expect(marked_new_line).to eq(%q{abc <span class="idiff left right addition">"def"</span>})
+ expect(marked_new_line).not_to be_html_safe
end
end