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

RSpec zero monkey patching mode

See merge request gitlab-org/gitlab!33724

ee/spec/lib/api/helpers/packages/dependency_proxy_helpers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Helpers::Packages::DependencyProxyHelpers do
+RSpec.describe API::Helpers::Packages::DependencyProxyHelpers do
   let_it_be(:helper) { Class.new.include(described_class).new }
 
   describe 'redirect_registry_request' do

ee/spec/lib/api/helpers/packages_helpers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Helpers::PackagesHelpers do
+RSpec.describe API::Helpers::PackagesHelpers do
   let_it_be(:helper) { Class.new.include(described_class).new }
   let_it_be(:project) { create(:project) }
 

ee/spec/lib/api/helpers/packages_manager_clients_helpers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Helpers::PackagesManagerClientsHelpers do
+RSpec.describe API::Helpers::PackagesManagerClientsHelpers do
   let_it_be(:personal_access_token) { create(:personal_access_token) }
   let_it_be(:username) { personal_access_token.user.username }
   let_it_be(:helper) { Class.new.include(described_class).new }

ee/spec/lib/atlassian/jira_connect/client_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Atlassian::JiraConnect::Client do
+RSpec.describe Atlassian::JiraConnect::Client do
   include StubRequests
 
   subject { described_class.new('https://gitlab-test.atlassian.net', 'sample_secret') }

ee/spec/lib/atlassian/jira_connect/serializers/author_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Atlassian::JiraConnect::Serializers::AuthorEntity do
+RSpec.describe Atlassian::JiraConnect::Serializers::AuthorEntity do
   subject { described_class.represent(user).as_json }
 
   context 'when object is a User model' do

ee/spec/lib/atlassian/jira_connect/serializers/branch_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Atlassian::JiraConnect::Serializers::BranchEntity do
+RSpec.describe Atlassian::JiraConnect::Serializers::BranchEntity do
   let(:project) { create(:project, :repository) }
   let(:branch) { project.repository.find_branch('improve/awesome') }
 

ee/spec/lib/atlassian/jira_connect/serializers/repository_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Atlassian::JiraConnect::Serializers::RepositoryEntity do
+RSpec.describe Atlassian::JiraConnect::Serializers::RepositoryEntity do
   subject do
     project = create(:project, :repository)
     commits = [project.commit]

ee/spec/lib/atlassian/jira_issue_key_extractor_spec.rb

@@ -2,7 +2,7 @@
 
 require 'fast_spec_helper'
 
-describe Atlassian::JiraIssueKeyExtractor do
+RSpec.describe Atlassian::JiraIssueKeyExtractor do
   describe '.has_keys?' do
     subject { described_class.has_keys?(string) }
 

ee/spec/lib/audit/changes_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Audit::Changes do
+RSpec.describe Audit::Changes do
   subject(:foo_instance) { Class.new { include Audit::Changes }.new }
 
   describe '.audit_changes' do

ee/spec/lib/audit/details_spec.rb

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

ee/spec/lib/banzai/filter/cross_project_issuable_information_filter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::Filter::CrossProjectIssuableInformationFilter do
+RSpec.describe Banzai::Filter::CrossProjectIssuableInformationFilter do
   include ActionView::Helpers::UrlHelper
   include FilterSpecHelper
 

ee/spec/lib/banzai/filter/epic_reference_filter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::Filter::EpicReferenceFilter do
+RSpec.describe Banzai::Filter::EpicReferenceFilter do
   include FilterSpecHelper
 
   let(:urls) { Gitlab::Routing.url_helpers }

ee/spec/lib/banzai/filter/inline_alert_metrics_filter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::Filter::InlineAlertMetricsFilter do
+RSpec.describe Banzai::Filter::InlineAlertMetricsFilter do
   include FilterSpecHelper
 
   let(:params) { ['foo', 'bar', 12] }

ee/spec/lib/banzai/filter/inline_cluster_metrics_filter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::Filter::InlineClusterMetricsFilter do
+RSpec.describe Banzai::Filter::InlineClusterMetricsFilter do
   include FilterSpecHelper
 
   let!(:cluster) { create(:cluster) }

ee/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::Filter::InlineMetricsRedactorFilter do
+RSpec.describe Banzai::Filter::InlineMetricsRedactorFilter do
   include FilterSpecHelper
 
   let_it_be(:project) { create(:project) }

ee/spec/lib/banzai/filter/issuable_state_filter_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Banzai::Filter::IssuableStateFilter do
+RSpec.describe Banzai::Filter::IssuableStateFilter do
   include ActionView::Helpers::UrlHelper
   include FilterSpecHelper
 

ee/spec/lib/banzai/filter/iteration_reference_filter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::Filter::IterationReferenceFilter do
+RSpec.describe Banzai::Filter::IterationReferenceFilter do
   include FilterSpecHelper
 
   let(:parent_group) { create(:group, :public) }

ee/spec/lib/banzai/filter/label_reference_filter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::Filter::LabelReferenceFilter do
+RSpec.describe Banzai::Filter::LabelReferenceFilter do
   include FilterSpecHelper
 
   let(:project)      { create(:project, :public, name: 'sample-project') }

ee/spec/lib/banzai/issuable_extractor_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Banzai::IssuableExtractor do
+RSpec.describe Banzai::IssuableExtractor do
   it 'returns an instance of an epic for the node with reference' do
     epic = create(:epic)
     user = create(:user)

