Merge branch '220018-rspec-zero-monkey-patching-mode-12' into 'master'

RSpec zero monkey patching mode

See merge request gitlab-org/gitlab!33733

ee/spec/workers/geo/design_repository_sync_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::DesignRepositorySyncWorker, :geo do
+RSpec.describe Geo::DesignRepositorySyncWorker, :geo do
   describe '#perform' do
     it 'runs DesignRepositorySyncService' do
       project = create(:project)

ee/spec/workers/geo/event_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geo::EventWorker, :geo do
+RSpec.describe Geo::EventWorker, :geo do
   describe "#perform" do
     it "calls Geo::EventService" do
       args = ["package_file", "created", { "model_record_id" => 1 }]

ee/spec/workers/geo/file_download_dispatch_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::FileDownloadDispatchWorker, :geo, :geo_fdw, :use_sql_query_cache_for_tracking_db do
+RSpec.describe Geo::FileDownloadDispatchWorker, :geo, :geo_fdw, :use_sql_query_cache_for_tracking_db do
   include ::EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/file_download_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::FileDownloadWorker, :geo do
+RSpec.describe Geo::FileDownloadWorker, :geo do
   describe '#perform' do
     it 'instantiates and executes FileDownloadService' do
       service = double(:service)

ee/spec/workers/geo/migrated_local_files_clean_up_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::MigratedLocalFilesCleanUpWorker, :geo, :geo_fdw, :use_sql_query_cache_for_tracking_db do
+RSpec.describe Geo::MigratedLocalFilesCleanUpWorker, :geo, :geo_fdw, :use_sql_query_cache_for_tracking_db do
   include ::EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/prune_event_log_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::PruneEventLogWorker, :geo do
+RSpec.describe Geo::PruneEventLogWorker, :geo do
   include ::EE::GeoHelpers
 
   subject(:worker) { described_class.new }

ee/spec/workers/geo/repositories_clean_up_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoriesCleanUpWorker, :geo, :geo_fdw do
+RSpec.describe Geo::RepositoriesCleanUpWorker, :geo, :geo_fdw do
   include ::EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/repository_cleanup_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoryCleanupWorker, :geo do
+RSpec.describe Geo::RepositoryCleanupWorker, :geo do
   include ::EE::GeoHelpers
 
   describe '#perform' do

ee/spec/workers/geo/repository_shard_sync_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoryShardSyncWorker, :geo, :geo_fdw, :clean_gitlab_redis_cache, :use_sql_query_cache_for_tracking_db do
+RSpec.describe Geo::RepositoryShardSyncWorker, :geo, :geo_fdw, :clean_gitlab_redis_cache, :use_sql_query_cache_for_tracking_db do
   include ::EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/repository_sync_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositorySyncWorker, :geo, :clean_gitlab_redis_cache do
+RSpec.describe Geo::RepositorySyncWorker, :geo, :clean_gitlab_redis_cache do
   include ::EE::GeoHelpers
 
   let!(:primary) { create(:geo_node, :primary) }

ee/spec/workers/geo/repository_verification/primary/batch_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoryVerification::Primary::BatchWorker, :clean_gitlab_redis_cache do
+RSpec.describe Geo::RepositoryVerification::Primary::BatchWorker, :clean_gitlab_redis_cache do
   include ::EE::GeoHelpers
 
   let_it_be(:healthy_not_verified) { create(:project) }

ee/spec/workers/geo/repository_verification/primary/shard_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoryVerification::Primary::ShardWorker, :clean_gitlab_redis_cache do
+RSpec.describe Geo::RepositoryVerification::Primary::ShardWorker, :clean_gitlab_redis_cache do
   include ::EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/repository_verification/primary/single_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoryVerification::Primary::SingleWorker, :clean_gitlab_redis_cache do
+RSpec.describe Geo::RepositoryVerification::Primary::SingleWorker, :clean_gitlab_redis_cache do
   include ::EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/repository_verification/secondary/scheduler_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoryVerification::Secondary::SchedulerWorker, :clean_gitlab_redis_cache do
