1 files changed, 64 insertions, 5 deletions

diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb
index a74615e07f9..f81a9b6492c 100644
--- a/spec/helpers/diff_helper_spec.rb
+++ b/spec/helpers/diff_helper_spec.rb
@@ -3,28 +3,41 @@ require 'spec_helper'
 describe DiffHelper do
   include RepoHelpers
 
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
   let(:commit) { project.commit(sample_commit.id) }
   let(:diffs) { commit.raw_diffs }
   let(:diff) { diffs.first }
-  let(:diff_refs) { [commit.parent, commit] }
+  let(:diff_refs) { commit.diff_refs }
   let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs: diff_refs, repository: repository) }
 
   describe 'diff_view' do
+    it 'uses the view param over the cookie' do
+      controller.params[:view] = 'parallel'
+      helper.request.cookies[:diff_view] = 'inline'
+
+      expect(helper.diff_view).to eq :parallel
+    end
+
+    it 'returns the default value when the view param is invalid' do
+      controller.params[:view] = 'invalid'
+
+      expect(helper.diff_view).to eq :inline
+    end
+
     it 'returns a valid value when cookie is set' do
       helper.request.cookies[:diff_view] = 'parallel'
 
       expect(helper.diff_view).to eq :parallel
     end
 
-    it 'returns a default value when cookie is invalid' do
+    it 'returns the default value when cookie is invalid' do
       helper.request.cookies[:diff_view] = 'invalid'
 
       expect(helper.diff_view).to eq :inline
     end
 
-    it 'returns a default value when cookie is nil' do
+    it 'returns the default value when cookie is nil' do
       expect(helper.request.cookies).to be_empty
 
       expect(helper.diff_view).to eq :inline
@@ -148,12 +161,21 @@ describe DiffHelper do
 
     it 'puts comments on added lines' do
       left = Gitlab::Diff::Line.new('\\nonewline', 'old-nonewline', 3, 3, 3)
-      right = Gitlab::Diff::Line.new('new line', 'add', 3, 3, 3)
+      right = Gitlab::Diff::Line.new('new line', 'new', 3, 3, 3)
 
       result = helper.parallel_diff_discussions(left, right, diff_file)
 
       expect(result).to eq([nil, 'comment'])
     end
+
+    it 'puts comments on unchanged lines' do
+      left = Gitlab::Diff::Line.new('unchanged line', nil, 3, 3, 3)
+      right = Gitlab::Diff::Line.new('unchanged line', nil, 3, 3, 3)
+
+      result = helper.parallel_diff_discussions(left, right, diff_file)
+
+      expect(result).to eq(['comment', nil])
+    end
   end
 
   describe "#diff_match_line" do
@@ -207,4 +229,41 @@ describe DiffHelper do
       expect(output).not_to have_css 'td:nth-child(3)'
     end
   end
+
+  context 'viewer related' do
+    let(:viewer) { diff_file.simple_viewer }
+
+    before do
+      assign(:project, project)
+    end
+
+    describe '#diff_render_error_reason' do
+      context 'for error :too_large' do
+        before do
+          expect(viewer).to receive(:render_error).and_return(:too_large)
+        end
+
+        it 'returns an error message' do
+          expect(helper.diff_render_error_reason(viewer)).to eq('it is too large')
+        end
+      end
+
+      context 'for error :server_side_but_stored_externally' do
+        before do
+          expect(viewer).to receive(:render_error).and_return(:server_side_but_stored_externally)
+          expect(diff_file).to receive(:external_storage).and_return(:lfs)
+        end
+
+        it 'returns an error message' do
+          expect(helper.diff_render_error_reason(viewer)).to eq('it is stored in LFS')
+        end
+      end
+    end
+
+    describe '#diff_render_error_options' do
+      it 'includes a "view the blob" link' do
+        expect(helper.diff_render_error_options(viewer)).to include(/view the blob/)
+      end
+    end
+  end
 end