diff options
| author | micael.bergeron <micael.bergeron@solutionstlm.com> | 2017-09-12 13:42:40 -0400 |
|---|---|---|
| committer | micael.bergeron <micael.bergeron@solutionstlm.com> | 2017-09-12 13:42:40 -0400 |
| commit | 46e4e8f4dc968b7173aa37bb3e3bb944e5d63e10 (patch) | |
| tree | 5878e37f3f1e292f170d94e37ad49c1edd04adc1 /spec/helpers/diff_helper_spec.rb | |
| parent | a91101d0ac19e33b0f26acaa4c2f1207789641fb (diff) | |
| download | gitlab-ce-46e4e8f4dc968b7173aa37bb3e3bb944e5d63e10.tar.gz | |
changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header
updated the spec
Diffstat (limited to 'spec/helpers/diff_helper_spec.rb')
| -rw-r--r-- | spec/helpers/diff_helper_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb index 0deea0ff6a3..f9c31ac61d8 100644 --- a/spec/helpers/diff_helper_spec.rb +++ b/spec/helpers/diff_helper_spec.rb @@ -136,9 +136,9 @@ describe DiffHelper 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">'def'</span>}) - expect(marked_old_line).not_to be_html_safe + expect(marked_old_line).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 + expect(marked_new_line).to be_html_safe end end |