2015-12-30 20:18:40 -05:00
require 'spec_helper'
2017-07-10 10:24:02 -04:00
describe Gitlab :: Diff :: Highlight do
2015-12-30 20:18:40 -05:00
include RepoHelpers
2017-01-24 18:42:12 -05:00
let ( :project ) { create ( :project , :repository ) }
2015-12-30 20:18:40 -05:00
let ( :commit ) { project . commit ( sample_commit . id ) }
2016-07-27 13:00:34 -04:00
let ( :diff ) { commit . raw_diffs . first }
2016-06-20 12:51:48 -04:00
let ( :diff_file ) { Gitlab :: Diff :: File . new ( diff , diff_refs : commit . diff_refs , repository : project . repository ) }
2015-12-30 20:18:40 -05:00
2016-01-19 08:52:41 -05:00
describe '#highlight' do
2016-01-29 13:37:17 -05:00
context " with a diff file " do
2017-07-25 13:09:00 -04:00
let ( :subject ) { described_class . new ( diff_file , repository : project . repository ) . highlight }
2015-12-30 20:18:40 -05:00
2016-08-11 11:30:18 -04:00
it 'returns Gitlab::Diff::Line elements' do
2016-01-29 13:37:17 -05:00
expect ( subject . first ) . to be_an_instance_of ( Gitlab :: Diff :: Line )
end
2016-01-12 17:49:11 -05:00
2016-08-11 11:30:18 -04:00
it 'does not modify "match" lines' do
2016-01-29 13:37:17 -05:00
expect ( subject [ 0 ] . text ) . to eq ( '@@ -6,12 +6,18 @@ module Popen' )
expect ( subject [ 22 ] . text ) . to eq ( '@@ -19,6 +25,7 @@ module Popen' )
end
2016-01-12 17:49:11 -05:00
2016-01-29 13:37:17 -05:00
it 'highlights and marks unchanged lines' do
2017-03-13 18:39:22 -04:00
code = %Q{ <span id="LC7" class="line" lang="ruby"> <span class="k">def</span> <span class="nf">popen</span><span class="p">(</span><span class="n">cmd</span><span class="p">,</span> <span class="n">path</span><span class="o">=</span><span class="kp">nil</span><span class="p">)</span></span> \n }
2016-01-12 17:49:11 -05:00
2018-08-11 16:33:15 -04:00
expect ( subject [ 2 ] . rich_text ) . to eq ( code )
2016-01-29 13:37:17 -05:00
end
2016-01-12 17:49:11 -05:00
2016-01-29 13:37:17 -05:00
it 'highlights and marks removed lines' do
2017-03-13 18:39:22 -04:00
code = %Q{ -<span id="LC9" class="line" lang="ruby"> <span class="k">raise</span> <span class="s2">"System commands must be given as an array of strings"</span></span> \n }
2016-01-12 17:49:11 -05:00
2018-08-11 16:33:15 -04:00
expect ( subject [ 4 ] . rich_text ) . to eq ( code )
2016-01-29 13:37:17 -05:00
end
2015-12-30 21:44:12 -05:00
2016-01-29 13:37:17 -05:00
it 'highlights and marks added lines' do
2017-05-09 22:46:02 -04:00
code = %Q{ +<span id="LC9" class="line" lang="ruby"> <span class="k">raise</span> <span class="no"><span class="idiff left">RuntimeError</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff right"> </span><span class="s2">"System commands must be given as an array of strings"</span></span> \n }
2015-12-31 01:05:52 -05:00
2018-08-11 16:33:15 -04:00
expect ( subject [ 5 ] . rich_text ) . to eq ( code )
2016-01-29 13:37:17 -05:00
end
2016-01-08 18:40:05 -05:00
end
2016-01-29 13:37:17 -05:00
2016-01-30 06:53:12 -05:00
context " with diff lines " do
2017-07-25 13:09:00 -04:00
let ( :subject ) { described_class . new ( diff_file . diff_lines , repository : project . repository ) . highlight }
2016-01-29 13:37:17 -05:00
2016-08-11 11:30:18 -04:00
it 'returns Gitlab::Diff::Line elements' do
2016-01-30 06:53:12 -05:00
expect ( subject . first ) . to be_an_instance_of ( Gitlab :: Diff :: Line )
end
2016-01-29 13:37:17 -05:00
2016-08-11 11:30:18 -04:00
it 'does not modify "match" lines' do
2016-01-30 06:53:12 -05:00
expect ( subject [ 0 ] . text ) . to eq ( '@@ -6,12 +6,18 @@ module Popen' )
expect ( subject [ 22 ] . text ) . to eq ( '@@ -19,6 +25,7 @@ module Popen' )
end
2016-01-29 13:37:17 -05:00
2016-01-30 06:53:12 -05:00
it 'marks unchanged lines' do
2017-02-22 17:39:43 -05:00
code = %q{ def popen(cmd, path=nil) }
2016-01-29 13:37:17 -05:00
2016-01-30 06:53:12 -05:00
expect ( subject [ 2 ] . text ) . to eq ( code )
expect ( subject [ 2 ] . text ) . not_to be_html_safe
end
2016-01-29 13:37:17 -05:00
2016-01-30 06:53:12 -05:00
it 'marks removed lines' do
2017-02-22 17:39:43 -05:00
code = %q{ - raise "System commands must be given as an array of strings" }
2016-01-29 13:37:17 -05:00
2016-01-30 06:53:12 -05:00
expect ( subject [ 4 ] . text ) . to eq ( code )
expect ( subject [ 4 ] . text ) . not_to be_html_safe
end
2016-01-29 13:37:17 -05:00
2016-01-30 06:53:12 -05:00
it 'marks added lines' do
2017-05-09 22:46:02 -04:00
code = %q{ + raise <span class="idiff left right">RuntimeError, </span>"System commands must be given as an array of strings" }
2016-01-29 13:37:17 -05:00
2018-08-11 16:33:15 -04:00
expect ( subject [ 5 ] . rich_text ) . to eq ( code )
expect ( subject [ 5 ] . rich_text ) . to be_html_safe
2016-01-29 13:37:17 -05:00
end
2018-02-21 08:42:11 -05:00
context 'when the inline diff marker has an invalid range' do
before do
allow_any_instance_of ( Gitlab :: Diff :: InlineDiffMarker ) . to receive ( :mark ) . and_raise ( RangeError )
end
it 'keeps the original rich line' do
2018-04-13 12:32:54 -04:00
allow ( Gitlab :: Sentry ) . to receive ( :track_exception )
2018-02-21 08:42:11 -05:00
code = %q{ + raise RuntimeError, "System commands must be given as an array of strings" }
expect ( subject [ 5 ] . text ) . to eq ( code )
expect ( subject [ 5 ] . text ) . not_to be_html_safe
end
it 'reports to Sentry if configured' do
2018-04-13 12:32:54 -04:00
expect ( Gitlab :: Sentry ) . to receive ( :track_exception ) . and_call_original
2018-02-21 08:42:11 -05:00
2018-04-13 12:32:54 -04:00
expect { subject } . to raise_exception ( RangeError )
2018-02-21 08:42:11 -05:00
end
end
2016-01-30 06:53:12 -05:00
end
2015-12-30 20:18:40 -05:00
end
end