ee/spec/lib/banzai/reference_parser/epic_parser_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::ReferenceParser::EpicParser do
+RSpec.describe Banzai::ReferenceParser::EpicParser do
   include ReferenceParserHelpers
 
   def link(epic_id)

ee/spec/lib/banzai/reference_parser/iteration_parser_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Banzai::ReferenceParser::IterationParser do
+RSpec.describe Banzai::ReferenceParser::IterationParser do
   include ReferenceParserHelpers
 
   let(:project) { create(:project, :public) }

ee/spec/lib/constraints/jira_encoded_url_constrainer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Constraints::JiraEncodedUrlConstrainer do
+RSpec.describe Constraints::JiraEncodedUrlConstrainer do
   let(:namespace_id) { 'group' }
   let(:project_id) { 'project' }
   let(:path) { "/#{namespace_id}/#{project_id}" }

ee/spec/lib/container_registry/client_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContainerRegistry::Client do
+RSpec.describe ContainerRegistry::Client do
   let(:token) { '12345' }
   let(:options) { { token: token } }
   let(:client) { described_class.new("http://registry", options) }

ee/spec/lib/ee/api/entities/analytics/code_review/merge_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::API::Entities::Analytics::CodeReview::MergeRequest do
+RSpec.describe EE::API::Entities::Analytics::CodeReview::MergeRequest do
   subject(:entity_representation) { described_class.new(merge_request).as_json }
 
   let(:merge_request) do

ee/spec/lib/ee/api/entities/analytics/group_activity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::API::Entities::Analytics::GroupActivity do
+RSpec.describe EE::API::Entities::Analytics::GroupActivity do
   let(:count) { 10 }
 
   shared_examples 'exposes count' do |count_type, entity|

ee/spec/lib/ee/api/entities/geo_node_status_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::API::Entities::GeoNodeStatus do
+RSpec.describe EE::API::Entities::GeoNodeStatus do
   include ::EE::GeoHelpers
 
   let(:geo_node_status) { build(:geo_node_status) }

ee/spec/lib/ee/api/entities/member_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Entities::Member do
+RSpec.describe API::Entities::Member do
   subject(:entity_representation) { described_class.new(member).as_json }
 
   let(:member) { build_stubbed(:group_member) }

