Add specs for delayed stage_id background migrations

2 files changed, 51 insertions, 7 deletions

diff --git a/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb b/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
index bfeb09f6da1..a73456af386 100644
--- a/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
+++ b/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
@@ -15,9 +15,10 @@ class MigrateStageIdReferenceInBackground < ActiveRecord::Migration
     Build.where(stage_id: nil)
       .find_in_batches(batch_size: BATCH_SIZE)
       .with_index do |builds, batch|
-        migrations = builds.map { |build| [MIGRATION, [build.id]] }
-
-        BackgroundMigrationWorker.perform_bulk(*migrations)
+        builds.each do |build|
+          schedule = (batch - 1) * 5.minutes
+          BackgroundMigrationWorker.perform_at(schedule, MIGRATION, [build.id])
+        end
       end
   end
 
diff --git a/spec/migrations/migrate_stage_id_reference_in_background_spec.rb b/spec/migrations/migrate_stage_id_reference_in_background_spec.rb
index d515eb42b9d..8b497656377 100644
--- a/spec/migrations/migrate_stage_id_reference_in_background_spec.rb
+++ b/spec/migrations/migrate_stage_id_reference_in_background_spec.rb
@@ -1,7 +1,37 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20170628080858_migrate_stage_id_reference_in_background')
 
-describe MigrateStageIdReferenceInBackground, :migration, :redis do
+RSpec::Matchers.define :have_migrated do |*expected|
+  match do |migration|
+    BackgroundMigrationWorker.jobs.any? do |job|
+      job['enqueued_at'].present? && job['args'] == [migration, expected]
+    end
+  end
+
+  failure_message do |migration|
+    <<-EOS
+      Background migration `#{migration}` with args `#{expected.inspect}`
+      not migrated!
+    EOS
+  end
+end
+
+RSpec::Matchers.define :have_scheduled_migration do |time, *expected|
+  match do |migration|
+    BackgroundMigrationWorker.jobs.any? do |job|
+      job['args'] == [migration, expected] && job['at'] >= time
+    end
+  end
+
+  failure_message do |migration|
+    <<-EOS
+      Background migration `#{migration}` with args `#{expected.inspect}`
+      not scheduled!
+    EOS
+  end
+end
+
+describe MigrateStageIdReferenceInBackground, :migration do
   let(:jobs) { table(:ci_builds) }
   let(:stages) { table(:ci_stages) }
   let(:pipelines) { table(:ci_pipelines) }
@@ -23,11 +53,24 @@ describe MigrateStageIdReferenceInBackground, :migration, :redis do
     stages.create(id: 103, pipeline_id: 1, project_id: 123, name: 'deploy')
   end
 
+  it 'correctly schedules background migrations' do
+    Sidekiq::Testing.fake! do
+      migrate!
+
+      expect(described_class::MIGRATION).to have_migrated(1)
+      expect(described_class::MIGRATION).to have_migrated(2)
+      expect(described_class::MIGRATION).to have_scheduled_migration(5.minutes, 3)
+      expect(described_class::MIGRATION).to have_scheduled_migration(5.minutes, 4)
+    end
+  end
+
   it 'schedules background migrations' do
-    expect(jobs.where(stage_id: nil)).to be_present
+    Sidekiq::Testing.inline! do
+      expect(jobs.where(stage_id: nil)).to be_present
 
-    migrate!
+      migrate!
 
-    expect(jobs.where(stage_id: nil)).to be_empty
+      expect(jobs.where(stage_id: nil)).to be_empty
+    end
   end
 end