Merge branch 'clear-sidekiq-queues-in-migration-specs' into 'master'

Clear Sidekiq queues before each example

See merge request gitlab-org/gitlab!23332

app/models/repository.rb

@@ -451,10 +451,6 @@ class Repository
 
     return unless repo_type.project?
 
-    # This call is stubbed in tests due to being an expensive operation
-    # It can be reenabled for specific tests via:
-    #
-    # allow(DetectRepositoryLanguagesWorker).to receive(:perform_async).and_call_original
     DetectRepositoryLanguagesWorker.perform_async(project.id)
   end
 

ee/spec/migrations/backfill_version_author_and_created_at_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191030223057_backfill_version_author_and_created_at.rb')
 
-describe BackfillVersionAuthorAndCreatedAt, :migration, :sidekiq do
+describe BackfillVersionAuthorAndCreatedAt, :migration do
   let_it_be(:migration_name) { described_class::MIGRATION.to_s.demodulize }
   let_it_be(:projects) { table(:projects) }
   let_it_be(:issues) { table(:issues) }

ee/spec/migrations/migrate_epic_mentions_to_db_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191115115043_migrate_epic_mentions_to_db')
 
-describe MigrateEpicMentionsToDb, :migration, :sidekiq do
+describe MigrateEpicMentionsToDb, :migration do
   let(:users) { table(:users) }
   let(:namespaces) { table(:namespaces) }
   let(:epics) { table(:epics) }

ee/spec/migrations/migrate_epic_notes_mentions_to_db_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191115115522_migrate_epic_notes_mentions_to_db')
 
-describe MigrateEpicNotesMentionsToDb, :migration, :sidekiq do
+describe MigrateEpicNotesMentionsToDb, :migration do
   let(:users) { table(:users) }
   let(:namespaces) { table(:namespaces) }
   let(:epics) { table(:epics) }

ee/spec/migrations/schedule_merge_request_any_approval_rule_migration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190905091831_schedule_merge_request_any_approval_rule_migration.rb')
 
-describe ScheduleMergeRequestAnyApprovalRuleMigration, :migration, :sidekiq do
+describe ScheduleMergeRequestAnyApprovalRuleMigration, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }

ee/spec/migrations/schedule_project_any_approval_rule_migration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190905091812_schedule_project_any_approval_rule_migration.rb')
 
-describe ScheduleProjectAnyApprovalRuleMigration, :migration, :sidekiq do
+describe ScheduleProjectAnyApprovalRuleMigration, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }

ee/spec/migrations/update_cs_vulnerability_confidence_column_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190909141517_update_cs_vulnerability_confidence_column.rb')
 
-describe UpdateCsVulnerabilityConfidenceColumn, :migration, :sidekiq do
+describe UpdateCsVulnerabilityConfidenceColumn, :migration do
   let(:vulnerabilities) { table(:vulnerability_occurrences) }
   let(:identifiers) { table(:vulnerability_identifiers) }
   let(:scanners) { table(:vulnerability_scanners) }

ee/spec/services/ci/process_pipeline_service_spec.rb

@@ -38,7 +38,7 @@ describe Ci::ProcessPipelineService, '#execute' do
         stub_ci_pipeline_to_return_yaml_file
       end
 
-      it 'creates a downstream cross-project pipeline', :sidekiq do
+      it 'creates a downstream cross-project pipeline' do
         service.execute
         Sidekiq::Worker.drain_all
 

ee/spec/services/projects/alerting/notify_service_spec.rb

@@ -13,7 +13,7 @@ describe Projects::Alerting::NotifyService do
   shared_examples 'processes incident issues' do |amount|
     let(:create_incident_service) { spy }
 
-    it 'processes issues', :sidekiq do
+    it 'processes issues' do
       expect(IncidentManagement::ProcessAlertWorker)
         .to receive(:perform_async)
         .with(project.id, kind_of(Hash))

ee/spec/services/projects/prometheus/alerts/notify_service_spec.rb

@@ -32,7 +32,7 @@ describe Projects::Prometheus::Alerts::NotifyService do
   shared_examples 'processes incident issues' do |amount|
     let(:create_incident_service) { spy }
 
-    it 'processes issues', :sidekiq do
+    it 'processes issues' do
       expect(IncidentManagement::ProcessPrometheusAlertWorker)
         .to receive(:perform_async)
         .with(project.id, kind_of(Hash))

ee/spec/tasks/gitlab/elastic_rake_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rake_helper'
 
