diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 06:09:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 06:09:14 +0000 |
commit | 42f41de46525ce0065f02ee07c1a79f5669526a0 (patch) | |
tree | 6e8151aae2628d2c2ce8942be1ba547afe0264b2 /spec/factories | |
parent | 1eeef229aae5affdce415c2364858e8efc64f4b5 (diff) | |
download | gitlab-ce-42f41de46525ce0065f02ee07c1a79f5669526a0.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/ci/builds.rb | 6 | ||||
-rw-r--r-- | spec/factories/ci/job_artifacts.rb | 10 | ||||
-rw-r--r-- | spec/factories/ci/pipelines.rb | 8 |
3 files changed, 24 insertions, 0 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index 5bb7853a154..ccaf0dd997b 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -311,6 +311,12 @@ FactoryBot.define do end end + trait :test_reports_with_attachment do + after(:build) do |build| + build.job_artifacts << create(:ci_job_artifact, :junit_with_attachment, job: build) + end + end + trait :coverage_reports do after(:build) do |build| build.job_artifacts << create(:ci_job_artifact, :cobertura, job: build) diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb index 8fbf242a607..82383cfa2b0 100644 --- a/spec/factories/ci/job_artifacts.rb +++ b/spec/factories/ci/job_artifacts.rb @@ -99,6 +99,16 @@ FactoryBot.define do end end + trait :junit_with_attachment do + file_type { :junit } + file_format { :gzip } + + after(:build) do |artifact, evaluator| + artifact.file = fixture_file_upload( + Rails.root.join('spec/fixtures/junit/junit_with_attachment.xml.gz'), 'application/x-gzip') + end + end + trait :junit_with_ant do file_type { :junit } file_format { :gzip } diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb index f2c342f76d0..e0478097148 100644 --- a/spec/factories/ci/pipelines.rb +++ b/spec/factories/ci/pipelines.rb @@ -67,6 +67,14 @@ FactoryBot.define do end end + trait :with_test_reports_attachment do + status { :success } + + after(:build) do |pipeline, evaluator| + pipeline.builds << build(:ci_build, :test_reports_with_attachment, pipeline: pipeline, project: pipeline.project) + end + end + trait :with_coverage_reports do status { :success } |