From f5d3b92155b76d2459014372e00d877b21408f49 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Mon, 27 Nov 2017 14:31:26 +0100
Subject: [PATCH] Remove Ci::Build#artifacts_file?

---
 app/models/concerns/artifact_migratable.rb          | 4 ----
 lib/gitlab/workhorse.rb                             | 2 +-
 spec/services/projects/update_pages_service_spec.rb | 8 ++++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/models/concerns/artifact_migratable.rb b/app/models/concerns/artifact_migratable.rb
index 5c647bacf1b..811a8252459 100644
--- a/app/models/concerns/artifact_migratable.rb
+++ b/app/models/concerns/artifact_migratable.rb
@@ -6,10 +6,6 @@ module ArtifactMigratable
     job_archive&.file || legacy_artifacts_file
   end
 
-  def artifacts_file?
-    job_archive&.file? || legacy_artifacts_file?
-  end
-
   def artifacts_metadata
     job_metadata&.file || legacy_artifacts_metadata
   end
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index c3e2742306d..5ab6cd5a4ef 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -58,7 +58,7 @@ module Gitlab
       end
 
       def artifact_upload_ok
-        { TempPath: LegacyArtifactUploader.artifacts_upload_path }
+        { TempPath: JobArtifactUploader.artifacts_upload_path }
       end
 
       def send_git_blob(repository, blob)
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index 8e0965b444b..b669a0102bd 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -39,7 +39,7 @@ describe Projects::UpdatePagesService do
             it "doesn't delete artifacts" do
               expect(execute).to eq(:success)
 
-              expect(build.reload.artifacts_file?).to eq(true)
+              expect(build.reload.artifacts?).to eq(true)
             end
           end
 
@@ -47,7 +47,7 @@ describe Projects::UpdatePagesService do
             it "does delete artifacts" do
               expect(execute).to eq(:success)
 
-              expect(build.reload.artifacts_file?).to eq(false)
+              expect(build.reload.artifacts?).to eq(false)
             end
           end
         end
@@ -110,7 +110,7 @@ describe Projects::UpdatePagesService do
           it "doesn't delete artifacts" do
             expect(execute).to eq(:success)
 
-            expect(build.artifacts_file?).to eq(true)
+            expect(build.artifacts?).to eq(true)
           end
         end
 
@@ -118,7 +118,7 @@ describe Projects::UpdatePagesService do
           it "does delete artifacts" do
             expect(execute).to eq(:success)
 
-            expect(build.reload.artifacts_file?).to eq(false)
+            expect(build.reload.artifacts?).to eq(false)
           end
         end
       end
-- 
GitLab