-describe 'gitlab:elastic namespace rake tasks', :elastic, :sidekiq do
+describe 'gitlab:elastic namespace rake tasks', :elastic do
   before do
     Rake.application.rake_require 'tasks/gitlab/elastic'
     stub_ee_application_setting(elasticsearch_indexing: true)

lib/tasks/gitlab/import_export/import.rake

@@ -76,17 +76,26 @@ class GitlabProjectImport
   # synchronously as part of that process.
   # This ensures that all expensive operations do not escape
   # to general Sidekiq clusters/nodes.
-  def run_isolated_sidekiq_job
+  def with_isolated_sidekiq_job
     Sidekiq::Testing.fake! do
       with_request_store do
-        @project = create_project
-
-        execute_sidekiq_job
+        ::Gitlab::GitalyClient.allow_n_plus_1_calls do
+          yield
+        end
       end
+
       true
     end
   end
 
+  def run_isolated_sidekiq_job
+    with_isolated_sidekiq_job do
+      @project = create_project
+
+      execute_sidekiq_job
+    end
+  end
+
   def create_project
     # We are disabling ObjectStorage for `import`
     # as it is too slow to handle big archives:

spec/features/admin/admin_mode/workers_spec.rb

@@ -37,7 +37,7 @@ describe 'Admin mode for workers', :do_not_mock_admin_mode, :request_store, :cle
         gitlab_enable_admin_mode_sign_in(user)
       end
 
-      it 'can delete user', :sidekiq, :js do
+      it 'can delete user', :js do
         visit admin_user_path(user_to_delete)
         click_button 'Delete user'
 

spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # Rollback DB to 10.5 (later than this was originally written for) because it still needs to work.
-describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :sidekiq, :migration, schema: 20180208183958 do
+describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :migration, schema: 20180208183958 do
   include MigrationsHelpers::TrackUntrackedUploadsHelpers
 
   subject { described_class.new }

spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # Rollback DB to 10.5 (later than this was originally written for) because it still needs to work.
-describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, :sidekiq, :migration, schema: 20180208183958 do
+describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, :migration, schema: 20180208183958 do
   include MigrationsHelpers::TrackUntrackedUploadsHelpers
 
   let!(:untracked_files_for_uploads) { table(:untracked_files_for_uploads) }

spec/lib/gitlab/background_migration/schedule_calculate_wiki_sizes_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190527194900_schedule_calculate_wiki_sizes.rb')
 
-describe ScheduleCalculateWikiSizes, :migration, :sidekiq do
+describe ScheduleCalculateWikiSizes, :migration do
   let(:migration_class) { Gitlab::BackgroundMigration::CalculateWikiSizes }
   let(:migration_name)  { migration_class.to_s.demodulize }
 

spec/lib/gitlab/background_migration_spec.rb

@@ -76,7 +76,7 @@ describe Gitlab::BackgroundMigration do
       end
     end
 
-    context 'when there are scheduled jobs present', :sidekiq, :redis do
+    context 'when there are scheduled jobs present', :redis do
       it 'steals all jobs from the scheduled sets' do
         Sidekiq::Testing.disable! do
           BackgroundMigrationWorker.perform_in(10.minutes, 'Object')
@@ -91,7 +91,7 @@ describe Gitlab::BackgroundMigration do
       end
     end
 
-    context 'when there are enqueued and scheduled jobs present', :sidekiq, :redis do
+    context 'when there are enqueued and scheduled jobs present', :redis do
       it 'steals from the scheduled sets queue first' do
         Sidekiq::Testing.disable! do
           expect(described_class).to receive(:perform)
@@ -107,7 +107,7 @@ describe Gitlab::BackgroundMigration do
       end
     end
 
-    context 'when retry_dead_jobs is true', :sidekiq, :redis do
+    context 'when retry_dead_jobs is true', :redis do
       let(:retry_queue) do
         [double(args: ['Object', [3]], queue: described_class.queue, delete: true)]
       end
@@ -186,7 +186,7 @@ describe Gitlab::BackgroundMigration do
       end
     end
 
-    context 'when there are scheduled jobs present', :sidekiq, :redis do
+    context 'when there are scheduled jobs present', :redis do
       before do
         Sidekiq::Testing.disable! do
           BackgroundMigrationWorker.perform_in(10.minutes, 'Foo')

spec/lib/gitlab/database/migration_helpers_spec.rb

@@ -1158,7 +1158,7 @@ describe Gitlab::Database::MigrationHelpers do
     end
   end
 
