Move temp table creation into the prepare job

* Hopefully fixes spec failures in which the table doesn’t exist
* Decouples the background migration from the post-deploy migration, e.g. we could easily run it again even though the table is dropped when finished.

1 files changed, 4 insertions, 10 deletions

diff --git a/spec/support/track_untracked_uploads_helpers.rb b/spec/support/track_untracked_uploads_helpers.rb
index bb700bc53f1..4d4745fd7f4 100644
--- a/spec/support/track_untracked_uploads_helpers.rb
+++ b/spec/support/track_untracked_uploads_helpers.rb
@@ -4,17 +4,11 @@ module TrackUntrackedUploadsHelpers
     fixture_file_upload(fixture_path)
   end
 
-  def recreate_temp_table_if_dropped
-    TrackUntrackedUploads.new.ensure_temporary_tracking_table_exists
+  def ensure_temporary_tracking_table_exists
+    Gitlab::BackgroundMigration::PrepareUntrackedUploads.new.send(:ensure_temporary_tracking_table_exists)
   end
 
-  RSpec.configure do |config|
-    config.after(:each, :temp_table_may_drop) do
-      recreate_temp_table_if_dropped
-    end
-
-    config.after(:context, :temp_table_may_drop) do
-      recreate_temp_table_if_dropped
-    end
+  def drop_temp_table_if_exists
+    ActiveRecord::Base.connection.drop_table(:untracked_files_for_uploads) if ActiveRecord::Base.connection.table_exists?(:untracked_files_for_uploads)
   end
 end