+RSpec.describe Geo::RepositoryVerification::Secondary::SchedulerWorker, :clean_gitlab_redis_cache do
   include ::EE::GeoHelpers
 
   let_it_be(:healthy_not_verified) { create(:project) }

ee/spec/workers/geo/repository_verification/secondary/shard_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoryVerification::Secondary::ShardWorker, :geo, :geo_fdw, :request_store, :clean_gitlab_redis_cache, :use_sql_query_cache_for_tracking_db do
+RSpec.describe Geo::RepositoryVerification::Secondary::ShardWorker, :geo, :geo_fdw, :request_store, :clean_gitlab_redis_cache, :use_sql_query_cache_for_tracking_db do
   include ::EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/repository_verification/secondary/single_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::RepositoryVerification::Secondary::SingleWorker, :clean_gitlab_redis_cache do
+RSpec.describe Geo::RepositoryVerification::Secondary::SingleWorker, :clean_gitlab_redis_cache do
   include ::EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/scheduler/per_shard_scheduler_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::Scheduler::PerShardSchedulerWorker do
+RSpec.describe Geo::Scheduler::PerShardSchedulerWorker do
   it 'includes ApplicationWorker' do
     expect(described_class).to include_module(ApplicationWorker)
   end

ee/spec/workers/geo/scheduler/scheduler_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::Scheduler::SchedulerWorker, :geo do
+RSpec.describe Geo::Scheduler::SchedulerWorker, :geo do
   subject { described_class.new }
 
   it 'includes ::Gitlab::Geo::LogHelpers' do

ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::Secondary::RegistryConsistencyWorker, :geo, :geo_fdw do
+RSpec.describe Geo::Secondary::RegistryConsistencyWorker, :geo, :geo_fdw do
   include EE::GeoHelpers
   include ExclusiveLeaseHelpers
 

ee/spec/workers/geo/secondary/repository_backfill_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::Secondary::RepositoryBackfillWorker, :geo, :geo_fdw, :clean_gitlab_redis_cache do
+RSpec.describe Geo::Secondary::RepositoryBackfillWorker, :geo, :geo_fdw, :clean_gitlab_redis_cache do
   include EE::GeoHelpers
 
   let(:primary) { create(:geo_node, :primary) }

ee/spec/workers/geo/sidekiq_cron_config_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Geo::SidekiqCronConfigWorker do
+RSpec.describe Geo::SidekiqCronConfigWorker do
   describe '#perform' do
     it 'runs the cron manager' do
       manager = double('cron_manager')

ee/spec/workers/geo_repository_destroy_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GeoRepositoryDestroyWorker do
+RSpec.describe GeoRepositoryDestroyWorker do
   describe '#perform' do
     it 'delegates project removal to Geo::RepositoryDestroyService' do
       project = create(:project)

ee/spec/workers/historical_data_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HistoricalDataWorker do
+RSpec.describe HistoricalDataWorker do
   subject { described_class.new }
 
   describe '#perform' do

ee/spec/workers/import_software_licenses_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ImportSoftwareLicensesWorker do
+RSpec.describe ImportSoftwareLicensesWorker do
   let(:catalogue) { build(:spdx_catalogue) }
   let(:spdx_apache_license) { build(:spdx_license, :apache_1) }
   let(:spdx_bsd_license) { build(:spdx_license, :bsd) }

ee/spec/workers/jira_connect/sync_branch_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe JiraConnect::SyncBranchWorker do
+RSpec.describe JiraConnect::SyncBranchWorker do
   describe '#perform' do
     let_it_be(:project) { create(:project, :repository) }
     let(:project_id) { project.id }

ee/spec/workers/jira_connect/sync_merge_request_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe JiraConnect::SyncMergeRequestWorker do
+RSpec.describe JiraConnect::SyncMergeRequestWorker do
   describe '#perform' do
     let(:merge_request) { create(:merge_request) }
     let(:merge_request_id) { merge_request.id }

ee/spec/workers/ldap_all_groups_sync_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LdapAllGroupsSyncWorker do
+RSpec.describe LdapAllGroupsSyncWorker do
   let(:subject) { described_class.new }
 
   before do

