Remove migration dependency from stage_id migration

2 files changed, 3 insertions, 5 deletions

diff --git a/db/migrate/20170710083355_clean_stage_id_reference_migration.rb b/db/migrate/20170710083355_clean_stage_id_reference_migration.rb
index f75cbb4a712..681203eaf40 100644
--- a/db/migrate/20170710083355_clean_stage_id_reference_migration.rb
+++ b/db/migrate/20170710083355_clean_stage_id_reference_migration.rb
@@ -1,5 +1,3 @@
-require Rails.root.join('db', 'post_migrate', '20170628080858_migrate_stage_id_reference_in_background')
-
 class CleanStageIdReferenceMigration < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
@@ -11,8 +9,7 @@ class CleanStageIdReferenceMigration < ActiveRecord::Migration
   # `MigrateStageIdReferenceInBackground` background migration cleanup.
   #
   def up
-    Gitlab::BackgroundMigration
-      .steal(MigrateStageIdReferenceInBackground::MIGRATION)
+    Gitlab::BackgroundMigration.steal('MigrateBuildStageIdReference')
   end
 
   def down
diff --git a/spec/migrations/clean_stage_id_reference_migration_spec.rb b/spec/migrations/clean_stage_id_reference_migration_spec.rb
index 0518c4de799..1b8d044ed61 100644
--- a/spec/migrations/clean_stage_id_reference_migration_spec.rb
+++ b/spec/migrations/clean_stage_id_reference_migration_spec.rb
@@ -1,11 +1,12 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20170710083355_clean_stage_id_reference_migration.rb')
+require Rails.root.join('db', 'post_migrate', '20170628080858_migrate_stage_id_reference_in_background')
 
 describe CleanStageIdReferenceMigration, :migration, :sidekiq, :redis do
   let(:migration) { MigrateStageIdReferenceInBackground::MIGRATION }
 
   context 'when there are pending background migrations' do
-    it 'processes enqueued jobs synchronously' do
+    it 'processes pending jobs synchronously' do
       Sidekiq::Testing.disable! do
         BackgroundMigrationWorker.perform_in(2.minutes, migration, [1])
         BackgroundMigrationWorker.perform_async(migration, [1])