Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 10 insertions, 5 deletions

diff --git a/spec/support/helpers/migrations_helpers.rb b/spec/support/helpers/migrations_helpers.rb
index cc1a28cb264..2727ab7fb1e 100644
--- a/spec/support/helpers/migrations_helpers.rb
+++ b/spec/support/helpers/migrations_helpers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MigrationsHelpers
   def active_record_base
     ActiveRecord::Base
@@ -18,8 +20,12 @@ module MigrationsHelpers
     ActiveRecord::Migrator.migrations_paths
   end
 
+  def migration_context
+    ActiveRecord::MigrationContext.new(migrations_paths)
+  end
+
   def migrations
-    ActiveRecord::Migrator.migrations(migrations_paths)
+    migration_context.migrations
   end
 
   def clear_schema_cache!
@@ -96,8 +102,7 @@ module MigrationsHelpers
 
   def schema_migrate_down!
     disable_migrations_output do
-      ActiveRecord::Migrator.migrate(migrations_paths,
-                                     migration_schema_version)
+      migration_context.down(migration_schema_version)
     end
 
     reset_column_in_all_models
@@ -107,7 +112,7 @@ module MigrationsHelpers
     reset_column_in_all_models
 
     disable_migrations_output do
-      ActiveRecord::Migrator.migrate(migrations_paths)
+      migration_context.up
     end
 
     reset_column_in_all_models
@@ -123,7 +128,7 @@ module MigrationsHelpers
   end
 
   def migrate!
-    ActiveRecord::Migrator.up(migrations_paths) do |migration|
+    migration_context.up do |migration|
       migration.name == described_class.name
     end
   end