Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_51323issue_51323

1 files changed, 4 insertions, 54 deletions

diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index 1c216b3fe97..f709f152c92 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -3,63 +3,13 @@ require 'spec_helper'
 describe BlobHelper do
   include TreeHelper
 
-  let(:blob_name) { 'test.lisp' }
-  let(:no_context_content) { ":type \"assem\"))" }
-  let(:blob_content) { "(make-pathname :defaults name\n#{no_context_content}" }
-  let(:split_content) { blob_content.split("\n") }
-  let(:multiline_content) do
-    %q(
-    def test(input):
-      """This is line 1 of a multi-line comment.
-      This is line 2.
-      """
-    )
-  end
-
   describe '#highlight' do
-    it 'returns plaintext for unknown lexer context' do
-      result = helper.highlight(blob_name, no_context_content)
-      expect(result).to eq(%[<pre class="code highlight"><code><span id="LC1" class="line" lang="">:type "assem"))</span></code></pre>])
+    it 'wraps highlighted content' do
+      expect(helper.highlight('test.rb', '52')).to eq(%q[<pre class="code highlight"><code><span id="LC1" class="line" lang="ruby"><span class="mi">52</span></span></code></pre>])
     end
 
-    it 'returns plaintext for long blobs' do
-      stub_const('Blob::MAXIMUM_TEXT_HIGHLIGHT_SIZE', 1)
-      result = helper.highlight(blob_name, blob_content)
-
-      expect(result).to eq(%[<pre class="code highlight"><code><span id="LC1" class="line" lang="">(make-pathname :defaults name</span>\n<span id="LC2" class="line" lang="">:type "assem"))</span></code></pre>])
-    end
-
-    it 'highlights single block' do
-      expected = %Q[<pre class="code highlight"><code><span id="LC1" class="line" lang="common_lisp"><span class="p">(</span><span class="nb">make-pathname</span> <span class="ss">:defaults</span> <span class="nv">name</span></span>
-<span id="LC2" class="line" lang="common_lisp"><span class="ss">:type</span> <span class="s">"assem"</span><span class="p">))</span></span></code></pre>]
-
-      expect(helper.highlight(blob_name, blob_content)).to eq(expected)
-    end
-
-    it 'highlights multi-line comments' do
-      result = helper.highlight(blob_name, multiline_content)
-      html = Nokogiri::HTML(result)
-      lines = html.search('.s')
-      expect(lines.count).to eq(3)
-      expect(lines[0].text).to eq('"""This is line 1 of a multi-line comment.')
-      expect(lines[1].text).to eq('      This is line 2.')
-      expect(lines[2].text).to eq('      """')
-    end
-
-    context 'diff highlighting' do
-      let(:blob_name) { 'test.diff' }
-      let(:blob_content) { "+aaa\n+bbb\n- ccc\n ddd\n"}
-      let(:expected) do
-        %q(<pre class="code highlight"><code><span id="LC1" class="line" lang="diff"><span class="gi">+aaa</span></span>
-<span id="LC2" class="line" lang="diff"><span class="gi">+bbb</span></span>
-<span id="LC3" class="line" lang="diff"><span class="gd">- ccc</span></span>
-<span id="LC4" class="line" lang="diff"> ddd</span></code></pre>)
-      end
-
-      it 'highlights each line properly' do
-        result = helper.highlight(blob_name, blob_content)
-        expect(result).to eq(expected)
-      end
+    it 'handles plain version' do
+      expect(helper.highlight('test.rb', '52', plain: true)).to eq(%q[<pre class="code highlight"><code><span id="LC1" class="line" lang="">52</span></code></pre>])
     end
   end