Fix creation of job_artifact_uploader

2 files changed, 8 insertions, 4 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 6cb612a58d2..ee449bfe5db 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -155,8 +155,10 @@ FactoryGirl.define do
     end
 
     trait :artifacts do
-      job_archive factory: :ci_job_artifact
-      job_metadata factory: :ci_job_metadata
+      after(:create) do |build|
+        create(:ci_job_artifact, job: build)
+        create(:ci_job_metadata, job: build)
+      end
     end
 
     trait :expired do
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 8a7e04c747f..0abebd14286 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -2,15 +2,17 @@ include ActionDispatch::TestProcess
 
 FactoryGirl.define do
   factory :ci_job_artifact, class: Ci::JobArtifact do
-    project
     job factory: :ci_build
     file_type :archive
 
+    after :build do |artifact|
+      artifact.project ||= artifact.job.project
+    end
+
     after :create do |artifact|
       if artifact.archive?
         artifact.file = fixture_file_upload(Rails.root.join('spec/fixtures/ci_build_artifacts.zip'),
                                             'application/zip')
-
         artifact.save
       end
     end