1 files changed, 2 insertions, 12 deletions
diff --git a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
index fb3f29ff4c9..c8fa252439a 100644
--- a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
+++ b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
@@ -14,16 +14,10 @@ describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :sidekiq, :migra
   let!(:uploads) { described_class::Upload }
 
   before do
-    DatabaseCleaner.clean
-    drop_temp_table_if_exists
     ensure_temporary_tracking_table_exists
     uploads.delete_all
   end
 
-  after(:all) do
-    drop_temp_table_if_exists
-  end
-
   context 'with untracked files and tracked files in untracked_files_for_uploads' do
     let!(:appearance) { create_or_update_appearance(logo: uploaded_file, header_logo: uploaded_file) }
     let!(:user1) { create(:user, :with_avatar) }
@@ -122,9 +116,9 @@ describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :sidekiq, :migra
     end
 
     it 'drops the temporary tracking table after processing the batch, if there are no untracked rows left' do
-      subject.perform(1, untracked_files_for_uploads.last.id)
+      expect(subject).to receive(:drop_temp_table_if_finished)
 
-      expect(ActiveRecord::Base.connection.table_exists?(:untracked_files_for_uploads)).to be_falsey
+      subject.perform(1, untracked_files_for_uploads.last.id)
     end
 
     it 'does not block a whole batch because of one bad path' do
@@ -260,10 +254,6 @@ describe Gitlab::BackgroundMigration::PopulateUntrackedUploads::UntrackedFile do
     ensure_temporary_tracking_table_exists
   end
 
-  after(:all) do
-    drop_temp_table_if_exists
-  end
-
   describe '#upload_path' do
     def assert_upload_path(file_path, expected_upload_path)
       untracked_file = create_untracked_file(file_path)