1 files changed, 2 insertions, 229 deletions
diff --git a/spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb b/spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb
index e42a6c970ea..99c7d70724c 100644
--- a/spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb
@@ -7,78 +7,6 @@ RSpec.describe Gitlab::Database::Migrations::BackgroundMigrationHelpers do
     ActiveRecord::Migration.new.extend(described_class)
   end
 
-  describe '#bulk_queue_background_migration_jobs_by_range' do
-    context 'when the model has an ID column' do
-      let!(:id1) { create(:user).id }
-      let!(:id2) { create(:user).id }
-      let!(:id3) { create(:user).id }
-
-      before do
-        User.class_eval do
-          include EachBatch
-        end
-      end
-
-      context 'with enough rows to bulk queue jobs more than once' do
-        before do
-          stub_const('Gitlab::Database::Migrations::BackgroundMigrationHelpers::JOB_BUFFER_SIZE', 1)
-        end
-
-        it 'queues jobs correctly' do
-          Sidekiq::Testing.fake! do
-            model.bulk_queue_background_migration_jobs_by_range(User, 'FooJob', batch_size: 2)
-
-            expect(BackgroundMigrationWorker.jobs[0]['args']).to eq(['FooJob', [id1, id2]])
-            expect(BackgroundMigrationWorker.jobs[1]['args']).to eq(['FooJob', [id3, id3]])
-          end
-        end
-
-        it 'queues jobs in groups of buffer size 1' do
-          expect(BackgroundMigrationWorker).to receive(:bulk_perform_async).with([['FooJob', [id1, id2]]])
-          expect(BackgroundMigrationWorker).to receive(:bulk_perform_async).with([['FooJob', [id3, id3]]])
-
-          model.bulk_queue_background_migration_jobs_by_range(User, 'FooJob', batch_size: 2)
-        end
-      end
-
-      context 'with not enough rows to bulk queue jobs more than once' do
-        it 'queues jobs correctly' do
-          Sidekiq::Testing.fake! do
-            model.bulk_queue_background_migration_jobs_by_range(User, 'FooJob', batch_size: 2)
-
-            expect(BackgroundMigrationWorker.jobs[0]['args']).to eq(['FooJob', [id1, id2]])
-            expect(BackgroundMigrationWorker.jobs[1]['args']).to eq(['FooJob', [id3, id3]])
-          end
-        end
-
-        it 'queues jobs in bulk all at once (big buffer size)' do
-          expect(BackgroundMigrationWorker).to receive(:bulk_perform_async).with([['FooJob', [id1, id2]],
-                                                                                  ['FooJob', [id3, id3]]])
-
-          model.bulk_queue_background_migration_jobs_by_range(User, 'FooJob', batch_size: 2)
-        end
-      end
-
-      context 'without specifying batch_size' do
-        it 'queues jobs correctly' do
-          Sidekiq::Testing.fake! do
-            model.bulk_queue_background_migration_jobs_by_range(User, 'FooJob')
-
-            expect(BackgroundMigrationWorker.jobs[0]['args']).to eq(['FooJob', [id1, id3]])
-          end
-        end
-      end
-    end
-
-    context "when the model doesn't have an ID column" do
-      it 'raises error (for now)' do
-        expect do
-          model.bulk_queue_background_migration_jobs_by_range(ProjectAuthorization, 'FooJob')
-        end.to raise_error(StandardError, /does not have an ID/)
-      end
-    end
-  end
-
   describe '#queue_background_migration_jobs_by_range_at_intervals' do
     context 'when the model has an ID column' do
       let!(:id1) { create(:user).id }
@@ -354,161 +282,6 @@ RSpec.describe Gitlab::Database::Migrations::BackgroundMigrationHelpers do
     end
   end
 