ee/spec/lib/ee/api/entities/nuget/metadatum_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::API::Entities::Nuget::Metadatum do
+RSpec.describe EE::API::Entities::Nuget::Metadatum do
   let(:metadatum) do
     {
       project_url: 'http://sandbox.com/project',

ee/spec/lib/ee/api/entities/nuget/package_metadata_catalog_entry_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::API::Entities::Nuget::PackageMetadataCatalogEntry do
+RSpec.describe EE::API::Entities::Nuget::PackageMetadataCatalogEntry do
   let(:entry) do
     {
       json_url: 'http://sandbox.com/json/package',

ee/spec/lib/ee/api/entities/nuget/search_result_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::API::Entities::Nuget::SearchResult do
+RSpec.describe EE::API::Entities::Nuget::SearchResult do
   let(:search_result) do
     {
       type: 'Package',

ee/spec/lib/ee/api/entities/scim/conflict_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::Scim::Conflict do
+RSpec.describe ::EE::API::Entities::Scim::Conflict do
   let(:params) { { detail: 'error' } }
   let(:entity) do
     described_class.new(params)

ee/spec/lib/ee/api/entities/scim/emails_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::Scim::Emails do
+RSpec.describe ::EE::API::Entities::Scim::Emails do
   let(:user) { build(:user) }
   let(:identity) { build(:group_saml_identity, user: user) }
 

ee/spec/lib/ee/api/entities/scim/error_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::Scim::Error do
+RSpec.describe ::EE::API::Entities::Scim::Error do
   let(:params) { { detail: 'error' } }
   let(:entity) do
     described_class.new(params)

ee/spec/lib/ee/api/entities/scim/not_found_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::Scim::NotFound do
+RSpec.describe ::EE::API::Entities::Scim::NotFound do
   let(:entity) do
     described_class.new({})
   end

ee/spec/lib/ee/api/entities/scim/user_name_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::Scim::UserName do
+RSpec.describe ::EE::API::Entities::Scim::UserName do
   let(:user) { build(:user) }
 
   subject { described_class.new(user).as_json }

ee/spec/lib/ee/api/entities/scim/user_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::Scim::User do
+RSpec.describe ::EE::API::Entities::Scim::User do
   let(:user) { build(:user) }
   let(:identity) { build(:group_saml_identity, user: user) }
 

ee/spec/lib/ee/api/entities/scim/users_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::Scim::Users do
+RSpec.describe ::EE::API::Entities::Scim::Users do
   let(:user) { build(:user) }
   let(:identity) { build(:group_saml_identity, user: user) }
 

ee/spec/lib/ee/api/entities/vulnerability_export_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::VulnerabilityExport do
+RSpec.describe ::EE::API::Entities::VulnerabilityExport do
   let(:vulnerability_export) { create(:vulnerability_export, :finished, :csv, :with_csv_file) }
 
   let(:entity) { described_class.new(vulnerability_export) }

ee/spec/lib/ee/api/entities/vulnerability_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Entities::Vulnerability do
+RSpec.describe ::EE::API::Entities::Vulnerability do
   let_it_be(:project) { create(:project, :with_vulnerability) }
   let(:vulnerability) { project.vulnerabilities.first }
 

ee/spec/lib/ee/api/helpers/issues_helpers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Helpers::IssuesHelpers do
+RSpec.describe API::Helpers::IssuesHelpers do
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }
   let_it_be(:user) { create(:user) }

ee/spec/lib/ee/api/helpers/members_helpers_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe EE::API::Helpers::MembersHelpers do
+RSpec.describe EE::API::Helpers::MembersHelpers do
   subject(:members_helpers) { Class.new.include(described_class).new }
 
   before do

ee/spec/lib/ee/api/helpers/notes_helpers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'NotesHelpers' do
+RSpec.describe 'NotesHelpers' do
   describe '#find_noteable' do
     let!(:group) { create(:group, :public) }
     let!(:other_group) { create(:group, :public) }

ee/spec/lib/ee/api/helpers/runner_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::API::Helpers::Runner do
+RSpec.describe EE::API::Helpers::Runner do
   let(:helper) { Class.new { include API::Helpers::Runner }.new }
 
   before do

ee/spec/lib/ee/api/helpers/scim_pagination_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::API::Helpers::ScimPagination do
+RSpec.describe ::EE::API::Helpers::ScimPagination do
   let(:query) { {} }
   let(:pagination_class) { Struct.new(:params).include(described_class) }
 

ee/spec/lib/ee/api/helpers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::API::Helpers do
+RSpec.describe EE::API::Helpers do
   include Rack::Test::Methods
 
   let(:helper) do

ee/spec/lib/ee/audit/group_changes_auditor_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Audit::GroupChangesAuditor do
+RSpec.describe EE::Audit::GroupChangesAuditor do
   describe '.audit_changes' do
     let!(:user) { create(:user) }
     let!(:group) { create(:group, visibility_level: 0) }

ee/spec/lib/ee/audit/project_changes_auditor_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Audit::ProjectChangesAuditor do
+RSpec.describe EE::Audit::ProjectChangesAuditor do
   describe '.audit_changes' do
     let(:user) { create(:user) }
     let(:project) do

ee/spec/lib/ee/audit/project_feature_changes_auditor_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Audit::ProjectFeatureChangesAuditor do
+RSpec.describe EE::Audit::ProjectFeatureChangesAuditor do
   describe '#execute' do
     let!(:user) { create(:user) }
     let!(:project) { create(:project, :pages_enabled, visibility_level: 0) }

ee/spec/lib/ee/event_filter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EventFilter do
+RSpec.describe EventFilter do
   describe '#apply_filter' do
     let_it_be(:group) { create(:group, :public) }
     let_it_be(:project) { create(:project, :public) }

ee/spec/lib/ee/feature_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Feature do
+RSpec.describe Feature do
   include EE::GeoHelpers
 
   describe '.enable' do

ee/spec/lib/ee/gitlab/analytics/cycle_analytics/base_query_builder_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder do
   let_it_be(:group) { create(:group) }
   let_it_be(:subgroup) { create(:group, parent: group) }
   let_it_be(:project_in_group) { create(:project, :repository, group: group) }

ee/spec/lib/ee/gitlab/application_context_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ApplicationContext do
+RSpec.describe Gitlab::ApplicationContext do
   describe '#to_lazy_hash' do
     let(:user) { build(:user) }
     let(:project) { build(:project) }

ee/spec/lib/ee/gitlab/auth/ldap/access_levels_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Auth::Ldap::AccessLevels do
+RSpec.describe EE::Gitlab::Auth::Ldap::AccessLevels do
   describe '#set' do
     let(:access_levels) { described_class.new }
     let(:dns) do

ee/spec/lib/ee/gitlab/auth/ldap/group_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Auth::Ldap::Group do
+RSpec.describe EE::Gitlab::Auth::Ldap::Group do
   include LdapHelpers
 
   before do

ee/spec/lib/ee/gitlab/auth/ldap/sync/admin_users_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Auth::Ldap::Sync::AdminUsers do
+RSpec.describe EE::Gitlab::Auth::Ldap::Sync::AdminUsers do
   include LdapHelpers
 
   let(:adapter) { ldap_adapter }

ee/spec/lib/ee/gitlab/auth/ldap/sync/external_users_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Auth::Ldap::Sync::ExternalUsers do
+RSpec.describe EE::Gitlab::Auth::Ldap::Sync::ExternalUsers do
   include LdapHelpers
 
   describe '#update_permissions' do

ee/spec/lib/ee/gitlab/auth/ldap/sync/group_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Auth::Ldap::Sync::Group do
+RSpec.describe EE::Gitlab::Auth::Ldap::Sync::Group do
   include LdapHelpers
 
   let(:adapter) { ldap_adapter }

ee/spec/lib/ee/gitlab/auth/ldap/sync/groups_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Auth::Ldap::Sync::Groups do
+RSpec.describe EE::Gitlab::Auth::Ldap::Sync::Groups do
   include LdapHelpers
 
   let(:adapter) { ldap_adapter }

ee/spec/lib/ee/gitlab/auth/ldap/sync/proxy_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'net/ldap/dn'
 
-describe EE::Gitlab::Auth::Ldap::Sync::Proxy do
+RSpec.describe EE::Gitlab::Auth::Ldap::Sync::Proxy do
   include LdapHelpers
 
   let(:adapter) { ldap_adapter }

ee/spec/lib/ee/gitlab/background_migration/backfill_version_data_from_gitaly_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # rubocop:disable RSpec/FactoriesInMigrationSpecs
-describe Gitlab::BackgroundMigration::BackfillVersionDataFromGitaly do
+RSpec.describe Gitlab::BackgroundMigration::BackfillVersionDataFromGitaly do
   let(:issue) { create(:issue) }
 
   def perform_worker

ee/spec/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesCheckProgress do
+RSpec.describe Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesCheckProgress do
   context 'when there is MigrateApproverToApprovalRulesInBatch jobs' do
     it 'reschedules check' do
       allow(Gitlab::BackgroundMigration).to receive(:exists?).with('MigrateApproverToApprovalRulesInBatch').and_return(true)

ee/spec/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # rubocop:disable RSpec/FactoriesInMigrationSpecs
-describe Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesInBatch do
+RSpec.describe Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesInBatch do
   context 'when there is no more MigrateApproverToApprovalRules jobs' do
     let(:job) { double(:job) }
     let(:project) { create(:project) }

ee/spec/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # rubocop:disable RSpec/FactoriesInMigrationSpecs
-describe Gitlab::BackgroundMigration::MigrateApproverToApprovalRules do
+RSpec.describe Gitlab::BackgroundMigration::MigrateApproverToApprovalRules do
   def create_skip_sync(*args)
     build(*args) do |record|
       allow(record).to receive(:schedule_approval_migration)

ee/spec/lib/ee/gitlab/background_migration/migrate_security_scans_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # rubocop: disable RSpec/FactoriesInMigrationSpecs
-describe Gitlab::BackgroundMigration::MigrateSecurityScans, schema: 20200220180944 do
+RSpec.describe Gitlab::BackgroundMigration::MigrateSecurityScans, schema: 20200220180944 do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:builds) { table(:ci_builds) }

ee/spec/lib/ee/gitlab/background_migration/move_epic_issues_after_epics_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::MoveEpicIssuesAfterEpics, schema: 20190926180443 do
+RSpec.describe Gitlab::BackgroundMigration::MoveEpicIssuesAfterEpics, schema: 20190926180443 do
   let(:users) { table(:users) }
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }

ee/spec/lib/ee/gitlab/background_migration/populate_any_approval_rule_for_merge_requests_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForMergeRequests, schema: 2019_09_05_091831 do
+RSpec.describe Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForMergeRequests, schema: 2019_09_05_091831 do
   let(:namespaces) { table(:namespaces) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }
   let(:projects) { table(:projects) }

ee/spec/lib/ee/gitlab/background_migration/populate_any_approval_rule_for_projects_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForProjects, schema: 2019_09_05_091812 do
+RSpec.describe Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForProjects, schema: 2019_09_05_091812 do
   let(:namespaces) { table(:namespaces) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }
   let(:projects) { table(:projects) }

ee/spec/lib/ee/gitlab/background_migration/prune_orphaned_geo_events_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::PruneOrphanedGeoEvents, geo: false, schema: 2020_01_02_170221 do
+RSpec.describe Gitlab::BackgroundMigration::PruneOrphanedGeoEvents, geo: false, schema: 2020_01_02_170221 do
   let(:event_table_name) { 'geo_repository_updated_events' }
   let(:geo_event_log) { table(:geo_event_log) }
   let(:geo_updated_events) { table(event_table_name) }

ee/spec/lib/ee/gitlab/background_migration/remove_undefined_occurrence_confidence_level_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceConfidenceLevel, :migration, schema: 20200506085748 do
+RSpec.describe Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceConfidenceLevel, :migration, schema: 20200506085748 do
   let(:vulnerabilities) { table(:vulnerability_occurrences) }
   let(:identifiers) { table(:vulnerability_identifiers) }
   let(:scanners) { table(:vulnerability_scanners) }

ee/spec/lib/ee/gitlab/background_migration/remove_undefined_occurrence_severity_level_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceSeverityLevel, schema: 20200227140242 do
+RSpec.describe Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceSeverityLevel, schema: 20200227140242 do
   let(:vulnerabilities) { table(:vulnerability_occurrences) }
   let(:identifiers) { table(:vulnerability_identifiers) }
   let(:scanners) { table(:vulnerability_scanners) }

ee/spec/lib/ee/gitlab/background_migration/remove_undefined_vulnerability_confidence_level_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilityConfidenceLevel, :migration, schema: 20200511092714 do
+RSpec.describe Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilityConfidenceLevel, :migration, schema: 20200511092714 do
   let(:vulnerabilities) { table(:vulnerabilities) }
   let(:identifiers) { table(:vulnerability_identifiers) }
   let(:projects) { table(:projects) }

ee/spec/lib/ee/gitlab/background_migration/remove_undefined_vulnerability_severity_level_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilitySeverityLevel, :migration, schema: 20200302142052 do
+RSpec.describe Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilitySeverityLevel, :migration, schema: 20200302142052 do
   let(:vulnerabilities) { table(:vulnerabilities) }
   let(:identifiers) { table(:vulnerability_identifiers) }
   let(:projects) { table(:projects) }

