Merge branch 'pl-reqiure-migration-helper' into 'master'

RSpec: Infer migration filename also for spec files with schema version

See merge request gitlab-org/gitlab!72369

doc/development/testing_guide/testing_migrations_guide.md

@@ -61,14 +61,35 @@ Since the migration files are not autoloaded by Rails, you must manually
 load the migration file. To do so, you can use the `require_migration!` helper method
 which can automatically load the correct migration file based on the spec filename.
 
-For example, if your spec file is named as `populate_foo_column_spec.rb` then the
-helper method tries to load `${schema_version}_populate_foo_column.rb` migration file.
+In GitLab 14.4 and later, you can use `require_migration!` to load migration files from spec files
+that contain the schema version in the filename (for example,
+`2021101412150000_populate_foo_column_spec.rb`).
 
-In case there is no pattern between your spec file and the actual migration file,
-you can provide the migration filename without the schema version, like so:
+```ruby
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe PopulateFooColumn do
+  ...
+end
+```
+
+In some cases, you must require multiple migration files to use them in your specs. Here, there's no
+pattern between your spec file and the other migration file. You can provide the migration filename
+like so:
 
 ```ruby
-require_migration!('populate_foo_column')
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+require_migration!('populate_bar_column')
+
+RSpec.describe PopulateFooColumn do
+  ...
+end
 ```
 
 #### `table`

spec/migrations/20200107172020_add_timestamp_softwarelicensespolicy_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('add_timestamp_softwarelicensespolicy')
+require_migration!
 
 RSpec.describe AddTimestampSoftwarelicensespolicy do
   let(:software_licenses_policy) { table(:software_license_policies) }

spec/migrations/20200122123016_backfill_project_settings_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('backfill_project_settings')
+require_migration!
 
 RSpec.describe BackfillProjectSettings, :sidekiq, schema: 20200114113341 do
   let(:projects) { table(:projects) }

spec/migrations/20200123155929_remove_invalid_jira_data_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('remove_invalid_jira_data')
+require_migration!
 
 RSpec.describe RemoveInvalidJiraData do
   let(:jira_tracker_data) { table(:jira_tracker_data) }

spec/migrations/20200127090233_remove_invalid_issue_tracker_data_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('remove_invalid_issue_tracker_data')
+require_migration!
 
 RSpec.describe RemoveInvalidIssueTrackerData do
   let(:issue_tracker_data) { table(:issue_tracker_data) }

spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('reschedule_migrate_issue_trackers_data')
+require_migration!
 
 RSpec.describe RescheduleMigrateIssueTrackersData do
   let(:services) { table(:services) }

spec/migrations/20200313203550_remove_orphaned_chat_names_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('remove_orphaned_chat_names')
+require_migration!
 
 RSpec.describe RemoveOrphanedChatNames, schema: 20200313202430 do
   let(:projects) { table(:projects) }

spec/migrations/20200406102120_backfill_deployment_clusters_from_deployments_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('backfill_deployment_clusters_from_deployments')
+require_migration!
 
 RSpec.describe BackfillDeploymentClustersFromDeployments, :migration, :sidekiq, schema: 20200227140242 do
   describe '#up' do

spec/migrations/20200511145545_change_variable_interpolation_format_in_common_metrics_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('change_variable_interpolation_format_in_common_metrics')
+require_migration!
 
 RSpec.describe ChangeVariableInterpolationFormatInCommonMetrics, :migration do
   let(:prometheus_metrics) { table(:prometheus_metrics) }

spec/migrations/20200526115436_dedup_mr_metrics_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('dedup_mr_metrics')
+require_migration!
 
 RSpec.describe DedupMrMetrics, :migration, schema: 20200526013844 do
   let(:namespaces) { table(:namespaces) }

spec/migrations/20200526231421_update_index_approval_rule_name_for_code_owners_rule_type_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('update_index_approval_rule_name_for_code_owners_rule_type')
+require_migration!
 
 RSpec.describe UpdateIndexApprovalRuleNameForCodeOwnersRuleType do
   let(:migration) { described_class.new }

spec/migrations/20200703125016_backfill_namespace_settings_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('backfill_namespace_settings')
+require_migration!
 
 RSpec.describe BackfillNamespaceSettings, :sidekiq, schema: 20200703124823 do
   let(:namespaces) { table(:namespaces) }