-  describe 'sidekiq migration helpers', :sidekiq, :redis do
+  describe 'sidekiq migration helpers', :redis do
     let(:worker) do
       Class.new do
         include Sidekiq::Worker
@@ -1221,7 +1221,7 @@ describe Gitlab::Database::MigrationHelpers do
     end
   end
 
-  describe '#bulk_queue_background_migration_jobs_by_range', :sidekiq do
+  describe '#bulk_queue_background_migration_jobs_by_range' do
     context 'when the model has an ID column' do
       let!(:id1) { create(:user).id }
       let!(:id2) { create(:user).id }
@@ -1293,7 +1293,7 @@ describe Gitlab::Database::MigrationHelpers do
     end
   end
 
-  describe '#queue_background_migration_jobs_by_range_at_intervals', :sidekiq do
+  describe '#queue_background_migration_jobs_by_range_at_intervals' do
     context 'when the model has an ID column' do
       let!(:id1) { create(:user).id }
       let!(:id2) { create(:user).id }

spec/lib/gitlab/hashed_storage/migrator_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::HashedStorage::Migrator, :sidekiq, :redis do
+describe Gitlab::HashedStorage::Migrator, :redis do
   describe '#bulk_schedule_migration' do
     it 'schedules job to HashedStorage::MigratorWorker' do
       Sidekiq::Testing.fake! do

spec/lib/gitlab/sidekiq_versioning_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::SidekiqVersioning, :sidekiq, :redis do
+describe Gitlab::SidekiqVersioning, :redis do
   let(:foo_worker) do
     Class.new do
       def self.name

spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190924152703_migrate_issue_trackers_data.rb')
 
-describe MigrateIssueTrackersData, :migration, :sidekiq do
+describe MigrateIssueTrackersData, :migration do
   let(:services) { table(:services) }
   let(:migration_class) { Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData }
   let(:migration_name)  { migration_class.to_s.demodulize }

spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180122154930_schedule_set_confidential_note_events_on_services.rb')
 
-describe ScheduleSetConfidentialNoteEventsOnServices, :migration, :sidekiq do
+describe ScheduleSetConfidentialNoteEventsOnServices, :migration do
   let(:services_table) { table(:services) }
   let(:migration_class) { Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnServices }
   let(:migration_name)  { migration_class.to_s.demodulize }

spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180425131009_assure_commits_count_for_merge_request_diff.rb')
 
-describe AssureCommitsCountForMergeRequestDiff, :migration, :sidekiq, :redis do
+describe AssureCommitsCountForMergeRequestDiff, :migration, :redis do
   let(:migration) { spy('migration') }
 
   before do

spec/migrations/cleanup_build_stage_migration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180420010616_cleanup_build_stage_migration.rb')
 
-describe CleanupBuildStageMigration, :migration, :sidekiq, :redis do
+describe CleanupBuildStageMigration, :migration, :redis do
   let(:migration) { spy('migration') }
 
   before do

spec/migrations/cleanup_legacy_artifact_migration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190104182041_cleanup_legacy_artifact_migration.rb')
 
-describe CleanupLegacyArtifactMigration, :migration, :sidekiq, :redis do
+describe CleanupLegacyArtifactMigration, :migration, :redis do
   let(:migration) { spy('migration') }
 
   context 'when still legacy artifacts exist' do

spec/migrations/cleanup_stages_position_migration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180604123514_cleanup_stages_position_migration.rb')
 
-describe CleanupStagesPositionMigration, :migration, :sidekiq, :redis do
+describe CleanupStagesPositionMigration, :migration, :redis do
   let(:migration) { spy('migration') }
 
   before do

spec/migrations/enqueue_reset_merge_status_second_run_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190620112608_enqueue_reset_merge_status_second_run.rb')
 
-describe EnqueueResetMergeStatusSecondRun, :migration, :sidekiq do
+describe EnqueueResetMergeStatusSecondRun, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }

spec/migrations/enqueue_reset_merge_status_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190528180441_enqueue_reset_merge_status.rb')
 
-describe EnqueueResetMergeStatus, :migration, :sidekiq do
+describe EnqueueResetMergeStatus, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }

spec/migrations/enqueue_verify_pages_domain_workers_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180216121030_enqueue_verify_pages_domain_workers')
 
-describe EnqueueVerifyPagesDomainWorkers, :sidekiq, :migration do
+describe EnqueueVerifyPagesDomainWorkers, :migration do
   around do |example|
     Sidekiq::Testing.fake! do
       example.run