ee/spec/lib/ee/gitlab/background_migration/update_vulnerabilities_to_dismissed_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::UpdateVulnerabilitiesToDismissed, :migration, schema: 20200416111111 do
+RSpec.describe Gitlab::BackgroundMigration::UpdateVulnerabilitiesToDismissed, :migration, schema: 20200416111111 do
   let(:users) { table(:users) }
   let(:projects) { table(:projects) }
   let(:vulnerabilities) { table(:vulnerabilities) }

ee/spec/lib/ee/gitlab/background_migration/update_vulnerability_confidence_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::UpdateVulnerabilityConfidence, schema: 20190909141517 do
+RSpec.describe Gitlab::BackgroundMigration::UpdateVulnerabilityConfidence, schema: 20190909141517 do
   let(:vulnerabilities) { table(:vulnerability_occurrences) }
   let(:identifiers) { table(:vulnerability_identifiers) }
   let(:scanners) { table(:vulnerability_scanners) }

ee/spec/lib/ee/gitlab/checks/push_rule_check_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Checks::PushRuleCheck do
+RSpec.describe EE::Gitlab::Checks::PushRuleCheck do
   include_context 'push rules checks context'
 
   let(:push_rule) { create(:push_rule, :commit_message) }

ee/spec/lib/ee/gitlab/checks/push_rules/branch_check_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Checks::PushRules::BranchCheck do
+RSpec.describe EE::Gitlab::Checks::PushRules::BranchCheck do
   include_context 'push rules checks context'
 
   describe '#validate!' do

ee/spec/lib/ee/gitlab/checks/push_rules/commit_check_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Checks::PushRules::CommitCheck do
+RSpec.describe EE::Gitlab::Checks::PushRules::CommitCheck do
   include_context 'push rules checks context'
 
   describe '#validate!' do

ee/spec/lib/ee/gitlab/checks/push_rules/file_size_check_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Checks::PushRules::FileSizeCheck do
+RSpec.describe EE::Gitlab::Checks::PushRules::FileSizeCheck do
   include_context 'push rules checks context'
 
   describe '#validate!' do

ee/spec/lib/ee/gitlab/checks/push_rules/tag_check_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Checks::PushRules::TagCheck do
+RSpec.describe EE::Gitlab::Checks::PushRules::TagCheck do
   include_context 'push rules checks context'
 
   describe '#validate!' do

ee/spec/lib/ee/gitlab/ci/config/entry/bridge_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Ci::Config::Entry::Bridge do
+RSpec.describe Gitlab::Ci::Config::Entry::Bridge do
   subject { described_class.new(config, name: :my_bridge) }
 
   describe '.matching?' do

ee/spec/lib/ee/gitlab/ci/config/entry/need_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::Gitlab::Ci::Config::Entry::Need do
+RSpec.describe ::Gitlab::Ci::Config::Entry::Need do
   subject(:need) { described_class.new(config) }
 
   context 'with Bridge config' do

ee/spec/lib/ee/gitlab/ci/config/entry/needs_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::Gitlab::Ci::Config::Entry::Needs do
+RSpec.describe ::Gitlab::Ci::Config::Entry::Needs do
   subject(:needs) { described_class.new(config) }
 
   before do

ee/spec/lib/ee/gitlab/ci/config_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Ci::Config do
+RSpec.describe Gitlab::Ci::Config do
   let(:template_name) { 'test_template' }
   let(:template_repository) { create(:project, :custom_repo, files: { "gitlab-ci/#{template_name}.yml" => template_yml }) }
 

ee/spec/lib/ee/gitlab/ci/pipeline/chain/validate/abilities_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Ci::Pipeline::Chain::Validate::Abilities do
+RSpec.describe Gitlab::Ci::Pipeline::Chain::Validate::Abilities do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 

ee/spec/lib/ee/gitlab/ci/pipeline/quota/activity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Ci::Pipeline::Quota::Activity do
+RSpec.describe EE::Gitlab::Ci::Pipeline::Quota::Activity do
   let_it_be(:namespace) { create(:namespace) }
   let_it_be(:project, reload: true) { create(:project, namespace: namespace) }
   let_it_be(:gold_plan, reload: true) { create(:gold_plan) }

ee/spec/lib/ee/gitlab/ci/pipeline/quota/job_activity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Ci::Pipeline::Quota::JobActivity do
+RSpec.describe EE::Gitlab::Ci::Pipeline::Quota::JobActivity do
   let_it_be(:namespace) { create(:namespace) }
   let_it_be(:project, reload: true) { create(:project, namespace: namespace) }
   let_it_be(:gold_plan, reload: true) { create(:gold_plan) }

ee/spec/lib/ee/gitlab/ci/pipeline/quota/size_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Ci::Pipeline::Quota::Size do
+RSpec.describe EE::Gitlab::Ci::Pipeline::Quota::Size do
   let_it_be(:namespace) { create(:namespace) }
   let_it_be(:gold_plan, reload: true) { create(:gold_plan) }
   let_it_be(:project, reload: true) { create(:project, :repository, namespace: namespace) }

ee/spec/lib/ee/gitlab/ci/templates/templates_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "CI YML Templates" do
+RSpec.describe "CI YML Templates" do
   using RSpec::Parameterized::TableSyntax
 
   subject { Gitlab::Ci::YamlProcessor.new(content) }

