diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-23 12:31:17 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-23 12:31:17 +0300 |
| commit | fbe82e4cd9f4cda7264bb78eab9c5c55e6311518 (patch) | |
| tree | de9444c1762fa43c336f595936878677aef8ce43 /spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb | |
| parent | 64820f9a6c17a348dc771a87618140a5c3c8874d (diff) | |
| parent | 101d52b360a6a43f1633c5dd60b78e37bc8c4339 (diff) | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# package.json
Diffstat (limited to 'spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb b/spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb index 046b096e366..7e17437fa2a 100644 --- a/spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb +++ b/spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb @@ -6,9 +6,9 @@ describe Gitlab::Diff::InlineDiffMarkdownMarker do let(:inline_diffs) { [2..5] } let(:subject) { described_class.new(raw).mark(inline_diffs, mode: :deletion) } - it 'marks the range' do - expect(subject).to eq("ab{-c 'd-}ef'") - expect(subject).to be_html_safe + it 'does not escape html etities and marks the range' do + expect(subject).to eq("ab{-c 'd-}ef'") + expect(subject).not_to be_html_safe end end end |