spec/migrations/20200706035141_adjust_unique_index_alert_management_alerts_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('adjust_unique_index_alert_management_alerts')
+require_migration!
 
 RSpec.describe AdjustUniqueIndexAlertManagementAlerts, :migration do
   let(:migration) { described_class.new }

spec/migrations/20200728080250_replace_unique_index_on_cycle_analytics_stages_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('replace_unique_index_on_cycle_analytics_stages')
+require_migration!
 
 RSpec.describe ReplaceUniqueIndexOnCycleAnalyticsStages, :migration, schema: 20200727142337 do
   let(:namespaces) { table(:namespaces) }

spec/migrations/20200728182311_add_o_auth_paths_to_protected_paths_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('add_o_auth_paths_to_protected_paths')
+require_migration!
 
 RSpec.describe AddOAuthPathsToProtectedPaths do
   subject(:migration) { described_class.new }

spec/migrations/20200811130433_create_missing_vulnerabilities_issue_links_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
-require_migration!('create_missing_vulnerabilities_issue_links')
+require_migration!
 
 RSpec.describe CreateMissingVulnerabilitiesIssueLinks, :migration do
   let(:namespace) { table(:namespaces).create!(name: 'user', path: 'user') }

spec/migrations/20200915044225_schedule_migration_to_hashed_storage_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('schedule_migration_to_hashed_storage')
+require_migration!
 
 RSpec.describe ScheduleMigrationToHashedStorage, :sidekiq do
   describe '#up' do

spec/migrations/20200929052138_create_initial_versions_for_pre_versioning_terraform_states_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('create_initial_versions_for_pre_versioning_terraform_states')
+require_migration!
 
 RSpec.describe CreateInitialVersionsForPreVersioningTerraformStates do
   let(:namespace) { table(:namespaces).create!(name: 'terraform', path: 'terraform') }

spec/migrations/20201014205300_drop_backfill_jira_tracker_deployment_type_jobs_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_backfill_jira_tracker_deployment_type_jobs')
+require_migration!
 
 RSpec.describe DropBackfillJiraTrackerDeploymentTypeJobs, :sidekiq, :redis, schema: 2020_10_14_205300 do
   subject(:migration) { described_class.new }

spec/migrations/20201027002551_migrate_services_to_http_integrations_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('migrate_services_to_http_integrations')
+require_migration!
 
 RSpec.describe MigrateServicesToHttpIntegrations do
   let!(:namespace) { table(:namespaces).create!(name: 'namespace', path: 'namespace') }

spec/migrations/20201028182809_backfill_jira_tracker_deployment_type2_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('backfill_jira_tracker_deployment_type2')
+require_migration!
 
 RSpec.describe BackfillJiraTrackerDeploymentType2, :sidekiq, schema: 20201028182809 do
   let(:services) { table(:services) }

spec/migrations/20201110161542_cleanup_transfered_projects_shared_runners_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('cleanup_transfered_projects_shared_runners')
+require_migration!
 
 RSpec.describe CleanupTransferedProjectsSharedRunners, :sidekiq, schema: 20201110161542 do
   let(:namespaces) { table(:namespaces) }

spec/migrations/20201112130710_schedule_remove_duplicate_vulnerabilities_findings_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
-require_migration!('schedule_remove_duplicate_vulnerabilities_findings')
+require_migration!
 
 RSpec.describe ScheduleRemoveDuplicateVulnerabilitiesFindings, :migration do
   let(:namespace) { table(:namespaces).create!(name: 'user', path: 'user') }

spec/migrations/20201112130715_schedule_recalculate_uuid_on_vulnerabilities_occurrences_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('schedule_recalculate_uuid_on_vulnerabilities_occurrences')
+require_migration!
 
 RSpec.describe ScheduleRecalculateUuidOnVulnerabilitiesOccurrences, :migration do
   let(:namespace) { table(:namespaces).create!(name: 'user', path: 'user') }

spec/migrations/20210112143418_remove_duplicate_services2_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('remove_duplicate_services2')
+require_migration!
 
 RSpec.describe RemoveDuplicateServices2 do
   let_it_be(:namespaces) { table(:namespaces) }

spec/migrations/20210119122354_alter_vsa_issue_first_mentioned_in_commit_value_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('alter_vsa_issue_first_mentioned_in_commit_value')
+require_migration!
 
 RSpec.describe AlterVsaIssueFirstMentionedInCommitValue, schema: 20210114033715 do
   let(:group_stages) { table(:analytics_cycle_analytics_group_stages) }