ee/spec/lib/ee/gitlab/cleanup/orphan_job_artifact_files_batch_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Cleanup::OrphanJobArtifactFilesBatch do
+RSpec.describe Gitlab::Cleanup::OrphanJobArtifactFilesBatch do
   include ::EE::GeoHelpers
 
   let(:batch_size) { 10 }

ee/spec/lib/ee/gitlab/cleanup/orphan_job_artifact_files_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Cleanup::OrphanJobArtifactFiles do
+RSpec.describe Gitlab::Cleanup::OrphanJobArtifactFiles do
   include ::EE::GeoHelpers
 
   let(:null_logger) { Logger.new('/dev/null') }

ee/spec/lib/ee/gitlab/database_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Database do
+RSpec.describe Gitlab::Database do
   include ::EE::GeoHelpers
 
   describe '.read_only?' do

ee/spec/lib/ee/gitlab/elastic/helper_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Elastic::Helper do
+RSpec.describe Gitlab::Elastic::Helper do
   subject(:helper) { described_class.default }
 
   shared_context 'with a legacy index' do

ee/spec/lib/ee/gitlab/etag_caching/router_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::EtagCaching::Router do
+RSpec.describe Gitlab::EtagCaching::Router do
   it 'matches epic notes endpoint' do
     result = described_class.match(
       '/groups/my-group/and-subgroup/-/epics/1/notes'

ee/spec/lib/ee/gitlab/git_access_design_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::GitAccessDesign do
+RSpec.describe Gitlab::GitAccessDesign do
   include DesignManagementTestHelpers
   using RSpec::Parameterized::TableSyntax
 

ee/spec/lib/ee/gitlab/hook_data/issue_builder_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::HookData::IssueBuilder do
+RSpec.describe Gitlab::HookData::IssueBuilder do
   let_it_be(:issue) { create(:issue) }
   let(:builder) { described_class.new(issue) }
 

ee/spec/lib/ee/gitlab/import_export/after_export_strategies/custom_template_export_import_strategy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::ImportExport::AfterExportStrategies::CustomTemplateExportImportStrategy do
+RSpec.describe EE::Gitlab::ImportExport::AfterExportStrategies::CustomTemplateExportImportStrategy do
   subject { described_class.new(export_into_project_id: project.id) }
 
   describe 'validations' do

ee/spec/lib/ee/gitlab/import_export/group/legacy_tree_restorer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Group::LegacyTreeRestorer do
+RSpec.describe Gitlab::ImportExport::Group::LegacyTreeRestorer do
   include ImportExport::CommonUtil
 
   let(:user) { create(:user) }

ee/spec/lib/ee/gitlab/import_export/group/legacy_tree_saver_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Group::LegacyTreeSaver do
+RSpec.describe Gitlab::ImportExport::Group::LegacyTreeSaver do
   describe 'saves the group tree into a json object' do
     let_it_be(:user) { create(:user) }
     let_it_be(:group) { create(:group) }

ee/spec/lib/ee/gitlab/import_export/group/tree_restorer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Group::TreeRestorer do
+RSpec.describe Gitlab::ImportExport::Group::TreeRestorer do
   include ImportExport::CommonUtil
 
   let(:user) { create(:user) }

ee/spec/lib/ee/gitlab/import_export/group/tree_saver_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Group::TreeSaver do
+RSpec.describe Gitlab::ImportExport::Group::TreeSaver do
   describe 'saves the group tree into a json object' do
     let_it_be(:user) { create(:user) }
     let_it_be(:group) { create(:group) }

ee/spec/lib/ee/gitlab/import_export/project/tree_restorer_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Project::TreeRestorer do
+RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
   include ImportExport::CommonUtil
 
   let(:shared) { project.import_export_shared }

ee/spec/lib/ee/gitlab/import_export/project/tree_saver_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Project::TreeSaver do
+RSpec.describe Gitlab::ImportExport::Project::TreeSaver do
   let_it_be(:user) { create(:user) }
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }

ee/spec/lib/ee/gitlab/ip_restriction/enforcer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::IpRestriction::Enforcer do
+RSpec.describe Gitlab::IpRestriction::Enforcer do
   describe '#allows_current_ip?' do
     let(:group) { create(:group) }
     let(:current_ip) { '192.168.0.2' }

ee/spec/lib/ee/gitlab/metrics/dashboard/service_selector_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Metrics::Dashboard::ServiceSelector do
+RSpec.describe Gitlab::Metrics::Dashboard::ServiceSelector do
   include MetricsDashboardHelpers
 
   describe '#call' do