spec/migrations/migrate_cluster_configure_worker_sidekiq_queue_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181219145520_migrate_cluster_configure_worker_sidekiq_queue.rb')
 
-describe MigrateClusterConfigureWorkerSidekiqQueue, :sidekiq, :redis do
+describe MigrateClusterConfigureWorkerSidekiqQueue, :redis do
   include Gitlab::Database::MigrationHelpers
   include StubWorker
 

spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180306074045_migrate_create_trace_artifact_sidekiq_queue.rb')
 
-describe MigrateCreateTraceArtifactSidekiqQueue, :sidekiq, :redis do
+describe MigrateCreateTraceArtifactSidekiqQueue, :redis do
   include Gitlab::Database::MigrationHelpers
   include StubWorker
 

spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190715193142_migrate_discussion_id_on_promoted_epics.rb')
 
-describe MigrateDiscussionIdOnPromotedEpics, :migration, :sidekiq do
+describe MigrateDiscussionIdOnPromotedEpics, :migration do
   let(:migration_class) { described_class::MIGRATION }
   let(:migration_name)  { migration_class.to_s.demodulize }
 

spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180816161409_migrate_legacy_artifacts_to_job_artifacts.rb')
 
-describe MigrateLegacyArtifactsToJobArtifacts, :migration, :sidekiq do
+describe MigrateLegacyArtifactsToJobArtifacts, :migration do
   let(:migration_class) { Gitlab::BackgroundMigration::MigrateLegacyArtifacts }
   let(:migration_name)  { migration_class.to_s.demodulize }
 

spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180603190921_migrate_object_storage_upload_sidekiq_queue.rb')
 
-describe MigrateObjectStorageUploadSidekiqQueue, :sidekiq, :redis do
+describe MigrateObjectStorageUploadSidekiqQueue, :redis do
   include Gitlab::Database::MigrationHelpers
   include StubWorker
 

spec/migrations/migrate_storage_migrator_sidekiq_queue_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190124200344_migrate_storage_migrator_sidekiq_queue.rb')
 
-describe MigrateStorageMigratorSidekiqQueue, :sidekiq, :redis do
+describe MigrateStorageMigratorSidekiqQueue, :redis do
   include Gitlab::Database::MigrationHelpers
   include StubWorker
 

spec/migrations/migrate_update_head_pipeline_for_merge_request_sidekiq_queue_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180307012445_migrate_update_head_pipeline_for_merge_request_sidekiq_queue.rb')
 
-describe MigrateUpdateHeadPipelineForMergeRequestSidekiqQueue, :sidekiq, :redis do
+describe MigrateUpdateHeadPipelineForMergeRequestSidekiqQueue, :redis do
   include Gitlab::Database::MigrationHelpers
   include StubWorker
 

spec/migrations/patch_prometheus_services_for_shared_cluster_applications_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200114113341_patch_prometheus_services_for_shared_cluster_applications.rb')
 
-describe PatchPrometheusServicesForSharedClusterApplications, :migration, :sidekiq do
+describe PatchPrometheusServicesForSharedClusterApplications, :migration do
   include MigrationHelpers::PrometheusServiceHelpers
 
   let(:namespaces) { table(:namespaces) }

spec/migrations/reschedule_builds_stages_migration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180405101928_reschedule_builds_stages_migration')
 
-describe RescheduleBuildsStagesMigration, :sidekiq, :migration do
+describe RescheduleBuildsStagesMigration, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:pipelines) { table(:ci_pipelines) }

spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180309121820_reschedule_commits_count_for_merge_request_diff')
 
-describe RescheduleCommitsCountForMergeRequestDiff, :migration, :sidekiq do
+describe RescheduleCommitsCountForMergeRequestDiff, :migration do
   let(:merge_request_diffs) { table(:merge_request_diffs) }
   let(:merge_requests) { table(:merge_requests) }
   let(:projects) { table(:projects) }

spec/migrations/schedule_digest_personal_access_tokens_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180913142237_schedule_digest_personal_access_tokens.rb')
 
-describe ScheduleDigestPersonalAccessTokens, :migration, :sidekiq do
+describe ScheduleDigestPersonalAccessTokens, :migration do
   let(:personal_access_tokens) { table(:personal_access_tokens) }
   let(:users) { table(:users) }
 

spec/migrations/schedule_fill_valid_time_for_pages_domain_certificates_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190524073827_schedule_fill_valid_time_for_pages_domain_certificates.rb')
 
