Address feedback

3 files changed, 34 insertions, 28 deletions

diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index aea9f66eec3..cc11cb7a55f 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -149,7 +149,7 @@ feature 'File blob', :js, feature: true do
         wait_for_ajax
       end
 
-      it 'displays the blob' do
+      it 'displays an error' do
         aggregate_failures do
           # hides the simple viewer
           expect(page).to have_selector('.blob-viewer[data-type="simple"]', visible: false)
@@ -173,7 +173,7 @@ feature 'File blob', :js, feature: true do
           wait_for_ajax
         end
 
-        it 'displays the blob' do
+        it 'displays an error' do
           aggregate_failures do
             # hides the rich viewer
             expect(page).to have_selector('.blob-viewer[data-type="simple"]')
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index 8a89cd71e98..379f62f73e1 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -108,7 +108,11 @@ describe BlobHelper do
   context 'viewer related' do
     include FakeBlobHelpers
 
-    let(:project) { build(:empty_project) }
+    let(:project) { build(:empty_project, lfs_enabled: true) }
+
+    before do
+      allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
+    end
 
     let(:viewer_class) do
       Class.new(BlobViewer::Base) do
@@ -122,24 +126,13 @@ describe BlobHelper do
     let(:viewer) { viewer_class.new(blob) }
     let(:blob) { fake_blob }
 
-    before do
-      assign(:project, project)
-      assign(:id, File.join('master', blob.path))
-
-      controller.params[:controller] = 'projects/blob'
-      controller.params[:action] = 'show'
-      controller.params[:namespace_id] = project.namespace.to_param
-      controller.params[:project_id] = project.to_param
-      controller.params[:id] = File.join('master', blob.path)
-    end
-
     describe '#blob_render_error_reason' do
       context 'for error :too_large' do
         context 'when the blob size is larger than the absolute max size' do
           let(:blob) { fake_blob(size: 10.megabytes) }
 
           it 'returns an error message' do
-            expect(helper.blob_render_error_reason(viewer, :too_large)).to eq('it is larger than 5 MB')
+            expect(helper.blob_render_error_reason(viewer)).to eq('it is larger than 5 MB')
           end
         end
 
@@ -147,25 +140,38 @@ describe BlobHelper do
           let(:blob) { fake_blob(size: 2.megabytes) }
 
           it 'returns an error message' do
-            expect(helper.blob_render_error_reason(viewer, :too_large)).to eq('it is larger than 1 MB')
+            expect(helper.blob_render_error_reason(viewer)).to eq('it is larger than 1 MB')
           end
         end
       end
 
       context 'for error :server_side_but_stored_in_lfs' do
+        let(:blob) { fake_blob(lfs: true) }
+
         it 'returns an error message' do
-          expect(helper.blob_render_error_reason(viewer, :server_side_but_stored_in_lfs)).to eq('it is stored in LFS')
+          expect(helper.blob_render_error_reason(viewer)).to eq('it is stored in LFS')
         end
       end
     end
 
     describe '#blob_render_error_options' do
+      before do
+        assign(:project, project)
+        assign(:id, File.join('master', blob.path))
+
+        controller.params[:controller] = 'projects/blob'
+        controller.params[:action] = 'show'
+        controller.params[:namespace_id] = project.namespace.to_param
+        controller.params[:project_id] = project.to_param
+        controller.params[:id] = File.join('master', blob.path)
+      end
+
       context 'for error :too_large' do
         context 'when the max size can be overridden' do
           let(:blob) { fake_blob(size: 2.megabytes) }
 
           it 'includes a "load it anyway" link' do
-            expect(helper.blob_render_error_options(viewer, :too_large)).to include(/load it anyway/)
+            expect(helper.blob_render_error_options(viewer)).to include(/load it anyway/)
           end
         end
 
@@ -173,25 +179,25 @@ describe BlobHelper do
           let(:blob) { fake_blob(size: 10.megabytes) }
 
           it 'does not include a "load it anyway" link' do
-            expect(helper.blob_render_error_options(viewer, :too_large)).not_to include(/load it anyway/)
+            expect(helper.blob_render_error_options(viewer)).not_to include(/load it anyway/)
           end
         end
       end
 
       context 'when the viewer is rich' do
         context 'the blob is rendered as text' do
-          let(:blob) { fake_blob(path: 'file.md') }
+          let(:blob) { fake_blob(path: 'file.md', lfs: true) }
 
           it 'includes a "view the source" link' do
-            expect(helper.blob_render_error_options(viewer, :server_side_but_stored_in_lfs)).to include(/view the source/)
+            expect(helper.blob_render_error_options(viewer)).to include(/view the source/)
           end
         end
 
         context 'the blob is not rendered as text' do
-          let(:blob) { fake_blob(path: 'file.pdf', binary: true) }
+          let(:blob) { fake_blob(path: 'file.pdf', binary: true, lfs: true) }
 
           it 'does not include a "view the source" link' do
-            expect(helper.blob_render_error_options(viewer, :server_side_but_stored_in_lfs)).not_to include(/view the source/)
+            expect(helper.blob_render_error_options(viewer)).not_to include(/view the source/)
           end
         end
       end
@@ -201,15 +207,15 @@ describe BlobHelper do
           viewer_class.type = :simple
         end
 
-        let(:blob) { fake_blob(path: 'file.md') }
+        let(:blob) { fake_blob(path: 'file.md', lfs: true) }
 
         it 'does not include a "view the source" link' do
-          expect(helper.blob_render_error_options(viewer, :server_side_but_stored_in_lfs)).not_to include(/view the source/)
+          expect(helper.blob_render_error_options(viewer)).not_to include(/view the source/)
         end
       end
 
       it 'includes a "download it" link' do
-        expect(helper.blob_render_error_options(viewer, :server_side_but_stored_in_lfs)).to include(/download it/)
+        expect(helper.blob_render_error_options(viewer)).to include(/download it/)
       end
     end
   end
diff --git a/spec/models/blob_spec.rb b/spec/models/blob_spec.rb
index 80dcfeeb3b5..7e8a1c8add7 100644
--- a/spec/models/blob_spec.rb
+++ b/spec/models/blob_spec.rb
@@ -39,7 +39,7 @@ describe Blob do
     context 'if the blob is a valid LFS pointer' do
       context 'if the extension has a rich viewer' do
         context 'if the viewer is binary' do
-          it 'return true' do
+          it 'returns true' do
             blob = fake_blob(path: 'file.pdf', lfs: true)
 
             expect(blob.raw_binary?).to be_truthy
@@ -66,7 +66,7 @@ describe Blob do
 
     context 'if the blob is not an LFS pointer' do
       context 'if the blob is binary' do
-        it 'return true' do
+        it 'returns true' do
           blob = fake_blob(path: 'file.pdf', binary: true)
 
           expect(blob.raw_binary?).to be_truthy