ee/spec/lib/ee/gitlab/metrics/dashboard/url_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Metrics::Dashboard::Url do
+RSpec.describe Gitlab::Metrics::Dashboard::Url do
   describe '#clusters_regex' do
     let(:url) do
       Gitlab::Routing.url_helpers.namespace_project_cluster_url(

ee/spec/lib/ee/gitlab/metrics/samplers/database_sampler_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Metrics::Samplers::DatabaseSampler do
+RSpec.describe Gitlab::Metrics::Samplers::DatabaseSampler do
   subject { described_class.new(described_class::SAMPLING_INTERVAL_SECONDS) }
 
   describe '#sample' do

ee/spec/lib/ee/gitlab/middleware/read_only_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Middleware::ReadOnly do
+RSpec.describe Gitlab::Middleware::ReadOnly do
   include Rack::Test::Methods
   using RSpec::Parameterized::TableSyntax
 

ee/spec/lib/ee/gitlab/path_regex_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::PathRegex do
+RSpec.describe Gitlab::PathRegex do
   describe '.container_image_regex' do
     subject { described_class.container_image_regex }
 

ee/spec/lib/ee/gitlab/prometheus/metric_group_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Prometheus::MetricGroup do
+RSpec.describe Gitlab::Prometheus::MetricGroup do
   describe '.for_project' do
     let!(:project_metric) { create(:prometheus_metric) }
     let!(:common_metric) { create(:prometheus_metric, :common, group: :aws_elb) }

ee/spec/lib/ee/gitlab/repo_path_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::RepoPath do
+RSpec.describe Gitlab::RepoPath do
   describe '.find_project' do
     let(:project) { create(:project) }
 

ee/spec/lib/ee/gitlab/scim/attribute_transform_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Scim::AttributeTransform do
+RSpec.describe EE::Gitlab::Scim::AttributeTransform do
   using RSpec::Parameterized::TableSyntax
 
   describe '#valid?' do

ee/spec/lib/ee/gitlab/scim/deprovision_service_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::Gitlab::Scim::DeprovisionService do
+RSpec.describe ::EE::Gitlab::Scim::DeprovisionService do
   describe '#execute' do
     let_it_be(:identity) { create(:scim_identity, active: true) }
     let_it_be(:group) { identity.group }

ee/spec/lib/ee/gitlab/scim/filter_parser_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Scim::FilterParser do
+RSpec.describe EE::Gitlab::Scim::FilterParser do
   describe '#operator' do
     it 'is extracted from the filter' do
       expect(described_class.new('displayName ne ""').operator).to eq 'ne'

ee/spec/lib/ee/gitlab/scim/params_parser_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Scim::ParamsParser do
+RSpec.describe EE::Gitlab::Scim::ParamsParser do
   describe '#filter_params' do
     it 'returns the correct filter attributes' do
       filter = 'id eq "6ba81b08-77da"'

ee/spec/lib/ee/gitlab/scim/provisioning_service_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::Gitlab::Scim::ProvisioningService do
+RSpec.describe ::EE::Gitlab::Scim::ProvisioningService do
   describe '#execute' do
     let(:group) { create(:group) }
     let(:service) { described_class.new(group, service_params) }

ee/spec/lib/ee/gitlab/scim/reprovision_service_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::EE::Gitlab::Scim::ReprovisionService do
+RSpec.describe ::EE::Gitlab::Scim::ReprovisionService do
   describe '#execute' do
     let_it_be(:identity) { create(:scim_identity, active: false) }
     let_it_be(:group) { identity.group }

ee/spec/lib/ee/gitlab/scim/value_parser_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::Scim::ValueParser do
+RSpec.describe EE::Gitlab::Scim::ValueParser do
   using RSpec::Parameterized::TableSyntax
 
   describe '#type_cast' do

ee/spec/lib/ee/gitlab/search_results_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::SearchResults do
+RSpec.describe Gitlab::SearchResults do
   let(:user) { build(:user) }
 
   let_it_be(:compliance_project) { create(:project, :with_compliance_framework, name: 'foo') }

ee/spec/lib/ee/gitlab/service_desk_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EE::Gitlab::ServiceDesk do
+RSpec.describe EE::Gitlab::ServiceDesk do
   before do
     stub_licensed_features(service_desk: true)
     allow(::Gitlab::IncomingEmail).to receive(:enabled?).and_return(true)

ee/spec/lib/ee/gitlab/snippet_search_results_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::SnippetSearchResults do
+RSpec.describe Gitlab::SnippetSearchResults do
   let_it_be(:snippet) { create(:snippet, title: 'foo', description: 'foo') }
   let(:user) { snippet.author }
   let(:com_value) { true }

ee/spec/lib/ee/gitlab/template/gitlab_ci_yml_template_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Template::GitlabCiYmlTemplate do
+RSpec.describe Gitlab::Template::GitlabCiYmlTemplate do
   describe '.all' do
     let(:templates) { described_class.all.map(&:name) }
 

ee/spec/lib/ee/gitlab/url_builder_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::UrlBuilder do
+RSpec.describe Gitlab::UrlBuilder do
   subject { described_class }
 
   describe '.build' do

ee/spec/lib/ee/gitlab/usage_data_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::UsageData do
+RSpec.describe Gitlab::UsageData do
   include UsageDataHelpers
 
   before do

ee/spec/lib/ee/gitlab/verify/lfs_objects_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Verify::LfsObjects do
+RSpec.describe Gitlab::Verify::LfsObjects do
   before do
     stub_lfs_object_storage
   end

ee/spec/lib/ee/gitlab/verify/uploads_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Verify::Uploads do
+RSpec.describe Gitlab::Verify::Uploads do
   before do
     stub_uploads_object_storage(AvatarUploader)
   end

ee/spec/lib/elastic/latest/config_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Elastic::Latest::Config do
+RSpec.describe Elastic::Latest::Config do
   describe '.document_type' do
     it 'returns config' do
       expect(described_class.document_type).to eq('doc')

ee/spec/lib/elastic/latest/git_class_proxy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Elastic::Latest::GitClassProxy do
+RSpec.describe Elastic::Latest::GitClassProxy do
   let_it_be(:project) { create(:project, :repository) }
   let(:included_class) { Elastic::Latest::RepositoryClassProxy }
 

ee/spec/lib/elastic/latest/git_instance_proxy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Elastic::Latest::GitInstanceProxy do
+RSpec.describe Elastic::Latest::GitInstanceProxy do
   let(:project) { create(:project, :repository) }
   let(:included_class) { Elastic::Latest::RepositoryInstanceProxy }
 

ee/spec/lib/elastic/latest/project_wiki_class_proxy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Elastic::Latest::ProjectWikiClassProxy do
+RSpec.describe Elastic::Latest::ProjectWikiClassProxy do
   let_it_be(:project) { create(:project, :wiki_repo) }
 
   subject { described_class.new(project.wiki.repository) }

ee/spec/lib/elastic/latest/project_wiki_instance_proxy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Elastic::Latest::ProjectWikiInstanceProxy do
+RSpec.describe Elastic::Latest::ProjectWikiInstanceProxy do
   let_it_be(:project) { create(:project, :wiki_repo) }
 
   subject { described_class.new(project.wiki) }

ee/spec/lib/elastic/latest/routing_spec.rb

@@ -3,7 +3,7 @@
 require 'fast_spec_helper'
 require 'support/helpers/stub_feature_flags'
 
-describe Elastic::Latest::Routing do
+RSpec.describe Elastic::Latest::Routing do
   let(:proxified_class) { Issue }
   let(:included_class) { Elastic::Latest::ApplicationClassProxy }
 

ee/spec/lib/elastic/latest/snippet_instance_proxy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Elastic::Latest::SnippetInstanceProxy do
+RSpec.describe Elastic::Latest::SnippetInstanceProxy do
   let(:snippet) { create(:personal_snippet) }
 
   subject { described_class.new(snippet) }

ee/spec/lib/elastic/multi_version_class_proxy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Elastic::MultiVersionClassProxy do
+RSpec.describe Elastic::MultiVersionClassProxy do
   subject { described_class.new(ProjectSnippet) }
 
   describe '#version' do

ee/spec/lib/elastic/multi_version_instance_proxy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Elastic::MultiVersionInstanceProxy do
+RSpec.describe Elastic::MultiVersionInstanceProxy do
   let(:snippet) { create(:project_snippet) }
 
   subject { described_class.new(snippet) }

ee/spec/lib/flipper_session_spec.rb

@@ -2,7 +2,7 @@
 
 require 'fast_spec_helper'
 
-describe FlipperSession do
+RSpec.describe FlipperSession do
   describe '#flipper_id' do
     context 'without passing in an ID' do
       it 'returns a flipper_session:UUID' do

ee/spec/lib/gem_extensions/elasticsearch/model/indexing/instance_methods_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GemExtensions::Elasticsearch::Model::Indexing::InstanceMethods do
+RSpec.describe GemExtensions::Elasticsearch::Model::Indexing::InstanceMethods do
   describe '#index_document' do
     let(:project) { Project.new(id: 1) }
 

ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::DataCollector do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::DataCollector do
   let_it_be(:user) { create(:user) }
 
   around do |example|

ee/spec/lib/gitlab/analytics/cycle_analytics/group_stage_time_summary_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::GroupStageTimeSummary do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::GroupStageTimeSummary do
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, :repository, namespace: group) }
   let_it_be(:project_2) { create(:project, :repository, namespace: group) }