-describe ScheduleFillValidTimeForPagesDomainCertificates, :migration, :sidekiq do
+describe ScheduleFillValidTimeForPagesDomainCertificates, :migration do
   let(:migration_class) { described_class::MIGRATION }
   let(:migration_name)  { migration_class.to_s.demodulize }
 

spec/migrations/schedule_pages_metadata_migration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20191002031332_schedule_pages_metadata_migration')
 
-describe SchedulePagesMetadataMigration, :migration, :sidekiq do
+describe SchedulePagesMetadataMigration, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
 

spec/migrations/schedule_populate_merge_request_assignees_table_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190322132835_schedule_populate_merge_request_assignees_table.rb')
 
-describe SchedulePopulateMergeRequestAssigneesTable, :migration, :sidekiq do
+describe SchedulePopulateMergeRequestAssigneesTable, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }

spec/migrations/schedule_runners_token_encryption_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181121111200_schedule_runners_token_encryption')
 
-describe ScheduleRunnersTokenEncryption, :migration, :sidekiq do
+describe ScheduleRunnersTokenEncryption, :migration do
   let(:settings) { table(:application_settings) }
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }

spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180104131052_schedule_set_confidential_note_events_on_webhooks.rb')
 
-describe ScheduleSetConfidentialNoteEventsOnWebhooks, :migration, :sidekiq do
+describe ScheduleSetConfidentialNoteEventsOnWebhooks, :migration do
   let(:web_hooks_table) { table(:web_hooks) }
   let(:migration_class) { Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnWebhooks }
   let(:migration_name)  { migration_class.to_s.demodulize }

spec/migrations/schedule_stages_index_migration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180420080616_schedule_stages_index_migration')
 
-describe ScheduleStagesIndexMigration, :sidekiq, :migration do
+describe ScheduleStagesIndexMigration, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:pipelines) { table(:ci_pipelines) }

spec/migrations/schedule_sync_issuables_state_id_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190214112022_schedule_sync_issuables_state_id.rb')
 
-describe ScheduleSyncIssuablesStateId, :migration, :sidekiq do
+describe ScheduleSyncIssuablesStateId, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:merge_requests) { table(:merge_requests) }

spec/migrations/schedule_sync_issuables_state_id_where_nil_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190506135400_schedule_sync_issuables_state_id_where_nil')
 
-describe ScheduleSyncIssuablesStateIdWhereNil, :migration, :sidekiq do
+describe ScheduleSyncIssuablesStateIdWhereNil, :migration do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:merge_requests) { table(:merge_requests) }

spec/migrations/sync_issuables_state_id_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190911251732_sync_issuables_state_id')
 
-describe SyncIssuablesStateId, :migration, :sidekiq do
+describe SyncIssuablesStateId, :migration do
   let(:migration) { described_class.new }
 
   describe '#up' do

spec/migrations/update_fingerprint_sha256_within_keys_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db', 'post_migrate', '20200106071113_update_fingerprint_sha256_within_keys.rb')
 
-describe UpdateFingerprintSha256WithinKeys, :sidekiq, :migration do
+describe UpdateFingerprintSha256WithinKeys, :migration do
   let(:key_table) { table(:keys) }
 
   describe '#up' do

spec/requests/api/projects_spec.rb

@@ -6,8 +6,6 @@ shared_examples 'languages and percentages JSON response' do
   let(:expected_languages) { project.repository.languages.map { |language| language.values_at(:label, :value)}.to_h }
 
   before do