spec/migrations/20210205174154_remove_bad_dependency_proxy_manifests_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('remove_bad_dependency_proxy_manifests')
+require_migration!
 
 RSpec.describe RemoveBadDependencyProxyManifests, schema: 20210128140157 do
   let_it_be(:namespaces) { table(:namespaces) }

spec/migrations/20210210093901_backfill_updated_at_after_repository_storage_move_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('backfill_updated_at_after_repository_storage_move')
+require_migration!
 
 RSpec.describe BackfillUpdatedAtAfterRepositoryStorageMove, :sidekiq do
   let_it_be(:projects) { table(:projects) }

spec/migrations/20210218040814_add_environment_scope_to_group_variables_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('add_environment_scope_to_group_variables')
+require_migration!
 
 RSpec.describe AddEnvironmentScopeToGroupVariables do
   let(:migration) { described_class.new }

spec/migrations/20210226141517_dedup_issue_metrics_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('dedup_issue_metrics')
+require_migration!
 
 RSpec.describe DedupIssueMetrics, :migration, schema: 20210205104425 do
   let(:namespaces) { table(:namespaces) }

spec/migrations/20210406144743_backfill_total_tuple_count_for_batched_migrations_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('backfill_total_tuple_count_for_batched_migrations')
+require_migration!
 
 RSpec.describe BackfillTotalTupleCountForBatchedMigrations, :migration, schema: 20210406140057 do
   let_it_be(:table_name) { 'projects' }

spec/migrations/20210413132500_reschedule_artifact_expiry_backfill_again_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require_migration!('reschedule_artifact_expiry_backfill_again')
+require_migration!
 
 RSpec.describe RescheduleArtifactExpiryBackfillAgain, :migration do
   let(:migration_class) { Gitlab::BackgroundMigration::BackfillArtifactExpiryDate }

spec/migrations/20210421163509_schedule_update_jira_tracker_data_deployment_type_based_on_url_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('schedule_update_jira_tracker_data_deployment_type_based_on_url')
+require_migration!
 
 RSpec.describe ScheduleUpdateJiraTrackerDataDeploymentTypeBasedOnUrl, :migration do
   let(:services_table) { table(:services) }

spec/migrations/20210423160427_schedule_drop_invalid_vulnerabilities_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('schedule_drop_invalid_vulnerabilities')
+require_migration!
 
 RSpec.describe ScheduleDropInvalidVulnerabilities, :migration do
   let_it_be(:namespace) { table(:namespaces).create!(name: 'user', path: 'user') }

spec/migrations/20210430134202_copy_adoption_snapshot_namespace_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-require_migration!('copy_adoption_snapshot_namespace')
+require_migration!
 
 RSpec.describe CopyAdoptionSnapshotNamespace, :migration, schema: 20210430124630 do
   let(:namespaces_table) { table(:namespaces) }

spec/migrations/20210430135954_copy_adoption_segments_namespace_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require_migration!('copy_adoption_segments_namespace')
+require_migration!
 
 RSpec.describe CopyAdoptionSegmentsNamespace, :migration do
   let(:namespaces_table) { table(:namespaces) }

spec/migrations/20210503105845_add_project_value_stream_id_to_project_stages_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require_migration!('add_project_value_stream_id_to_project_stages')
+require_migration!
 
 RSpec.describe AddProjectValueStreamIdToProjectStages, schema: 20210503105022 do
   let(:stages) { table(:analytics_cycle_analytics_project_stages) }

spec/migrations/20210511142748_schedule_drop_invalid_vulnerabilities2_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('schedule_drop_invalid_vulnerabilities2')
+require_migration!
 
 RSpec.describe ScheduleDropInvalidVulnerabilities2, :migration do
   let_it_be(:background_migration_jobs) { table(:background_migration_jobs) }

spec/migrations/20210514063252_schedule_cleanup_orphaned_lfs_objects_projects_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('schedule_cleanup_orphaned_lfs_objects_projects')
+require_migration!
 
 RSpec.describe ScheduleCleanupOrphanedLfsObjectsProjects, schema: 20210511165250 do
   let(:lfs_objects_projects) { table(:lfs_objects_projects) }

spec/migrations/20210601073400_fix_total_stage_in_vsa_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('fix_total_stage_in_vsa')
+require_migration!
 
 RSpec.describe FixTotalStageInVsa, :migration, schema: 20210518001450 do
   let(:namespaces) { table(:namespaces) }

