summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-03-12 17:26:07 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-03-12 17:26:07 +0000
commit30e52b239ce9ac7ba83778e00f4b45d65e61a4a0 (patch)
treecbed6515753036085dbda6701c1e55aade6ca480
parent7d928d38bd6b4690b1c1bc3fbd979082ad827693 (diff)
parentf8bac850a2473e1249bc0224e7810f02b8145a0d (diff)
downloadgitlab-ce-30e52b239ce9ac7ba83778e00f4b45d65e61a4a0.tar.gz
Merge branch 'ce-9826-fix-broken-downstreams-backport-factory' into 'master'
Backports EE change for expanded pipelines See merge request gitlab-org/gitlab-ce!26043
-rw-r--r--spec/factories/ci/pipelines.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 8a44ce52849..ee5d27355f1 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -82,6 +82,12 @@ FactoryBot.define do
end
end
+ trait :with_job do
+ after(:build) do |pipeline, evaluator|
+ pipeline.builds << build(:ci_build, pipeline: pipeline, project: pipeline.project)
+ end
+ end
+
trait :auto_devops_source do
config_source { Ci::Pipeline.config_sources[:auto_devops_source] }
end