ee/spec/workers/ldap_group_sync_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LdapGroupSyncWorker do
+RSpec.describe LdapGroupSyncWorker do
   include LdapHelpers
   let(:subject) { described_class.new }
   let(:group) { create(:group) }

ee/spec/workers/ldap_sync_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LdapSyncWorker do
+RSpec.describe LdapSyncWorker do
   let(:subject) { described_class.new }
 
   before do

ee/spec/workers/new_epic_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe NewEpicWorker do
+RSpec.describe NewEpicWorker do
   describe '#perform' do
     let(:worker) { described_class.new }
 

ee/spec/workers/post_receive_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PostReceive do
+RSpec.describe PostReceive do
   let(:changes) { "123456 789012 refs/heads/tést\n654321 210987 refs/tags/tag" }
   let(:changes_with_master) { "#{changes}\n423423 797823 refs/heads/master" }
   let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") }

ee/spec/workers/project_cache_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectCacheWorker do
+RSpec.describe ProjectCacheWorker do
   let(:worker) { described_class.new }
   let(:project) { create(:project, :repository) }
 

ee/spec/workers/project_import_schedule_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectImportScheduleWorker do
+RSpec.describe ProjectImportScheduleWorker do
   describe '#perform' do
     it 'does nothing if the database is read-only' do
       project = create(:project)

ee/spec/workers/purge_dependency_proxy_cache_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PurgeDependencyProxyCacheWorker do
+RSpec.describe PurgeDependencyProxyCacheWorker do
   let_it_be(:user) { create(:admin) }
   let_it_be(:blob) { create(:dependency_proxy_blob )}
   let_it_be(:group) { blob.group }

ee/spec/workers/refresh_license_compliance_checks_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RefreshLicenseComplianceChecksWorker do
+RSpec.describe RefreshLicenseComplianceChecksWorker do
   subject { described_class.new }
 
   describe '#perform' do

ee/spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RemoveUnreferencedLfsObjectsWorker do
+RSpec.describe RemoveUnreferencedLfsObjectsWorker do
   include EE::GeoHelpers
 
   describe '#perform' do

ee/spec/workers/repository_import_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RepositoryImportWorker do
+RSpec.describe RepositoryImportWorker do
   let(:project) { create(:project, :import_scheduled) }
 
   it 'updates the error on custom project template Import/Export' do

ee/spec/workers/repository_push_audit_event_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RepositoryPushAuditEventWorker do
+RSpec.describe RepositoryPushAuditEventWorker do
   describe '#perform' do
     let(:project) { create(:project, :repository) }
     let(:user) { create(:user) }

ee/spec/workers/repository_update_mirror_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RepositoryUpdateMirrorWorker do
+RSpec.describe RepositoryUpdateMirrorWorker do
   describe '#perform' do
     let(:jid) { '12345678' }
     let!(:project) { create(:project) }

ee/spec/workers/service_desk_email_receiver_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe ServiceDeskEmailReceiverWorker, :mailer do
+RSpec.describe ServiceDeskEmailReceiverWorker, :mailer do
   describe '#perform' do
     let(:worker) { described_class.new }
     let(:email) { fixture_file('emails/service_desk_custom_address.eml', dir: 'ee') }

ee/spec/workers/status_page/publish_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StatusPage::PublishWorker do
+RSpec.describe StatusPage::PublishWorker do
   include ExclusiveLeaseHelpers
 
   let_it_be(:user) { create(:user) }

ee/spec/workers/store_security_reports_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StoreSecurityReportsWorker do
+RSpec.describe StoreSecurityReportsWorker do
   describe '#perform' do
     let(:group)   { create(:group) }
     let(:project) { create(:project, namespace: group) }

ee/spec/workers/store_security_scans_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StoreSecurityScansWorker do
+RSpec.describe StoreSecurityScansWorker do
   describe '#perform' do
     context 'build has security reports' do
       let(:build) { create(:ci_build, :dast) }

ee/spec/workers/sync_seat_link_request_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SyncSeatLinkRequestWorker, type: :worker do
+RSpec.describe SyncSeatLinkRequestWorker, type: :worker do
   describe '#perform' do
     subject do
       described_class.new.perform('2020-01-01', '123', 5, 4)

