Add missing specs

5 files changed, 10 insertions, 10 deletions

diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb
index b400670746f..ea036b1f705 100644
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -10,7 +10,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
   before_action :set_path_and_entry, only: [:file, :raw]
 
   def download
-    if artifacts_file.local_file?
+    if artifacts_file.file_storage?
       send_file artifacts_file.path, disposition: 'attachment'
     else
       redirect_to artifacts_file.url
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 7493bf38bba..eef53730291 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -80,7 +80,7 @@ class UploadsController < ApplicationController
     else
       @uploader = @model.send(upload_mount)
 
-      redirect_to @uploader.url unless @uploader.local_storage?
+      redirect_to @uploader.url unless @uploader.file_storage?
     end
 
     @uploader
diff --git a/app/uploaders/artifact_uploader.rb b/app/uploaders/artifact_uploader.rb
index 668b6b8e048..3bc0408f557 100644
--- a/app/uploaders/artifact_uploader.rb
+++ b/app/uploaders/artifact_uploader.rb
@@ -7,6 +7,10 @@ class ArtifactUploader < GitlabUploader
     Gitlab.config.artifacts.path
   end
 
+  def self.artifacts_upload_path
+    File.join(self.local_artifacts_store, 'tmp/uploads/')
+  end
+
   def initialize(job, field)
     @job, @field = job, field
   end
diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb
index c1d9007dc71..02afddb8c6a 100644
--- a/app/uploaders/gitlab_uploader.rb
+++ b/app/uploaders/gitlab_uploader.rb
@@ -9,15 +9,11 @@ class GitlabUploader < CarrierWave::Uploader::Base
 
   delegate :base_dir, to: :class
 
-  def local_file?
-    local_storage? && file&.is_a?(CarrierWave::SanitizedFile)
-  end
-
-  def local_storage?
+  def file_storage?
     storage.is_a?(CarrierWave::Storage::File)
   end
 
-  def local_cache_storage?
+  def file_cache_storage?
     cache_storage.is_a?(CarrierWave::Storage::File)
   end
 
diff --git a/app/uploaders/records_uploads.rb b/app/uploaders/records_uploads.rb
index be3a2caa60c..4c127f29250 100644
--- a/app/uploaders/records_uploads.rb
+++ b/app/uploaders/records_uploads.rb
@@ -16,7 +16,7 @@ module RecordsUploads
   #
   # Called `after :store`
   def record_upload(_tempfile)
-    return unless local_file?
+    return unless file_storage?
     return unless file.exists?
 
     Upload.record(self)
@@ -26,7 +26,7 @@ module RecordsUploads
   #
   # Called `before :remove`
   def destroy_upload(*args)
-    return unless local_file?
+    return unless file_storage?
     return unless file
 
     Upload.remove_path(relative_path)