Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/spec/migrations/schedule_copy_ci_builds_columns_to_security_scans_spec.rb b/spec/migrations/schedule_copy_ci_builds_columns_to_security_scans2_spec.rb
index 5ebd8753892..012c7d065fc 100644
--- a/spec/migrations/schedule_copy_ci_builds_columns_to_security_scans_spec.rb
+++ b/spec/migrations/schedule_copy_ci_builds_columns_to_security_scans2_spec.rb
@@ -3,12 +3,13 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe ScheduleCopyCiBuildsColumnsToSecurityScans do
+RSpec.describe ScheduleCopyCiBuildsColumnsToSecurityScans2 do
   let_it_be(:namespaces) { table(:namespaces) }
   let_it_be(:projects) { table(:projects) }
   let_it_be(:ci_pipelines) { table(:ci_pipelines) }
   let_it_be(:ci_builds) { table(:ci_builds) }
   let_it_be(:security_scans) { table(:security_scans) }
+  let_it_be(:background_migration_jobs) { table(:background_migration_jobs) }
 
   let!(:namespace) { namespaces.create!(name: 'namespace', path: 'namespace') }
   let!(:project) { projects.create!(namespace_id: namespace.id) }
@@ -22,6 +23,11 @@ RSpec.describe ScheduleCopyCiBuildsColumnsToSecurityScans do
   let!(:scan2) { security_scans.create!(build_id: build2.id, scan_type: 1) }
   let!(:scan3) { security_scans.create!(build_id: build3.id, scan_type: 1) }
 
+  let!(:job_class_name) { described_class::MIGRATION }
+  let!(:tracked_pending_job) { background_migration_jobs.create!(class_name: job_class_name, status: 0, arguments: [1]) }
+  let!(:tracked_successful_job) { background_migration_jobs.create!(class_name: job_class_name, status: 1, arguments: [2]) }
+  let(:jobs) { Gitlab::Database::BackgroundMigrationJob.where(id: [tracked_pending_job.id, tracked_successful_job.id] ).for_migration_class(job_class_name) }
+
   before do
     stub_const("#{described_class}::BATCH_SIZE", 2)
     allow_next_instance_of(Gitlab::BackgroundMigration::CopyCiBuildsColumnsToSecurityScans) do |instance|
@@ -34,8 +40,11 @@ RSpec.describe ScheduleCopyCiBuildsColumnsToSecurityScans do
   end
 
   it 'schedules background migrations', :aggregate_failures do
+    expect(jobs).not_to be_empty
+
     migrate!
 
+    expect(jobs).to be_empty
     expect(BackgroundMigrationWorker.jobs.size).to eq(2)
     expect(described_class::MIGRATION).to be_scheduled_delayed_migration(2.minutes, scan1.id, scan2.id)
     expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, scan3.id, scan3.id)