ee/spec/lib/gitlab/analytics/cycle_analytics/request_params_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::RequestParams do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::RequestParams do
   let_it_be(:user) { create(:user) }
   let_it_be(:root_group) { create(:group) }
   let_it_be(:sub_group) { create(:group, parent: root_group) }

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_closed_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueClosed do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueClosed do
   it_behaves_like 'cycle analytics event'
 end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_first_added_to_board_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueFirstAddedToBoard do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueFirstAddedToBoard do
   it_behaves_like 'cycle analytics event'
 end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_first_associated_with_milestone_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueFirstAssociatedWithMilestone do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueFirstAssociatedWithMilestone do
   it_behaves_like 'cycle analytics event'
 end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_first_mentioned_in_commit_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueFirstMentionedInCommit do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueFirstMentionedInCommit do
   it_behaves_like 'cycle analytics event'
 end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_label_added_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueLabelAdded do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueLabelAdded do
   it_behaves_like 'cycle analytics event' do
     let(:params) { { label: GroupLabel.new } }
   end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_label_removed_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueLabelRemoved do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueLabelRemoved do
   it_behaves_like 'cycle analytics event' do
     let(:params) { { label: GroupLabel.new } }
   end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_last_edited_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueLastEdited do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::IssueLastEdited do
   it_behaves_like 'cycle analytics event'
 end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_closed_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestClosed do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestClosed do
   it_behaves_like 'cycle analytics event'
 end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_label_added_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestLabelAdded do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestLabelAdded do
   it_behaves_like 'cycle analytics event' do
     let(:params) { { label: GroupLabel.new } }
   end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_label_removed_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestLabelRemoved do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestLabelRemoved do
   it_behaves_like 'cycle analytics event' do
     let(:params) { { label: GroupLabel.new } }
   end

ee/spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_last_edited_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestLastEdited do
+RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestLastEdited do
   it_behaves_like 'cycle analytics event'
 end