ee/spec/workers/sync_seat_link_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SyncSeatLinkWorker, type: :worker do
+RSpec.describe SyncSeatLinkWorker, type: :worker do
   describe '#perform' do
     context 'when current, paid license is active' do
       let(:utc_time) { Time.utc(2020, 3, 12, 12, 00) }

ee/spec/workers/sync_security_reports_to_report_approval_rules_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SyncSecurityReportsToReportApprovalRulesWorker do
+RSpec.describe SyncSecurityReportsToReportApprovalRulesWorker do
   describe '#perform' do
     let(:pipeline) { double(:pipeline, id: 42) }
     let(:sync_service) { double(:service, execute: true) }

ee/spec/workers/update_all_mirrors_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UpdateAllMirrorsWorker do
+RSpec.describe UpdateAllMirrorsWorker do
   include ExclusiveLeaseHelpers
 
   subject(:worker) { described_class.new }

ee/spec/workers/update_max_seats_used_for_gitlab_com_subscriptions_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UpdateMaxSeatsUsedForGitlabComSubscriptionsWorker do
+RSpec.describe UpdateMaxSeatsUsedForGitlabComSubscriptionsWorker do
   subject { described_class.new }
 
   let!(:user)                { create(:user) }

spec/bin/changelog_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 load File.expand_path('../../bin/changelog', __dir__)
 
-describe 'bin/changelog' do
+RSpec.describe 'bin/changelog' do
   let(:options) { OpenStruct.new(title: 'Test title', type: 'fixed', dry_run: true) }
 
   describe ChangelogEntry do

spec/bin/sidekiq_cluster_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'shellwords'
 
-describe 'bin/sidekiq-cluster' do
+RSpec.describe 'bin/sidekiq-cluster' do
   using RSpec::Parameterized::TableSyntax
 
   context 'when selecting some queues and excluding others' do

spec/channels/application_cable/connection_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
+RSpec.describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
   let(:session_id) { Rack::Session::SessionId.new('6919a6f1bb119dd7396fadc38fd18d0d') }
 
   before do

spec/channels/issues_channel_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuesChannel do
+RSpec.describe IssuesChannel do
   let_it_be(:issue) { create(:issue) }
 
   it 'rejects when project path is invalid' do

spec/config/application_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Application do # rubocop:disable RSpec/FilePath
+RSpec.describe Gitlab::Application do # rubocop:disable RSpec/FilePath
   using RSpec::Parameterized::TableSyntax
 
   filtered_param = ActiveSupport::ParameterFilter::FILTERED

spec/config/mail_room_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'mail_room.yml' do
+RSpec.describe 'mail_room.yml' do
   include StubENV
 
   let(:mailroom_config_path) { 'config/mail_room.yml' }

spec/config/object_store_settings_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('config', 'object_store_settings.rb')
 
-describe ObjectStoreSettings do
+RSpec.describe ObjectStoreSettings do
   describe '.parse' do
     it 'sets correct default values' do
       settings = described_class.parse(nil)

spec/config/settings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Settings do
+RSpec.describe Settings do
   describe 'omniauth' do
     it 'defaults to enabled' do
       expect(described_class.omniauth.enabled).to be true

spec/config/smime_signature_settings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SmimeSignatureSettings do
+RSpec.describe SmimeSignatureSettings do
   describe '.parse' do
     let(:default_smime_key) { Rails.root.join('.gitlab_smime_key') }
     let(:default_smime_cert) { Rails.root.join('.gitlab_smime_cert') }

spec/controllers/abuse_reports_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AbuseReportsController do
+RSpec.describe AbuseReportsController do
   let(:reporter) { create(:user) }
   let(:user)     { create(:user) }
   let(:attrs) do

spec/controllers/acme_challenges_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AcmeChallengesController do
+RSpec.describe AcmeChallengesController do
   describe '#show' do
     let!(:acme_order) { create(:pages_domain_acme_order) }
 

spec/controllers/admin/appearances_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::AppearancesController do
+RSpec.describe Admin::AppearancesController do
   let(:admin) { create(:admin) }
   let(:header_message) { 'Header message' }
   let(:footer_message) { 'Footer' }

