Fix broken specs. #3945

app/views/projects/diffs/_parallel_view.html.haml

@@ -20,7 +20,7 @@
             = link_to raw(line_number_left), "##{line_code_left}", id: line_code_left
             - if @comments_allowed && can?(current_user, :create_note, @project)
               = link_to_new_diff_note(line_code_left, 'old')
-            %td.line_content{class: "parallel noteable_line #{type_left} #{line_code_left}", "line_code" => line_code_left }= line_content_left.html_safe
+            %td.line_content{class: "parallel noteable_line #{type_left} #{line_code_left}", "line_code" => line_code_left }= raw(line_content_left)
           - if type_right == 'new'
             - new_line_class = 'new'
@@ -33,7 +33,7 @@
             = link_to raw(line_number_right), "##{new_line_code}", id: new_line_code
             - if @comments_allowed && can?(current_user, :create_note, @project)
               = link_to_new_diff_note(line_code_right, 'new')
-            %td.line_content.parallel{class: "noteable_line #{new_line_class} #{new_line_code}", "line_code" => new_line_code}= line_content_right.html_safe
+            %td.line_content.parallel{class: "noteable_line #{new_line_class} #{new_line_code}", "line_code" => new_line_code}= raw(line_content_right)
       - if @reply_allowed
         - comments_left, comments_right = organize_comments(type_left, type_right, line_code_left, line_code_right)

lib/gitlab/diff/highlight.rb

@@ -27,11 +27,11 @@ module Gitlab
       def self.formatter
         @formatter ||= Rouge::Formatters::HTMLGitlab.new(
-                         nowrap: true,
-                         cssclass: 'code highlight',
-                         lineanchors: true,
-                         lineanchorsid: 'LC'
-                       )
+          nowrap: true,
+          cssclass: 'code highlight',
+          lineanchors: true,
+          lineanchorsid: 'LC'
+        )
       end
       def initialize(diff_file)

spec/helpers/diff_helper_spec.rb

@@ -7,7 +7,8 @@ describe DiffHelper do
   let(:commit) { project.commit(sample_commit.id) }
   let(:diffs) { commit.diffs }
   let(:diff) { diffs.first }
-  let(:diff_file) { Gitlab::Diff::File.new(diff) }
+  let(:diff_refs) { [commit.parent.id, commit.id] }
+  let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs, project.repository) }
   describe 'diff_hard_limit_enabled?' do
     it 'should return true if param is provided' do

spec/lib/gitlab/diff/file_spec.rb

@@ -6,7 +6,7 @@ describe Gitlab::Diff::File, lib: true do
   let(:project) { create(:project) }
   let(:commit) { project.commit(sample_commit.id) }
   let(:diff) { commit.diffs.first }
-  let(:diff_file) { Gitlab::Diff::File.new(diff) }
+  let(:diff_file) { Gitlab::Diff::File.new(diff, [commit.parent.id, commit.id], project.repository) }
   describe :diff_lines do
     let(:diff_lines) { diff_file.diff_lines }