Fix most test failures

1 files changed, 4 insertions, 8 deletions

diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb
index cc6e1927f9e..7185e24287f 100644
--- a/app/uploaders/job_artifact_uploader.rb
+++ b/app/uploaders/job_artifact_uploader.rb
@@ -4,7 +4,7 @@ class JobArtifactUploader < ArtifactUploader
   end
 
   def size
-    return super unless @artifact.size
+    return super if @artifact.size.nil?
 
     @artifact.size
   end
@@ -12,17 +12,13 @@ class JobArtifactUploader < ArtifactUploader
   private
 
   def disk_hash
-    @disk_hash ||= Digest::SHA2.hexdigest(job.project_id.to_s)
+    @disk_hash ||= Digest::SHA2.hexdigest(@artifact.project_id.to_s)
   end
 
   def default_path
-    creation_date = job.created_at.utc.strftime('%Y_%m_%d')
+    creation_date = @artifact.created_at.utc.strftime('%Y_%m_%d')
 
     File.join(disk_hash[0..1], disk_hash[2..3], disk_hash,
-              creation_date, job.id.to_s, @artifact.id.to_s)
-  end
-
-  def job
-    @artifact.job
+              creation_date, @artifact.ci_job_id.to_s, @artifact.id.to_s)
   end
 end