Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2017-09-21 11:34:12 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2017-12-03 14:04:48 +0300
commit61864a5a5bb523953589c9398a431c4369fbfc76 (patch)
tree5eac32ef8155e9066d7d1488d7856e83605aa6a5 /spec/factories/ci/builds.rb
parent25df666156279e5b392b429519b4f4ba01eefaac (diff)
Rename Artifact to JobArtifact, split metadata out
Two things at ones, as there was no clean way to seperate the commit and give me feedback from the tests. But the model Artifact is now JobArtifact, and the table does not have a type anymore, but the metadata is now its own model: Ci::JobArtifactMetadata.
Diffstat (limited to 'spec/factories/ci/builds.rb')
-rw-r--r--spec/factories/ci/builds.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 69d58f367ac..6cb612a58d2 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -155,14 +155,12 @@ FactoryGirl.define do
end
trait :artifacts do
- after(:create) do |build, _|
- create(:artifact, build: build)
- create(:artifact_metadata, build: build)
- end
+ job_archive factory: :ci_job_artifact
+ job_metadata factory: :ci_job_metadata
end
trait :expired do
- artifacts_expire_at = 1.minute.ago
+ artifacts_expire_at 1.minute.ago
end
trait :with_commit do