From f9228f6bf46f1d1caa4c62b80b8bd6ec883d33ae Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 4 Jul 2017 14:07:17 +0200 Subject: [PATCH] Add a test for stage status migration with retried jobs --- spec/migrations/migrate_stages_statuses_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/migrations/migrate_stages_statuses_spec.rb b/spec/migrations/migrate_stages_statuses_spec.rb index 95fa2977b31..81bc38fea10 100644 --- a/spec/migrations/migrate_stages_statuses_spec.rb +++ b/spec/migrations/migrate_stages_statuses_spec.rb @@ -24,6 +24,7 @@ describe MigrateStagesStatuses, :migration do create_job(project: 1, pipeline: 1, stage: 'build', status: 'failed') create_job(project: 2, pipeline: 2, stage: 'test', status: 'success') create_job(project: 2, pipeline: 2, stage: 'test', status: 'success') + create_job(project: 2, pipeline: 2, stage: 'test', status: 'failed', retried: true) stages.create!(id: 1, pipeline_id: 1, project_id: 1, name: 'test', status: nil) stages.create!(id: 2, pipeline_id: 1, project_id: 1, name: 'build', status: nil) @@ -40,10 +41,9 @@ describe MigrateStagesStatuses, :migration do .to eq [STATUSES[:running], STATUSES[:failed], STATUSES[:success]] end - def create_job(project:, pipeline:, stage:, status:) - stage_idx = STAGES[stage.to_sym] - + def create_job(project:, pipeline:, stage:, status:, **opts) jobs.create!(project_id: project, commit_id: pipeline, - stage_idx: stage_idx, stage: stage, status: status) + stage_idx: STAGES[stage.to_sym], stage: stage, + status: status, **opts) end end