diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-14 08:28:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-14 08:28:04 +0000 |
| commit | d3b89a407c1fbfc0011acb8724cef08fd755580b (patch) | |
| tree | a5d1bddd3dcd61592d562693f028d249b1c48f61 /spec/helpers | |
| parent | d3fb1da12011b1fcaa3e2fc5c38b6cc87f3d38ab (diff) | |
| parent | 46e4e8f4dc968b7173aa37bb3e3bb944e5d63e10 (diff) | |
| download | gitlab-ce-d3b89a407c1fbfc0011acb8724cef08fd755580b.tar.gz | |
Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master'
Resolve "Renamed files have escaped HTML for the inline diff in the header"
Closes #37576
See merge request gitlab-org/gitlab-ce!14121
Diffstat (limited to 'spec/helpers')
| -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 |