spec/controllers/admin/application_settings_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ApplicationSettingsController do
+RSpec.describe Admin::ApplicationSettingsController do
   include StubENV
   include UsageDataHelpers
 

spec/controllers/admin/applications_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ApplicationsController do
+RSpec.describe Admin::ApplicationsController do
   let(:admin) { create(:admin) }
   let(:application) { create(:oauth_application, owner_id: nil, owner_type: nil) }
 

spec/controllers/admin/ci/variables_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Ci::VariablesController do
+RSpec.describe Admin::Ci::VariablesController do
   let_it_be(:variable) { create(:ci_instance_variable) }
 
   before do

spec/controllers/admin/clusters/applications_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Clusters::ApplicationsController do
+RSpec.describe Admin::Clusters::ApplicationsController do
   include AccessMatchersForController
 
   def current_application

spec/controllers/admin/clusters_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ClustersController do
+RSpec.describe Admin::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
 

spec/controllers/admin/dashboard_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::DashboardController do
+RSpec.describe Admin::DashboardController do
   describe '#index' do
     context 'with pending_delete projects' do
       render_views

spec/controllers/admin/gitaly_servers_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::GitalyServersController do
+RSpec.describe Admin::GitalyServersController do
   describe '#index' do
     before do
       sign_in(create(:admin))

spec/controllers/admin/groups_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::GroupsController do
+RSpec.describe Admin::GroupsController do
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
   let(:admin) { create(:admin) }