spec/migrations/20210601080039_group_protected_environments_add_index_and_constraint_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('group_protected_environments_add_index_and_constraint')
+require_migration!
 
 RSpec.describe GroupProtectedEnvironmentsAddIndexAndConstraint do
   let(:migration) { described_class.new }

spec/migrations/20210603222333_remove_builds_email_service_from_services_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require_migration!('remove_builds_email_service_from_services')
+require_migration!
 
 RSpec.describe RemoveBuildsEmailServiceFromServices do
   let(:namespaces) { table(:namespaces) }

spec/migrations/20210610153556_delete_legacy_operations_feature_flags_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require_migration!('delete_legacy_operations_feature_flags')
+require_migration!
 
 RSpec.describe DeleteLegacyOperationsFeatureFlags do
   let(:namespace) { table(:namespaces).create!(name: 'foo', path: 'bar') }

spec/migrations/2021061716138_cascade_delete_freeze_periods_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require_migration!('cascade_delete_freeze_periods')
+require_migration!
 
 RSpec.describe CascadeDeleteFreezePeriods do
   let(:namespace) { table(:namespaces).create!(name: 'deploy_freeze', path: 'deploy_freeze') }

spec/migrations/20210708130419_reschedule_merge_request_diff_users_background_migration_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration! 'reschedule_merge_request_diff_users_background_migration'
+require_migration!
 
 RSpec.describe RescheduleMergeRequestDiffUsersBackgroundMigration, :migration do
   let(:migration) { described_class.new }

spec/migrations/20210722042939_update_issuable_slas_where_issue_closed_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('update_issuable_slas_where_issue_closed')
+require_migration!
 
 RSpec.describe UpdateIssuableSlasWhereIssueClosed, :migration do
   let(:namespaces) { table(:namespaces) }

spec/migrations/20210722150102_operations_feature_flags_correct_flexible_rollout_values_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require_migration!('operations_feature_flags_correct_flexible_rollout_values')
+require_migration!
 
 RSpec.describe OperationsFeatureFlagsCorrectFlexibleRolloutValues, :migration do
   let_it_be(:strategies) { table(:operations_strategies) }

spec/migrations/20210804150320_create_base_work_item_types_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('create_base_work_item_types')
+require_migration!
 
 RSpec.describe CreateBaseWorkItemTypes, :migration do
   let!(:work_item_types) { table(:work_item_types) }

spec/migrations/20210805192450_update_trial_plans_ci_daily_pipeline_schedule_triggers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require_migration!('update_trial_plans_ci_daily_pipeline_schedule_triggers')
+require_migration!
 
 RSpec.describe UpdateTrialPlansCiDailyPipelineScheduleTriggers, :migration do
   let!(:plans) { table(:plans) }

spec/migrations/20210811122206_update_external_project_bots_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('update_external_project_bots')
+require_migration!
 
 RSpec.describe UpdateExternalProjectBots, :migration do
   def create_user(**extra_options)

spec/migrations/20210818185845_backfill_projects_with_coverage_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('backfill_projects_with_coverage')
+require_migration!
 
 RSpec.describe BackfillProjectsWithCoverage do
   let(:projects) { table(:projects) }

spec/migrations/20210819145000_drop_temporary_columns_and_triggers_for_ci_builds_runner_session_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_temporary_columns_and_triggers_for_ci_builds_runner_session')
+require_migration!
 
 RSpec.describe DropTemporaryColumnsAndTriggersForCiBuildsRunnerSession, :migration do
   let(:ci_builds_runner_session_table) { table(:ci_builds_runner_session) }

spec/migrations/20210831203408_upsert_base_work_item_types_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('upsert_base_work_item_types')
+require_migration!
 
 RSpec.describe UpsertBaseWorkItemTypes, :migration do
   let!(:work_item_types) { table(:work_item_types) }

spec/migrations/20210902144144_drop_temporary_columns_and_triggers_for_ci_build_needs_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_temporary_columns_and_triggers_for_ci_build_needs')
+require_migration!
 
 RSpec.describe DropTemporaryColumnsAndTriggersForCiBuildNeeds do
   let(:ci_build_needs_table) { table(:ci_build_needs) }

