diff --git a/Gemfile.lock b/Gemfile.lock index b03bd58eaccc7f7f67017cfba50d98c37efebc26..4881faac0e010e3ee1f90115cd1bb46950a0c579 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -770,7 +770,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.3.0) + rouge (3.4.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) diff --git a/spec/lib/gitlab/highlight_spec.rb b/spec/lib/gitlab/highlight_spec.rb index fe0e9702f8a57c372fd5738eb5d9e6f7caa5f5dd..4676db6b8d8b1da51ac1ba6f04d29b8770bc528b 100644 --- a/spec/lib/gitlab/highlight_spec.rb +++ b/spec/lib/gitlab/highlight_spec.rb @@ -18,9 +18,10 @@ describe Gitlab::Highlight do end describe '#highlight' do + let(:plain_text_file_name) { "test.txt" } + let(:plain_text_content) { "plain text contents" } let(:file_name) { 'test.lisp' } - let(:no_context_content) { ":type \"assem\"))" } - let(:content) { "(make-pathname :defaults name\n#{no_context_content}" } + let(:content) { "(make-pathname :defaults name\n:type \"assem\")" } let(:multiline_content) do %q( def test(input): @@ -32,22 +33,22 @@ describe Gitlab::Highlight do it 'highlights' do expected = %Q[(make-pathname :defaults name -:type "assem"))] +:type "assem")] expect(described_class.highlight(file_name, content)).to eq(expected) end it 'returns plain version for unknown lexer context' do - result = described_class.highlight(file_name, no_context_content) + result = described_class.highlight(plain_text_file_name, plain_text_content) - expect(result).to eq(%[:type "assem"))]) + expect(result).to eq(%[plain text contents]) end it 'returns plain version for long content' do stub_const('Gitlab::Highlight::MAXIMUM_TEXT_HIGHLIGHT_SIZE', 1) result = described_class.highlight(file_name, content) - expect(result).to eq(%[(make-pathname :defaults name\n:type "assem"))]) + expect(result).to eq(%[(make-pathname :defaults name\n:type "assem")]) end it 'highlights multi-line comments' do