spec/controllers/admin/health_check_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::HealthCheckController do
+RSpec.describe Admin::HealthCheckController do
   let(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/hooks_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::HooksController do
+RSpec.describe Admin::HooksController do
   let(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/identities_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::IdentitiesController do
+RSpec.describe Admin::IdentitiesController do
   let(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/impersonations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ImpersonationsController do
+RSpec.describe Admin::ImpersonationsController do
   let(:impersonator) { create(:admin) }
   let(:user) { create(:user) }
 

spec/controllers/admin/integrations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::IntegrationsController do
+RSpec.describe Admin::IntegrationsController do
   let(:admin) { create(:admin) }
   let(:integration) { create(:jira_service, :instance) }
 

spec/controllers/admin/projects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ProjectsController do
+RSpec.describe Admin::ProjectsController do
   let!(:project) { create(:project, :public) }
 
   before do

spec/controllers/admin/requests_profiles_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::RequestsProfilesController do
+RSpec.describe Admin::RequestsProfilesController do
   let_it_be(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/runners_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::RunnersController do
+RSpec.describe Admin::RunnersController do
   let_it_be(:runner) { create(:ci_runner) }
 
   before do

spec/controllers/admin/serverless/domains_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Serverless::DomainsController do
+RSpec.describe Admin::Serverless::DomainsController do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
 

spec/controllers/admin/services_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ServicesController do
+RSpec.describe Admin::ServicesController do
   let(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/sessions_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SessionsController, :do_not_mock_admin_mode do
+RSpec.describe Admin::SessionsController, :do_not_mock_admin_mode do
   include_context 'custom session'
 
   let(:user) { create(:user) }

spec/controllers/admin/spam_logs_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SpamLogsController do
+RSpec.describe Admin::SpamLogsController do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
   let!(:first_spam) { create(:spam_log, user: user) }

spec/controllers/admin/users_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::UsersController do
+RSpec.describe Admin::UsersController do
   let(:user) { create(:user) }
 
   let_it_be(:admin) { create(:admin) }

spec/controllers/application_controller_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe ApplicationController do
+RSpec.describe ApplicationController do
   include TermsHelper
 
   let(:user) { create(:user) }

spec/controllers/autocomplete_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AutocompleteController do
+RSpec.describe AutocompleteController do
   let(:project) { create(:project) }
   let(:user) { project.owner }
 

spec/controllers/boards/issues_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Boards::IssuesController do
+RSpec.describe Boards::IssuesController do
   include ExternalAuthorizationServiceHelpers
 
   let(:project) { create(:project, :private) }

spec/controllers/boards/lists_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Boards::ListsController do
+RSpec.describe Boards::ListsController do
   let(:project) { create(:project) }
   let(:board)   { create(:board, project: project) }
   let(:user)    { create(:user) }

spec/controllers/chaos_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ChaosController do
+RSpec.describe ChaosController do
   describe '#leakmem' do
     it 'calls synchronously' do
       expect(Gitlab::Chaos).to receive(:leak_mem).with(100, 30.seconds)

spec/controllers/concerns/boards_responses_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BoardsResponses do
+RSpec.describe BoardsResponses do
   let(:controller_class) do
     Class.new do
       include BoardsResponses

spec/controllers/concerns/checks_collaboration_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ChecksCollaboration do
+RSpec.describe ChecksCollaboration do
   include ProjectForksHelper
 
   let(:helper) do

spec/controllers/concerns/confirm_email_warning_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ConfirmEmailWarning do
+RSpec.describe ConfirmEmailWarning do
   before do
     stub_feature_flags(soft_email_confirmation: true)
   end

spec/controllers/concerns/continue_params_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContinueParams do
+RSpec.describe ContinueParams do
   let(:controller_class) do
     Class.new(ActionController::Base) do
       include ContinueParams

spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ControllerWithCrossProjectAccessCheck do
+RSpec.describe ControllerWithCrossProjectAccessCheck do
   let(:user) { create(:user) }
 
   before do

spec/controllers/concerns/enforces_admin_authentication_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnforcesAdminAuthentication do
+RSpec.describe EnforcesAdminAuthentication do
   include AdminModeHelper
 
   let(:user) { create(:user) }

spec/controllers/concerns/group_tree_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupTree do
+RSpec.describe GroupTree do
   let(:group) { create(:group, :public) }
   let(:user) { create(:user) }
 

spec/controllers/concerns/import_url_params_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ImportUrlParams do
+RSpec.describe ImportUrlParams do
   let(:import_url_params) do
     controller = OpenStruct.new(params: params).extend(described_class)
     controller.import_url_params

spec/controllers/concerns/internal_redirect_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InternalRedirect do
+RSpec.describe InternalRedirect do
   let(:controller_class) do
     Class.new do
       include InternalRedirect

spec/controllers/concerns/issuable_actions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuableActions do
+RSpec.describe IssuableActions do
   let(:project) { double('project') }
   let(:user) { double('user') }
   let(:issuable) { double('issuable') }

spec/controllers/concerns/issuable_collections_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuableCollections do
+RSpec.describe IssuableCollections do
   let(:user) { create(:user) }
 
   let(:controller) do

spec/controllers/concerns/lfs_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LfsRequest do
+RSpec.describe LfsRequest do
   include ProjectForksHelper
 
   controller(Repositories::GitHttpClientController) do

spec/controllers/concerns/metrics_dashboard_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MetricsDashboard do
+RSpec.describe MetricsDashboard do
   include MetricsDashboardHelpers
 
   describe 'GET #metrics_dashboard' do

spec/controllers/concerns/page_limiter_spec.rb

@@ -14,7 +14,7 @@ class PageLimiterSpecController < ApplicationController
   end
 end
 
-describe PageLimiter do
+RSpec.describe PageLimiter do
   let(:controller_class) do
     PageLimiterSpecController
   end

spec/controllers/concerns/project_unauthorized_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectUnauthorized do
+RSpec.describe ProjectUnauthorized do
   include ExternalAuthorizationServiceHelpers
   let(:user) { create(:user) }
 

spec/controllers/concerns/redirects_for_missing_path_on_tree_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RedirectsForMissingPathOnTree, type: :controller do
+RSpec.describe RedirectsForMissingPathOnTree, type: :controller do
   controller(ActionController::Base) do
     include Gitlab::Routing.url_helpers
     include RedirectsForMissingPathOnTree

spec/controllers/concerns/renders_commits_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RendersCommits do
+RSpec.describe RendersCommits do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
   let_it_be(:user) { create(:user) }

spec/controllers/concerns/routable_actions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RoutableActions do
+RSpec.describe RoutableActions do
   controller(::ApplicationController) do
     include RoutableActions
 

spec/controllers/concerns/send_file_upload_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SendFileUpload do
+RSpec.describe SendFileUpload do
   let(:uploader_class) do
     Class.new(GitlabUploader) do
       include ObjectStorage::Concern

spec/controllers/concerns/sorting_preference_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SortingPreference do
+RSpec.describe SortingPreference do
   let(:user) { create(:user) }
 
   let(:controller_class) do

spec/controllers/concerns/sourcegraph_decorator_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SourcegraphDecorator do
+RSpec.describe SourcegraphDecorator do
   let_it_be(:enabled_user) { create(:user, sourcegraph_enabled: true) }
   let_it_be(:disabled_user) { create(:user, sourcegraph_enabled: false) }
   let_it_be(:public_project) { create(:project, :public) }

spec/controllers/concerns/static_object_external_storage_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StaticObjectExternalStorage do
+RSpec.describe StaticObjectExternalStorage do
   controller(Projects::ApplicationController) do
     include StaticObjectExternalStorage
 

spec/controllers/dashboard/groups_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::GroupsController do
+RSpec.describe Dashboard::GroupsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }

spec/controllers/dashboard/labels_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::LabelsController do
+RSpec.describe Dashboard::LabelsController do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
   let!(:label)  { create(:label, project: project) }

spec/controllers/dashboard/milestones_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::MilestonesController do
+RSpec.describe Dashboard::MilestonesController do
   let(:project) { create(:project) }
   let(:group) { create(:group) }
   let(:user) { create(:user) }

spec/controllers/dashboard/projects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::ProjectsController do
+RSpec.describe Dashboard::ProjectsController do
   include ExternalAuthorizationServiceHelpers
 
   describe '#index' do

spec/controllers/dashboard/snippets_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::SnippetsController do
+RSpec.describe Dashboard::SnippetsController do
   let(:user) { create(:user) }
 
   before do

spec/controllers/dashboard/todos_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::TodosController do
+RSpec.describe Dashboard::TodosController do
   let(:user) { create(:user) }
   let(:author)  { create(:user) }
   let(:project) { create(:project) }

spec/controllers/dashboard_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DashboardController do
+RSpec.describe DashboardController do
   context 'signed in' do
     let(:user) { create(:user) }
     let(:project) { create(:project) }

spec/controllers/explore/groups_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::GroupsController do
+RSpec.describe Explore::GroupsController do
   let(:user) { create(:user) }
 
   before do

spec/controllers/explore/projects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::ProjectsController do
+RSpec.describe Explore::ProjectsController do
   shared_examples 'explore projects' do
     describe 'GET #index.json' do
       render_views

spec/controllers/explore/snippets_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::SnippetsController do
+RSpec.describe Explore::SnippetsController do
   describe 'GET #index' do
     let!(:project_snippet) { create_list(:project_snippet, 3, :public) }
     let!(:personal_snippet) { create_list(:personal_snippet, 3, :public) }

spec/controllers/google_api/authorizations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GoogleApi::AuthorizationsController do
+RSpec.describe GoogleApi::AuthorizationsController do
   describe 'GET|POST #callback' do
     let(:user) { create(:user) }
     let(:token) { 'token' }

spec/controllers/graphql_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GraphqlController do
+RSpec.describe GraphqlController do
   include GraphqlHelpers
 
   before do

spec/controllers/groups/avatars_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::AvatarsController do
+RSpec.describe Groups::AvatarsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user)  { create(:user) }

spec/controllers/groups/boards_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::BoardsController do
+RSpec.describe Groups::BoardsController do
   let(:group) { create(:group) }
   let(:user)  { create(:user) }
 

spec/controllers/groups/children_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::ChildrenController do
+RSpec.describe Groups::ChildrenController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group, :public) }

spec/controllers/groups/clusters/applications_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Clusters::ApplicationsController do
+RSpec.describe Groups::Clusters::ApplicationsController do
   include AccessMatchersForController
 
   def current_application

spec/controllers/groups/clusters_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::ClustersController do
+RSpec.describe Groups::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
 

spec/controllers/groups/group_links_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::GroupLinksController do
+RSpec.describe Groups::GroupLinksController do
   let(:shared_with_group) { create(:group, :private) }
   let(:shared_group) { create(:group, :private) }
   let(:user) { create(:user) }

spec/controllers/groups/group_members_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::GroupMembersController do
+RSpec.describe Groups::GroupMembersController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }

spec/controllers/groups/labels_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::LabelsController do
+RSpec.describe Groups::LabelsController do
   let_it_be(:group) { create(:group) }
   let_it_be(:user)  { create(:user) }
   let_it_be(:project) { create(:project, namespace: group) }

spec/controllers/groups/milestones_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::MilestonesController do
+RSpec.describe Groups::MilestonesController do
   let(:group) { create(:group, :public) }
   let!(:project) { create(:project, :public, group: group) }
   let!(:project2) { create(:project, group: group) }

spec/controllers/groups/registry/repositories_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Registry::RepositoriesController do
+RSpec.describe Groups::Registry::RepositoriesController do
   let_it_be(:user)  { create(:user) }
   let_it_be(:guest) { create(:user) }
   let_it_be(:group, reload: true) { create(:group) }

spec/controllers/groups/runners_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::RunnersController do
+RSpec.describe Groups::RunnersController do
   let(:user)   { create(:user) }
   let(:group)  { create(:group) }
   let(:runner) { create(:ci_runner, :group, groups: [group]) }

spec/controllers/groups/settings/ci_cd_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::CiCdController do
+RSpec.describe Groups::Settings::CiCdController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group) }

spec/controllers/groups/settings/integrations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::IntegrationsController do
+RSpec.describe Groups::Settings::IntegrationsController do
   let_it_be(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:group) { create(:group) }