-  describe '#queue_batched_background_migration' do
-    let(:pgclass_info) { instance_double('Gitlab::Database::PgClass', cardinality_estimate: 42) }
-
-    before do
-      allow(Gitlab::Database::PgClass).to receive(:for_table).and_call_original
-    end
-
-    context 'when such migration already exists' do
-      it 'does not create duplicate migration' do
-        create(
-          :batched_background_migration,
-          job_class_name: 'MyJobClass',
-          table_name: :projects,
-          column_name: :id,
-          interval: 10.minutes,
-          min_value: 5,
-          max_value: 1005,
-          batch_class_name: 'MyBatchClass',
-          batch_size: 200,
-          sub_batch_size: 20,
-          job_arguments: [[:id], [:id_convert_to_bigint]]
-        )
-
-        expect do
-          model.queue_batched_background_migration(
-            'MyJobClass',
-            :projects,
-            :id,
-            [:id], [:id_convert_to_bigint],
-            job_interval: 5.minutes,
-            batch_min_value: 5,
-            batch_max_value: 1000,
-            batch_class_name: 'MyBatchClass',
-            batch_size: 100,
-            sub_batch_size: 10)
-        end.not_to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }
-      end
-    end
-
-    it 'creates the database record for the migration' do
-      expect(Gitlab::Database::PgClass).to receive(:for_table).with(:projects).and_return(pgclass_info)
-
-      expect do
-        model.queue_batched_background_migration(
-          'MyJobClass',
-          :projects,
-          :id,
-          job_interval: 5.minutes,
-          batch_min_value: 5,
-          batch_max_value: 1000,
-          batch_class_name: 'MyBatchClass',
-          batch_size: 100,
-          sub_batch_size: 10)
-      end.to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }.by(1)
-
-      expect(Gitlab::Database::BackgroundMigration::BatchedMigration.last).to have_attributes(
-        job_class_name: 'MyJobClass',
-        table_name: 'projects',
-        column_name: 'id',
-        interval: 300,
-        min_value: 5,
-        max_value: 1000,
-        batch_class_name: 'MyBatchClass',
-        batch_size: 100,
-        sub_batch_size: 10,
-        job_arguments: %w[],
-        status: 'active',
-        total_tuple_count: pgclass_info.cardinality_estimate)
-    end
-
-    context 'when the job interval is lower than the minimum' do
-      let(:minimum_delay) { described_class::BATCH_MIN_DELAY }
-
-      it 'sets the job interval to the minimum value' do
-        expect do
-          model.queue_batched_background_migration('MyJobClass', :events, :id, job_interval: minimum_delay - 1.minute)
-        end.to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }.by(1)
-
-        created_migration = Gitlab::Database::BackgroundMigration::BatchedMigration.last
-
-        expect(created_migration.interval).to eq(minimum_delay)
-      end
-    end
-
-    context 'when additional arguments are passed to the method' do
-      it 'saves the arguments on the database record' do
-        expect do
-          model.queue_batched_background_migration(
-            'MyJobClass',
-            :projects,
-            :id,
-            'my',
-            'arguments',
-            job_interval: 5.minutes,
-            batch_max_value: 1000)
-        end.to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }.by(1)
-
-        expect(Gitlab::Database::BackgroundMigration::BatchedMigration.last).to have_attributes(
-          job_class_name: 'MyJobClass',
-          table_name: 'projects',
-          column_name: 'id',
-          interval: 300,
-          min_value: 1,
-          max_value: 1000,
-          job_arguments: %w[my arguments])
-      end
-    end
-
-    context 'when the max_value is not given' do
-      context 'when records exist in the database' do
-        let!(:event1) { create(:event) }
-        let!(:event2) { create(:event) }
-        let!(:event3) { create(:event) }
-
-        it 'creates the record with the current max value' do
-          expect do
-            model.queue_batched_background_migration('MyJobClass', :events, :id, job_interval: 5.minutes)
-          end.to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }.by(1)
-
-          created_migration = Gitlab::Database::BackgroundMigration::BatchedMigration.last
-
-          expect(created_migration.max_value).to eq(event3.id)
-        end
-
-        it 'creates the record with an active status' do
-          expect do
-            model.queue_batched_background_migration('MyJobClass', :events, :id, job_interval: 5.minutes)
-          end.to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }.by(1)
-
-          expect(Gitlab::Database::BackgroundMigration::BatchedMigration.last).to be_active
-        end
-      end
-
-      context 'when the database is empty' do
-        it 'sets the max value to the min value' do
-          expect do
-            model.queue_batched_background_migration('MyJobClass', :events, :id, job_interval: 5.minutes)
-          end.to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }.by(1)
-
-          created_migration = Gitlab::Database::BackgroundMigration::BatchedMigration.last
-
-          expect(created_migration.max_value).to eq(created_migration.min_value)
-        end
-
-        it 'creates the record with a finished status' do
-          expect do
-            model.queue_batched_background_migration('MyJobClass', :projects, :id, job_interval: 5.minutes)
-          end.to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }.by(1)
-
-          expect(Gitlab::Database::BackgroundMigration::BatchedMigration.last).to be_finished
-        end
-      end
-    end
-  end
-
   describe '#migrate_async' do
     it 'calls BackgroundMigrationWorker.perform_async' do
       expect(BackgroundMigrationWorker).to receive(:perform_async).with("Class", "hello", "world")
@@ -583,7 +356,7 @@ RSpec.describe Gitlab::Database::Migrations::BackgroundMigrationHelpers do
   end
 
   describe '#finalized_background_migration' do
-    let(:job_coordinator) { Gitlab::BackgroundMigration::JobCoordinator.new(:main, BackgroundMigrationWorker) }
+    let(:job_coordinator) { Gitlab::BackgroundMigration::JobCoordinator.new(BackgroundMigrationWorker) }
 
     let!(:job_class_name) { 'TestJob' }
     let!(:job_class) { Class.new }
@@ -605,7 +378,7 @@ RSpec.describe Gitlab::Database::Migrations::BackgroundMigrationHelpers do
       job_class.define_method(:perform, job_perform_method)
 
       allow(Gitlab::BackgroundMigration).to receive(:coordinator_for_database)
-        .with(:main).and_return(job_coordinator)
+        .with('main').and_return(job_coordinator)
 
       expect(job_coordinator).to receive(:migration_class_for)
         .with(job_class_name).at_least(:once) { job_class }