spec/migrations/20210906100316_drop_temporary_columns_and_triggers_for_ci_build_trace_chunks_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_temporary_columns_and_triggers_for_ci_build_trace_chunks')
+require_migration!
 
 RSpec.describe DropTemporaryColumnsAndTriggersForCiBuildTraceChunks do
   let(:ci_build_trace_chunks_table) { table(:ci_build_trace_chunks) }

spec/migrations/20210906130643_drop_temporary_columns_and_triggers_for_taggings_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_temporary_columns_and_triggers_for_taggings')
+require_migration!
 
 RSpec.describe DropTemporaryColumnsAndTriggersForTaggings do
   let(:taggings_table) { table(:taggings) }

spec/migrations/20210907013944_cleanup_bigint_conversion_for_ci_builds_metadata_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('cleanup_bigint_conversion_for_ci_builds_metadata')
+require_migration!
 
 RSpec.describe CleanupBigintConversionForCiBuildsMetadata do
   let(:ci_builds_metadata) { table(:ci_builds_metadata) }

spec/migrations/20210907211557_finalize_ci_builds_bigint_conversion_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('finalize_ci_builds_bigint_conversion')
+require_migration!
 
 RSpec.describe FinalizeCiBuildsBigintConversion, :migration, schema: 20210907182359 do
   context 'with an unexpected FK fk_3f0c88d7dc' do

spec/migrations/20210910194952_update_report_type_for_existing_approval_project_rules_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('update_report_type_for_existing_approval_project_rules')
+require_migration!
 
 RSpec.describe UpdateReportTypeForExistingApprovalProjectRules, :migration do
   using RSpec::Parameterized::TableSyntax

spec/migrations/20210914095310_cleanup_orphan_project_access_tokens_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('cleanup_orphan_project_access_tokens')
+require_migration!
 
 RSpec.describe CleanupOrphanProjectAccessTokens, :migration do
   def create_user(**extra_options)

spec/migrations/20210915022415_cleanup_bigint_conversion_for_ci_builds_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('cleanup_bigint_conversion_for_ci_builds')
+require_migration!
 
 RSpec.describe CleanupBigintConversionForCiBuilds do
   let(:ci_builds) { table(:ci_builds) }

spec/migrations/20210922021816_drop_int4_columns_for_ci_job_artifacts_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_int4_columns_for_ci_job_artifacts')
+require_migration!
 
 RSpec.describe DropInt4ColumnsForCiJobArtifacts do
   let(:ci_job_artifacts) { table(:ci_job_artifacts) }

spec/migrations/20210922025631_drop_int4_column_for_ci_sources_pipelines_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_int4_column_for_ci_sources_pipelines')
+require_migration!
 
 RSpec.describe DropInt4ColumnForCiSourcesPipelines do
   let(:ci_sources_pipelines) { table(:ci_sources_pipelines) }

spec/migrations/20210922082019_drop_int4_column_for_events_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_int4_column_for_events')
+require_migration!
 
 RSpec.describe DropInt4ColumnForEvents do
   let(:events) { table(:events) }

spec/migrations/20210922091402_drop_int4_column_for_push_event_payloads_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('drop_int4_column_for_push_event_payloads')
+require_migration!
 
 RSpec.describe DropInt4ColumnForPushEventPayloads do
   let(:push_event_payloads) { table(:push_event_payloads) }

spec/migrations/20211006060436_schedule_populate_topics_total_projects_count_cache_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('schedule_populate_topics_total_projects_count_cache')
+require_migration!
 
 RSpec.describe SchedulePopulateTopicsTotalProjectsCountCache do
   let(:topics) { table(:topics) }

spec/migrations/cleanup_group_import_states_with_null_user_id_spec.rb

@@ -12,8 +12,8 @@
 # To solve this problem, use SchemaVersionFinder to set schema one version prior to AddNotNullConstraintToUserOnGroupImportStates
 
 require 'spec_helper'
-require_migration!('add_not_null_constraint_to_user_on_group_import_states')
 require_migration!
+require_migration!('add_not_null_constraint_to_user_on_group_import_states')
 
 RSpec.describe CleanupGroupImportStatesWithNullUserId, :migration,
                schema: MigrationHelpers::SchemaVersionFinder.migration_prior(AddNotNullConstraintToUserOnGroupImportStates) do

