diff options
author | Matija Čupić <matteeyah@gmail.com> | 2019-07-31 17:36:57 +0200 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2019-08-04 19:42:29 +0200 |
commit | 16084ee9d3fdfc333a113e4cbcd3f6d2fc402628 (patch) | |
tree | d91c401dda30bc3a015161488aaf2fcb6808a661 /spec/factories/ci/bridge.rb | |
parent | bce8b66d516e906f6131d8a6dcae797def5288b6 (diff) | |
download | gitlab-ce-16084ee9d3fdfc333a113e4cbcd3f6d2fc402628.tar.gz |
Port changes from EEmc/feature/pipeline-tracking-config-ce
Ports changes from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12343
Diffstat (limited to 'spec/factories/ci/bridge.rb')
-rw-r--r-- | spec/factories/ci/bridge.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/factories/ci/bridge.rb b/spec/factories/ci/bridge.rb index 6491b9dca19..b1b714277e4 100644 --- a/spec/factories/ci/bridge.rb +++ b/spec/factories/ci/bridge.rb @@ -8,7 +8,7 @@ FactoryBot.define do ref 'master' tag false created_at 'Di 29. Okt 09:50:00 CET 2013' - status :success + status :created pipeline factory: :ci_pipeline @@ -17,6 +17,7 @@ FactoryBot.define do end transient { downstream nil } + transient { upstream nil } after(:build) do |bridge, evaluator| bridge.project ||= bridge.pipeline.project @@ -26,6 +27,12 @@ FactoryBot.define do trigger: { project: evaluator.downstream.full_path } ) end + + if evaluator.upstream.present? + bridge.options = bridge.options.to_h.merge( + bridge_needs: { pipeline: evaluator.upstream.full_path } + ) + end end end end |