diff options
Diffstat (limited to 'spec/factories/ci')
-rw-r--r-- | spec/factories/ci/build_runner_sessions.rb | 8 | ||||
-rw-r--r-- | spec/factories/ci/builds.rb | 8 | ||||
-rw-r--r-- | spec/factories/ci/pipelines.rb | 4 | ||||
-rw-r--r-- | spec/factories/ci/resource.rb | 1 | ||||
-rw-r--r-- | spec/factories/ci/sources/pipelines.rb | 4 | ||||
-rw-r--r-- | spec/factories/ci/unit_test_failures.rb (renamed from spec/factories/ci/unit_test_failure.rb) | 0 | ||||
-rw-r--r-- | spec/factories/ci/unit_tests.rb (renamed from spec/factories/ci/unit_test.rb) | 0 |
7 files changed, 20 insertions, 5 deletions
diff --git a/spec/factories/ci/build_runner_sessions.rb b/spec/factories/ci/build_runner_sessions.rb new file mode 100644 index 00000000000..f78eaa6a5f1 --- /dev/null +++ b/spec/factories/ci/build_runner_sessions.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :ci_build_runner_session, class: 'Ci::BuildRunnerSession' do + build factory: :ci_build + url { 'https://gitlab.example.com' } + end +end diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index b88d6b5fda4..15a88955e05 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -7,6 +7,7 @@ FactoryBot.define do created_at { 'Di 29. Okt 09:50:00 CET 2013' } scheduling_type { 'stage' } pending + partition_id { pipeline.partition_id } options do { @@ -24,6 +25,8 @@ FactoryBot.define do project { pipeline.project } + ref { pipeline.ref } + trait :with_token do transient do generate_token { true } @@ -545,9 +548,12 @@ FactoryBot.define do options do { image: { name: 'image:1.0', entrypoint: '/bin/sh' }, - services: ['postgres', { name: 'docker:stable-dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }, { name: 'mysql:latest', variables: { MYSQL_ROOT_PASSWORD: 'root123.' } }], + services: ['postgres', + { name: 'docker:stable-dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }, + { name: 'mysql:latest', variables: { MYSQL_ROOT_PASSWORD: 'root123.' } }], script: %w(echo), after_script: %w(ls date), + hooks: { pre_get_sources_script: ["echo 'hello pre_get_sources_script'"] }, artifacts: { name: 'artifacts_file', untracked: false, diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb index 891628a0fc2..eef5c593e0f 100644 --- a/spec/factories/ci/pipelines.rb +++ b/spec/factories/ci/pipelines.rb @@ -8,7 +8,7 @@ FactoryBot.define do sha { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' } status { 'pending' } add_attribute(:protected) { false } - partition_id { 100 } + partition_id { Ci::Pipeline.current_partition_value } project @@ -54,7 +54,6 @@ FactoryBot.define do end factory :ci_pipeline do - partition_id { 100 } transient { ci_ref_presence { true } } before(:create) do |pipeline, evaluator| @@ -84,6 +83,7 @@ FactoryBot.define do end trait :running do + started_at { Time.current } status { :running } end diff --git a/spec/factories/ci/resource.rb b/spec/factories/ci/resource.rb index dec26013a25..946cf9c17a7 100644 --- a/spec/factories/ci/resource.rb +++ b/spec/factories/ci/resource.rb @@ -6,6 +6,7 @@ FactoryBot.define do trait(:retained) do processable factory: :ci_build + partition_id { processable.partition_id } end end end diff --git a/spec/factories/ci/sources/pipelines.rb b/spec/factories/ci/sources/pipelines.rb index 93d35097eac..bfe487eb6bb 100644 --- a/spec/factories/ci/sources/pipelines.rb +++ b/spec/factories/ci/sources/pipelines.rb @@ -4,8 +4,8 @@ FactoryBot.define do factory :ci_sources_pipeline, class: 'Ci::Sources::Pipeline' do after(:build) do |source| source.project ||= source.pipeline.project - source.source_pipeline ||= source.source_job.pipeline - source.source_project ||= source.source_pipeline.project + source.source_pipeline ||= source.source_job&.pipeline + source.source_project ||= source.source_pipeline&.project end source_job factory: :ci_build diff --git a/spec/factories/ci/unit_test_failure.rb b/spec/factories/ci/unit_test_failures.rb index 07cd3419754..07cd3419754 100644 --- a/spec/factories/ci/unit_test_failure.rb +++ b/spec/factories/ci/unit_test_failures.rb diff --git a/spec/factories/ci/unit_test.rb b/spec/factories/ci/unit_tests.rb index 480724f260a..480724f260a 100644 --- a/spec/factories/ci/unit_test.rb +++ b/spec/factories/ci/unit_tests.rb |