-    allow(DetectRepositoryLanguagesWorker).to receive(:perform_async).and_call_original
-
     allow(project.repository).to receive(:languages).and_return(
       [{ value: 66.69, label: "Ruby", color: "#701516", highlight: "#701516" },
        { value: 22.98, label: "JavaScript", color: "#f1e05a", highlight: "#f1e05a" },

spec/services/merge_requests/migrate_external_diffs_service_spec.rb

@@ -6,7 +6,7 @@ describe MergeRequests::MigrateExternalDiffsService do
   let(:merge_request) { create(:merge_request) }
   let(:diff) { merge_request.merge_request_diff }
 
-  describe '.enqueue!', :sidekiq do
+  describe '.enqueue!' do
     around do |example|
       Sidekiq::Testing.fake! { example.run }
     end

spec/spec_helper.rb

@@ -139,6 +139,16 @@ RSpec.configure do |config|
     TestEnv.clean_test_path
   end
 
+  # We can't use an `around` hook here because the wrapping transaction
+  # is not yet opened at the time that is triggered
+  config.prepend_before do
+    Gitlab::Database.set_open_transactions_baseline
+  end
+
+  config.append_after do
+    Gitlab::Database.reset_open_transactions_baseline
+  end
+
   config.before do |example|
     # Enable all features by default for testing
     allow(Feature).to receive(:enabled?) { true }
@@ -176,12 +186,12 @@ RSpec.configure do |config|
     # Stub these calls due to being expensive operations
     # It can be reenabled for specific tests via:
     #
-    # allow(DetectRepositoryLanguagesWorker).to receive(:perform_async).and_call_original
-    # allow(Gitlab::Git::KeepAround).to receive(:execute).and_call_original
-    allow(DetectRepositoryLanguagesWorker).to receive(:perform_async).and_return(true)
+    # expect(Gitlab::Git::KeepAround).to receive(:execute).and_call_original
     allow(Gitlab::Git::KeepAround).to receive(:execute)
 
+    # Clear thread cache and Sidekiq queues
     Gitlab::ThreadMemoryCache.cache_backend.clear
+    Sidekiq::Worker.clear_all
 
     # Temporary patch to force admin mode to be active by default in tests when
     # using the feature flag :user_mode_in_session, since this will require
@@ -217,11 +227,14 @@ RSpec.configure do |config|
     RequestStore.clear!
   end
 
-  config.after do
-    Fog.unmock! if Fog.mock?
+  config.around do |example|
+    # Wrap each example in it's own context to make sure the contexts don't
+    # leak
+    Labkit::Context.with_context { example.run }
   end
 
   config.after do
+    Fog.unmock! if Fog.mock?
     Gitlab::CurrentSettings.clear_in_memory_application_settings!
   end
 
@@ -236,90 +249,6 @@ RSpec.configure do |config|
     Gitlab::Metrics.reset_registry!
   end
 
-  config.around(:each, :use_clean_rails_memory_store_caching) do |example|
-    caching_store = Rails.cache
-    Rails.cache = ActiveSupport::Cache::MemoryStore.new
-
-    example.run
-
-    Rails.cache = caching_store
-  end
-
-  config.around do |example|
-    # Wrap each example in it's own context to make sure the contexts don't
-    # leak
-    Labkit::Context.with_context { example.run }
-  end
-
-  config.around(:each, :clean_gitlab_redis_cache) do |example|
-    redis_cache_cleanup!
-
-    example.run
-
-    redis_cache_cleanup!
-  end
-
-  config.around(:each, :clean_gitlab_redis_shared_state) do |example|
-    redis_shared_state_cleanup!
-
-    example.run
-
-    redis_shared_state_cleanup!
-  end
-
-  config.around(:each, :clean_gitlab_redis_queues) do |example|
-    redis_queues_cleanup!
-
-    example.run
-
-    redis_queues_cleanup!
-  end
-
-  config.around(:each, :use_clean_rails_memory_store_fragment_caching) do |example|
-    caching_store = ActionController::Base.cache_store
-    ActionController::Base.cache_store = ActiveSupport::Cache::MemoryStore.new
-    ActionController::Base.perform_caching = true
-
-    example.run
-
-    ActionController::Base.perform_caching = false
-    ActionController::Base.cache_store = caching_store
-  end
-
-  config.around(:each, :use_sql_query_cache) do |example|
-    ActiveRecord::Base.cache do
-      example.run
-    end
-  end
-
-  # The :each scope runs "inside" the example, so this hook ensures the DB is in the
-  # correct state before any examples' before hooks are called. This prevents a
-  # problem where `ScheduleIssuesClosedAtTypeChange` (or any migration that depends
-  # on background migrations being run inline during test setup) can be broken by
-  # altering Sidekiq behavior in an unrelated spec like so:
-  #
-  # around do |example|
-  #   Sidekiq::Testing.fake! do
-  #     example.run
-  #   end
-  # end
-  config.before(:context, :migration) do
-    schema_migrate_down!
-  end
-
-  # Each example may call `migrate!`, so we must ensure we are migrated down every time
-  config.before(:each, :migration) do
-    use_fake_application_settings
-
-    schema_migrate_down!
-  end
-
-  config.after(:context, :migration) do
-    schema_migrate_up!
-
-    Gitlab::CurrentSettings.clear_in_memory_application_settings!
-  end
-
   # This makes sure the `ApplicationController#can?` method is stubbed with the
   # original implementation for all view specs.
   config.before(:each, type: :view) do
@@ -327,60 +256,8 @@ RSpec.configure do |config|
       Ability.allowed?(*args)
     end
   end
-
-  config.before(:each, :http_pages_enabled) do |_|
-    allow(Gitlab.config.pages).to receive(:external_http).and_return(['1.1.1.1:80'])
-  end
-
-  config.before(:each, :https_pages_enabled) do |_|
-    allow(Gitlab.config.pages).to receive(:external_https).and_return(['1.1.1.1:443'])
-  end
-
-  config.before(:each, :http_pages_disabled) do |_|
-    allow(Gitlab.config.pages).to receive(:external_http).and_return(false)
-  end
-
-  config.before(:each, :https_pages_disabled) do |_|
-    allow(Gitlab.config.pages).to receive(:external_https).and_return(false)
-  end
-
-  # We can't use an `around` hook here because the wrapping transaction
-  # is not yet opened at the time that is triggered
-  config.prepend_before do
-    Gitlab::Database.set_open_transactions_baseline
-  end
-
-  config.append_after do
-    Gitlab::Database.reset_open_transactions_baseline
-  end
 end
 
-# add simpler way to match asset paths containing digest strings
-RSpec::Matchers.define :match_asset_path do |expected|
-  match do |actual|
-    path = Regexp.escape(expected)
-    extname = Regexp.escape(File.extname(expected))
-    digest_regex = Regexp.new(path.sub(extname, "(?:-\\h+)?#{extname}") << '$')
-    digest_regex =~ actual
-  end
-
-  failure_message do |actual|
-    "expected that #{actual} would include an asset path for #{expected}"
-  end
-
-  failure_message_when_negated do |actual|
-    "expected that #{actual} would not include an asset path for  #{expected}"
-  end
-end
-
-FactoryBot::SyntaxRunner.class_eval do
-  include RSpec::Mocks::ExampleMethods
-end
-
-# Use FactoryBot 4.x behavior:
-# https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#associations
-FactoryBot.use_parent_strategy = false
-
 ActiveRecord::Migration.maintain_test_schema!
 
 Shoulda::Matchers.configure do |config|

spec/support/caching.rb

+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.around(:each, :use_clean_rails_memory_store_caching) do |example|
+    caching_store = Rails.cache
+    Rails.cache = ActiveSupport::Cache::MemoryStore.new
+
+    example.run
+
+    Rails.cache = caching_store
+  end
+
+  config.around(:each, :use_clean_rails_memory_store_fragment_caching) do |example|
+    caching_store = ActionController::Base.cache_store
+    ActionController::Base.cache_store = ActiveSupport::Cache::MemoryStore.new
+    ActionController::Base.perform_caching = true
+
+    example.run
+
+    ActionController::Base.perform_caching = false
+    ActionController::Base.cache_store = caching_store
+  end
+
+  config.around(:each, :use_sql_query_cache) do |example|
+    ActiveRecord::Base.cache do
+      example.run
+    end
+  end
+end

spec/support/factory_bot.rb

+# frozen_string_literal: true
+
+FactoryBot::SyntaxRunner.class_eval do
+  include RSpec::Mocks::ExampleMethods
+end
+
+# Use FactoryBot 4.x behavior:
+# https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#associations
+FactoryBot.use_parent_strategy = false

spec/support/matchers/match_asset_path.rb

+# frozen_string_literal: true
+
+# add simpler way to match asset paths containing digest strings
+RSpec::Matchers.define :match_asset_path do |expected|
+  match do |actual|
+    path = Regexp.escape(expected)
+    extname = Regexp.escape(File.extname(expected))
+    digest_regex = Regexp.new(path.sub(extname, "(?:-\\h+)?#{extname}") << '$')
+    digest_regex =~ actual
+  end
+
+  failure_message do |actual|
+    "expected that #{actual} would include an asset path for #{expected}"
+  end
+
+  failure_message_when_negated do |actual|
+    "expected that #{actual} would not include an asset path for  #{expected}"
+  end
+end

spec/support/migration.rb

+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  # The :each scope runs "inside" the example, so this hook ensures the DB is in the
+  # correct state before any examples' before hooks are called. This prevents a
+  # problem where `ScheduleIssuesClosedAtTypeChange` (or any migration that depends
+  # on background migrations being run inline during test setup) can be broken by
+  # altering Sidekiq behavior in an unrelated spec like so:
+  #
+  # around do |example|
+  #   Sidekiq::Testing.fake! do
+  #     example.run
+  #   end
+  # end
+  config.before(:context, :migration) do
+    schema_migrate_down!
+  end
+
+  # Each example may call `migrate!`, so we must ensure we are migrated down every time
+  config.before(:each, :migration) do
+    use_fake_application_settings
+
+    schema_migrate_down!
+  end
+
+  config.after(:context, :migration) do
+    schema_migrate_up!
+
+    Gitlab::CurrentSettings.clear_in_memory_application_settings!
+  end
+end

spec/support/pages.rb

+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.before(:each, :http_pages_enabled) do |_|
+    allow(Gitlab.config.pages).to receive(:external_http).and_return(['1.1.1.1:80'])
+  end
+
+  config.before(:each, :https_pages_enabled) do |_|
+    allow(Gitlab.config.pages).to receive(:external_https).and_return(['1.1.1.1:443'])
+  end
+
+  config.before(:each, :http_pages_disabled) do |_|
+    allow(Gitlab.config.pages).to receive(:external_http).and_return(false)
+  end
+
+  config.before(:each, :https_pages_disabled) do |_|
+    allow(Gitlab.config.pages).to receive(:external_https).and_return(false)
+  end
+end

spec/support/redis.rb

+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.after(:each, :redis) do
+    Sidekiq.redis do |connection|
+      connection.redis.flushdb
+    end
+  end
+
+  config.around(:each, :clean_gitlab_redis_cache) do |example|
+    redis_cache_cleanup!
+
+    example.run
+
+    redis_cache_cleanup!
+  end
+
+  config.around(:each, :clean_gitlab_redis_shared_state) do |example|
+    redis_shared_state_cleanup!
+
+    example.run
+
+    redis_shared_state_cleanup!
+  end
+
+  config.around(:each, :clean_gitlab_redis_queues) do |example|
+    redis_queues_cleanup!
+
+    example.run
+
+    redis_queues_cleanup!
+  end
+end

spec/support/sidekiq.rb

 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  config.around(:each, :sidekiq) do |example|
-    Sidekiq::Worker.clear_all
-    example.run
-    Sidekiq::Worker.clear_all
-  end
-
-  config.after(:each, :sidekiq, :redis) do
-    Sidekiq.redis do |connection|
-      connection.redis.flushdb
-    end
-  end
-
   # As we'll review the examples with this tag, we should either:
   # - fix the example to not require Sidekiq inline mode (and remove this tag)
   # - explicitly keep the inline mode and change the tag for `:sidekiq_inline` instead
   config.around(:example, :sidekiq_might_not_need_inline) do |example|
-    Sidekiq::Worker.clear_all
     Sidekiq::Testing.inline! { example.run }
-    Sidekiq::Worker.clear_all
   end
 
   config.around(:example, :sidekiq_inline) do |example|
-    Sidekiq::Worker.clear_all
     Sidekiq::Testing.inline! { example.run }
-    Sidekiq::Worker.clear_all
   end
 end

spec/tasks/gitlab/import_export/import_rake_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rake_helper'
 
-describe 'gitlab:import_export:import rake task', :sidekiq do
+describe 'gitlab:import_export:import rake task' do
   let(:username) { 'root' }
   let(:namespace_path) { username }
   let!(:user) { create(:user, username: username) }

spec/tasks/gitlab/storage_rake_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rake_helper'
 
-describe 'rake gitlab:storage:*', :sidekiq do
+describe 'rake gitlab:storage:*' do
   before do
     Rake.application.rake_require 'tasks/gitlab/storage'
 

spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ObjectStorage::MigrateUploadsWorker, :sidekiq do
+describe ObjectStorage::MigrateUploadsWorker do
   shared_context 'sanity_check! fails' do
     before do
       expect(described_class).to receive(:sanity_check!).and_raise(described_class::SanityCheckError)

spec/workers/background_migration_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BackgroundMigrationWorker, :sidekiq, :clean_gitlab_redis_shared_state do
+describe BackgroundMigrationWorker, :clean_gitlab_redis_shared_state do
   let(:worker) { described_class.new }
 
   describe '.minimum_interval' do

spec/workers/mail_scheduler/notification_service_worker_spec.rb

@@ -49,7 +49,7 @@ describe MailScheduler::NotificationServiceWorker do
     end
   end
 
-  describe '.perform_async', :sidekiq do
+  describe '.perform_async' do
     around do |example|
       Sidekiq::Testing.fake! { example.run }
     end