spec/controllers/groups/settings/repository_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::RepositoryController do
+RSpec.describe Groups::Settings::RepositoryController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group) }

spec/controllers/groups/shared_projects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::SharedProjectsController do
+RSpec.describe Groups::SharedProjectsController do
   def get_shared_projects(params = {})
     get :index, params: params.reverse_merge(format: :json, group_id: group.full_path)
   end

spec/controllers/groups/uploads_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::UploadsController do
+RSpec.describe Groups::UploadsController do
   include WorkhorseHelpers
 
   let(:model) { create(:group, :public) }

spec/controllers/groups/variables_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::VariablesController do
+RSpec.describe Groups::VariablesController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group) }

spec/controllers/groups_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupsController do
+RSpec.describe GroupsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }

spec/controllers/health_check_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HealthCheckController, :request_store do
+RSpec.describe HealthCheckController, :request_store do
   include StubENV
 
   let(:xml_response) { Hash.from_xml(response.body)['hash'] }

spec/controllers/help_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HelpController do
+RSpec.describe HelpController do
   let(:user) { create(:user) }
 
   before do

spec/controllers/ide_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IdeController do
+RSpec.describe IdeController do
   let(:user) { create(:user) }
 
   before do

spec/controllers/import/bitbucket_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::BitbucketController do
+RSpec.describe Import::BitbucketController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }

spec/controllers/import/bitbucket_server_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::BitbucketServerController do
+RSpec.describe Import::BitbucketServerController do
   let(:user) { create(:user) }
   let(:project_key) { 'test-project' }
   let(:repo_slug) { 'some-repo' }

spec/controllers/import/fogbugz_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::FogbugzController do
+RSpec.describe Import::FogbugzController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }

spec/controllers/import/gitea_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::GiteaController do
+RSpec.describe Import::GiteaController do
   include ImportSpecHelper
 
   let(:provider) { :gitea }

spec/controllers/import/github_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::GithubController do
+RSpec.describe Import::GithubController do
   include ImportSpecHelper
 
   let(:provider) { :github }

spec/controllers/import/gitlab_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::GitlabController do
+RSpec.describe Import::GitlabController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }

spec/controllers/import/google_code_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::GoogleCodeController do
+RSpec.describe Import::GoogleCodeController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }

spec/controllers/import/phabricator_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::PhabricatorController do
+RSpec.describe Import::PhabricatorController do
   let(:current_user) { create(:user) }
 
   before do

spec/controllers/instance_statistics/cohorts_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InstanceStatistics::CohortsController do
+RSpec.describe InstanceStatistics::CohortsController do
   let(:user) { create(:user) }
 
   before do