spec/migrations/cleanup_move_container_registry_enabled_to_project_features_spec.rb → spec/migrations/cleanup_move_container_registry_enabled_to_project_feature_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('cleanup_move_container_registry_enabled_to_project_feature')
+require_migration!
 
 RSpec.describe CleanupMoveContainerRegistryEnabledToProjectFeature, :migration do
   let(:namespace) { table(:namespaces).create!(name: 'gitlab', path: 'gitlab-org') }

spec/migrations/cleanup_optimistic_locking_nulls_pt2_fixed_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('cleanup_optimistic_locking_nulls_pt2_fixed')
+require_migration!
 
 RSpec.describe CleanupOptimisticLockingNullsPt2Fixed, :migration, schema: 20200219193117 do
   test_tables = %w(ci_stages ci_builds ci_pipelines).freeze

spec/migrations/cleanup_optimistic_locking_nulls_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('cleanup_optimistic_locking_nulls')
+require_migration!
 
 RSpec.describe CleanupOptimisticLockingNulls do
   let(:epics) { table(:epics) }

spec/migrations/cleanup_projects_with_missing_namespace_spec.rb

@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-require_migration!('add_projects_foreign_key_to_namespaces')
 require_migration!
+require_migration!('add_projects_foreign_key_to_namespaces')
 
 # In order to test the CleanupProjectsWithMissingNamespace migration, we need
 #  to first create an orphaned project (one with an invalid namespace_id)

spec/migrations/cleanup_remaining_orphan_invites_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration! 'cleanup_remaining_orphan_invites'
+require_migration!
 
 RSpec.describe CleanupRemainingOrphanInvites, :migration do
   def create_member(**extra_attributes)

spec/migrations/fix_projects_without_prometheus_services_spec.rb → spec/migrations/fix_projects_without_prometheus_service_spec.rb

 # frozen_string_literal: true
 #
 require 'spec_helper'
-require_migration!('fix_projects_without_prometheus_service')
+require_migration!
 
 RSpec.describe FixProjectsWithoutPrometheusService, :migration do
   let(:namespace) { table(:namespaces).create!(name: 'gitlab', path: 'gitlab-org') }

spec/migrations/orphaned_invite_tokens_cleanup_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration! 'orphaned_invite_tokens_cleanup'
+require_migration!
 
 RSpec.describe OrphanedInviteTokensCleanup, :migration do
   def create_member(**extra_attributes)

spec/migrations/remove_deprecated_jenkins_service_records_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!
 
+require_migration!
 require_migration!('ensure_deprecated_jenkins_service_records_removal')
 
 RSpec.shared_examples 'remove DeprecatedJenkinsService records' do

spec/migrations/remove_duplicate_labels_from_groups_spec.rb → spec/migrations/remove_duplicate_labels_from_group_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration!('remove_duplicate_labels_from_group')
+require_migration!
 
 RSpec.describe RemoveDuplicateLabelsFromGroup do
   let(:labels_table) { table(:labels) }

spec/migrations/slice_merge_request_diff_commit_migrations_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration! 'slice_merge_request_diff_commit_migrations'
+require_migration!
 
 RSpec.describe SliceMergeRequestDiffCommitMigrations, :migration do
   let(:migration) { described_class.new }

spec/migrations/steal_merge_request_diff_commit_users_migration_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require_migration! 'steal_merge_request_diff_commit_users_migration'
+require_migration!
 
 RSpec.describe StealMergeRequestDiffCommitUsersMigration, :migration do
   let(:migration) { described_class.new }

spec/support/helpers/require_migration.rb

@@ -15,7 +15,7 @@ class RequireMigration
   end
 
   MIGRATION_FOLDERS = %w[db/migrate db/post_migrate].freeze
-  SPEC_FILE_PATTERN = %r{.+/(?<file_name>.+)_spec\.rb}.freeze
+  SPEC_FILE_PATTERN = %r{.+/(?:\d+_)?(?<file_name>.+)_spec\.rb}.freeze
 
   class << self
     def require_migration!(file_name)
@@ -26,10 +26,12 @@ class RequireMigration
     end
 
     def search_migration_file(file_name)
+      migration_file_pattern = /\A\d+_#{file_name}\.rb\z/
+
       migration_folders.flat_map do |path|
         migration_path = Rails.root.join(path).to_s
 
-        Find.find(migration_path).select { |m| File.basename(m).match? /\A\d+_#{file_name}\.rb\z/ }
+        Find.find(migration_path).select { |m| migration_file_pattern.match? File.basename(m) }
       end
     end