diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2019-08-09 16:29:13 +0000 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2019-08-09 16:29:13 +0000 |
commit | e0e6e9e7dbcff3ce9ea12fb0421704d7ef48ad15 (patch) | |
tree | cd2cf6845f770c753a9e92d0706d897786bbfc99 /spec/lib/gitlab | |
parent | 42ccb425a4bf05d067e07f6e5c7e096ab87e5cb5 (diff) | |
parent | 6d318af5f95cc4091b09f1b2f8ed9981f3a8b9c7 (diff) | |
download | gitlab-ce-e0e6e9e7dbcff3ce9ea12fb0421704d7ef48ad15.tar.gz |
Merge branch 'revert-d61dab91' into 'master'
Revert "Merge branch '65152-selective-highlight' into 'master'"
See merge request gitlab-org/gitlab-ce!31643
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/highlight_spec.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/spec/lib/gitlab/highlight_spec.rb b/spec/lib/gitlab/highlight_spec.rb index a410e4eab45..4676db6b8d8 100644 --- a/spec/lib/gitlab/highlight_spec.rb +++ b/spec/lib/gitlab/highlight_spec.rb @@ -62,14 +62,6 @@ describe Gitlab::Highlight do expect(lines[2].text).to eq(' """') end - context 'since param is present' do - it 'highlights with the LC starting from "since" param' do - lines = described_class.highlight(file_name, content, since: 2).lines - - expect(lines[0]).to include('LC2') - end - end - context 'diff highlighting' do let(:file_name) { 'test.diff' } let(:content) { "+aaa\n+bbb\n- ccc\n ddd\n"} |