diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-12 17:26:07 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-23 10:10:28 +0000 |
| commit | c929dd570c2b32104d5f85686106fe199bbd0b07 (patch) | |
| tree | cb42d0d07a563cd59358df233cb2563cfcf954ca | |
| parent | ed61ca9b4e256bbe17d71fb49531b0556f03f007 (diff) | |
| download | gitlab-ce-c929dd570c2b32104d5f85686106fe199bbd0b07.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
(cherry picked from commit 30e52b239ce9ac7ba83778e00f4b45d65e61a4a0)
f8bac850 Backports EE change for expanded pipelines
| -rw-r--r-- | spec/factories/ci/pipelines.rb | 6 |
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 |