1 files changed, 26 insertions, 26 deletions
diff --git a/spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb b/spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb
index 0b048617ce1..57c5011590c 100644
--- a/spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb
+++ b/spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Database::Migrations::TestBatchedBackgroundRunner, :freeze_time do
+RSpec.describe Gitlab::Database::Migrations::TestBatchedBackgroundRunner, :freeze_time, feature_category: :database do
   include Gitlab::Database::MigrationHelpers
   include Database::MigrationTestingHelpers
 
@@ -45,18 +45,15 @@ RSpec.describe Gitlab::Database::Migrations::TestBatchedBackgroundRunner, :freez
   end
 
   with_them do
-    let(:result_dir) { Dir.mktmpdir }
+    let(:result_dir) { Pathname.new(Dir.mktmpdir) }
+    let(:connection) { base_model.connection }
+    let(:table_name) { "_test_column_copying" }
+    let(:from_id) { 0 }
 
     after do
       FileUtils.rm_rf(result_dir)
     end
 
-    let(:connection) { base_model.connection }
-
-    let(:table_name) { "_test_column_copying" }
-
-    let(:from_id) { 0 }
-
     before do
       connection.execute(<<~SQL)
         CREATE TABLE #{table_name} (
@@ -70,26 +67,15 @@ RSpec.describe Gitlab::Database::Migrations::TestBatchedBackgroundRunner, :freez
 
     context 'running a real background migration' do
       let(:interval) { 5.minutes }
-      let(:meta) { { "max_batch_size" => nil, "total_tuple_count" => nil, "interval" => interval } }
-
-      let(:params) do
-        {
-          version: nil,
-          connection: connection,
-          meta: {
-            interval: 300,
-            max_batch_size: nil,
-            total_tuple_count: nil
-          }
-        }
-      end
+      let(:params) { { version: nil, connection: connection } }
+      let(:migration_name) { 'CopyColumnUsingBackgroundMigrationJob' }
+      let(:migration_file_path) { result_dir.join('CopyColumnUsingBackgroundMigrationJob', 'details.json') }
+      let(:json_file) { Gitlab::Json.parse(File.read(migration_file_path)) }
+      let(:expected_file_keys) { %w[interval total_tuple_count max_batch_size] }
 
       before do
-        queue_migration('CopyColumnUsingBackgroundMigrationJob',
-                        table_name, :id,
-                        :id, :data,
-                        batch_size: 100,
-                        job_interval: interval) # job_interval is skipped when testing
+        # job_interval is skipped when testing
+        queue_migration(migration_name, table_name, :id, :id, :data, batch_size: 100, job_interval: interval)
       end
 
       subject(:sample_migration) do
@@ -113,6 +99,20 @@ RSpec.describe Gitlab::Database::Migrations::TestBatchedBackgroundRunner, :freez
 
         subject
       end
+
+      it 'uses the filtering clause from the migration' do
+        expect_next_instance_of(Gitlab::BackgroundMigration::BatchingStrategies::PrimaryKeyBatchingStrategy) do |s|
+          expect(s).to receive(:filter_batch).at_least(:once).and_call_original
+        end
+
+        subject
+      end
+
+      it 'exports migration details to a file' do
+        subject
+
+        expect(json_file.keys).to match_array(expected_file_keys)
+      end
     end
 
     context 'with jobs to run' do