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

RSpec zero monkey patching mode

See merge request gitlab-org/gitlab!33729

ee/spec/requests/api/group_boards_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::GroupBoards do
+RSpec.describe API::GroupBoards do
   let_it_be(:user) { create(:user) }
   let_it_be(:non_member) { create(:user) }
   let_it_be(:guest) { create(:user) }

ee/spec/requests/api/group_clusters_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::GroupClusters do
+RSpec.describe API::GroupClusters do
   include KubernetesHelpers
 
   let(:current_user) { create(:user) }

ee/spec/requests/api/group_hooks_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::GroupHooks do
+RSpec.describe API::GroupHooks do
   let(:group_admin) { create(:user) }
   let(:non_admin_user) { create(:user) }
   let(:group) { create(:group) }

ee/spec/requests/api/group_milestones_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::GroupMilestones do
+RSpec.describe API::GroupMilestones do
   let(:user) { create(:user) }
   let(:group) { create(:group, :private) }
   let(:project) { create(:project, namespace: group) }

ee/spec/requests/api/group_packages_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::GroupPackages do
+RSpec.describe API::GroupPackages do
   let_it_be(:group) { create(:group, :public) }
   let_it_be(:project) { create(:project, :public, namespace: group, name: 'project A') }
   let_it_be(:user) { create(:user) }

ee/spec/requests/api/groups_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Groups do
+RSpec.describe API::Groups do
   include GroupAPIHelpers
 
   let_it_be(:group, reload: true) { create(:group) }

ee/spec/requests/api/helpers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Helpers do
+RSpec.describe API::Helpers do
   include API::APIGuard::HelperMethods
   include described_class
 

ee/spec/requests/api/internal/base_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe API::Internal::Base do
+RSpec.describe API::Internal::Base do
   include EE::GeoHelpers
 
   let_it_be(:primary_url) { 'http://primary.example.com' }

ee/spec/requests/api/issue_links_spec.rb

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

ee/spec/requests/api/issues_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Issues, :mailer do
+RSpec.describe API::Issues, :mailer do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) do
     create(:project, :public, creator_id: user.id, namespace: user.namespace)

ee/spec/requests/api/jobs_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Jobs do
+RSpec.describe API::Jobs do
   let_it_be(:project) do
     create(:project, :repository, public_builds: false)
   end

ee/spec/requests/api/ldap_group_links_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::LdapGroupLinks, api: true do
+RSpec.describe API::LdapGroupLinks, api: true do
   include ApiHelpers
 
   let(:owner) { create(:user) }

ee/spec/requests/api/ldap_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Ldap do
+RSpec.describe API::Ldap do
   include ApiHelpers
   include LdapHelpers
 

ee/spec/requests/api/license_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::License, api: true do
+RSpec.describe API::License, api: true do
   include ApiHelpers
 
   let(:gl_license)  { build(:gitlab_license) }

ee/spec/requests/api/managed_licenses_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ManagedLicenses do
+RSpec.describe API::ManagedLicenses do
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:maintainer_user) { create(:user) }
   let_it_be(:dev_user) { create(:user) }

ee/spec/requests/api/maven_packages_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe API::MavenPackages do
+RSpec.describe API::MavenPackages do
   let_it_be(:group) { create(:group) }
   let_it_be(:user) { create(:user) }
   let_it_be(:project, reload: true) { create(:project, :public, namespace: group) }

ee/spec/requests/api/members_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Members do
+RSpec.describe API::Members do
   context 'group members endpoint for group managed accounts' do
     let(:group) { create(:group) }
     let(:owner) { create(:user) }

ee/spec/requests/api/merge_request_approval_rules_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::MergeRequestApprovalRules do
+RSpec.describe API::MergeRequestApprovalRules do
   let_it_be(:user) { create(:user) }
   let_it_be(:other_user) { create(:user) }
   let_it_be(:project) { create(:project, :public, :repository, creator: user, namespace: user.namespace) }

ee/spec/requests/api/merge_request_approvals_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::MergeRequestApprovals do
+RSpec.describe API::MergeRequestApprovals do
   let_it_be(:user) { create(:user) }
   let_it_be(:user2) { create(:user) }
   let_it_be(:admin) { create(:user, :admin) }

ee/spec/requests/api/merge_requests_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe API::MergeRequests do
+RSpec.describe API::MergeRequests do
   include ProjectForksHelper
 
   let_it_be(:user)       { create(:user) }

ee/spec/requests/api/merge_trains_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe API::MergeTrains do
+RSpec.describe API::MergeTrains do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:developer) { create(:user) }
   let_it_be(:guest) { create(:user) }

ee/spec/requests/api/namespaces_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Namespaces do
+RSpec.describe API::Namespaces do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
   let!(:group1) { create(:group, name: 'test.test-group.2') }

ee/spec/requests/api/notes_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Notes do
+RSpec.describe API::Notes do
   let!(:user) { create(:user) }
   let!(:project) { create(:project, :public) }
   let(:private_user) { create(:user) }

ee/spec/requests/api/npm_packages_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::NpmPackages do
+RSpec.describe API::NpmPackages do
   include EE::PackagesManagerApiSpecHelpers
 
   let_it_be(:user) { create(:user) }

ee/spec/requests/api/nuget_packages_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe API::NugetPackages do
+RSpec.describe API::NugetPackages do
   include WorkhorseHelpers
   include EE::PackagesManagerApiSpecHelpers
 

ee/spec/requests/api/package_files_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::PackageFiles do
+RSpec.describe API::PackageFiles do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
   let(:package) { create(:maven_package, project: project) }

ee/spec/requests/api/pipelines_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Pipelines do
+RSpec.describe API::Pipelines do
   let(:user)    { create(:user) }
   let(:project) { create(:project, :repository, creator: user) }
 

ee/spec/requests/api/project_aliases_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectAliases, api: true do
+RSpec.describe API::ProjectAliases, api: true do
   let(:user)  { create(:user) }
   let(:admin) { create(:admin) }
 

ee/spec/requests/api/project_approval_rules_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectApprovalRules do
+RSpec.describe API::ProjectApprovalRules do
   let_it_be(:group) { create(:group_with_members) }
   let_it_be(:user) { create(:user) }
   let_it_be(:user2) { create(:user) }

ee/spec/requests/api/project_approval_settings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectApprovalSettings do
+RSpec.describe API::ProjectApprovalSettings do
   let_it_be(:group) { create(:group_with_members) }
   let_it_be(:user) { create(:user) }
   let_it_be(:user2) { create(:user) }

ee/spec/requests/api/project_approvals_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectApprovals do
+RSpec.describe API::ProjectApprovals do
   let_it_be(:group)    { create(:group_with_members) }
   let_it_be(:user)     { create(:user) }
   let_it_be(:user2)    { create(:user) }

ee/spec/requests/api/project_clusters_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectClusters do
+RSpec.describe API::ProjectClusters do
   include KubernetesHelpers
 
   let(:current_user) { create(:user) }

ee/spec/requests/api/project_import_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectImport do
+RSpec.describe API::ProjectImport do
   include ExternalAuthorizationServiceHelpers
   include WorkhorseHelpers
 

ee/spec/requests/api/project_milestones_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectMilestones do
+RSpec.describe API::ProjectMilestones do
   let(:user) { create(:user) }
   let!(:project) { create(:project, namespace: user.namespace ) }
   let!(:milestone) { create(:milestone, project: project, title: 'version2', description: 'open milestone', start_date: Date.today, due_date: Date.today + 3.days) }

ee/spec/requests/api/project_mirror_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectMirror do
+RSpec.describe API::ProjectMirror do
   describe 'POST /projects/:id/mirror/pull' do
     let(:visibility) { Gitlab::VisibilityLevel::PUBLIC }
     let(:project_mirrored) { create(:project, :repository, :mirror, visibility: visibility) }

ee/spec/requests/api/project_packages_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectPackages do
+RSpec.describe API::ProjectPackages do
   let(:user) { create(:user) }
   let_it_be(:project) { create(:project, :public) }
   let!(:package1) { create(:npm_package, project: project, version: '3.1.0', name: "@#{project.root_namespace.path}/foo1") }

ee/spec/requests/api/project_push_rule_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectPushRule, 'ProjectPushRule', api: true do
+RSpec.describe API::ProjectPushRule, 'ProjectPushRule', api: true do
   include ApiHelpers
   let(:user) { create(:user) }
   let(:user3) { create(:user) }

ee/spec/requests/api/project_snapshots_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProjectSnapshots do
+RSpec.describe API::ProjectSnapshots do
   include ::EE::GeoHelpers
 
   let(:project) { create(:project) }

ee/spec/requests/api/projects_spec.rb

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

ee/spec/requests/api/protected_branches_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::ProtectedBranches do
+RSpec.describe API::ProtectedBranches do
   let(:user) { create(:user) }
   let!(:project) { create(:project, :repository) }
   let(:protected_name) { 'feature' }

ee/spec/requests/api/protected_environments_spec.rb

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

ee/spec/requests/api/pypi_packages_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe API::PypiPackages do
+RSpec.describe API::PypiPackages do
   include WorkhorseHelpers
   include EE::PackagesManagerApiSpecHelpers
 

ee/spec/requests/api/releases_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Releases do
+RSpec.describe API::Releases do
   let(:project) { create(:project, :repository, :private) }
   let(:maintainer) { create(:user) }
   let(:reporter) { create(:user) }

ee/spec/requests/api/repositories_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Repositories do
+RSpec.describe API::Repositories do
   let(:project) { create(:project, :repository) }
 
   describe "GET /projects/:id/repository/archive(.:format)?:sha" do

ee/spec/requests/api/resource_label_events_spec.rb

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

ee/spec/requests/api/scim_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Scim do
+RSpec.describe API::Scim do
   let(:user) { create(:user) }
   let(:scim_token) { create(:scim_oauth_access_token, group: group) }
 

ee/spec/requests/api/search_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Search do
+RSpec.describe API::Search do
   let_it_be(:user) { create(:user) }
   let_it_be(:group) { create(:group) }
   let(:project) { create(:project, :public, :repository, :wiki_repo, name: 'awesome project', group: group) }

ee/spec/requests/api/services_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe API::Services do
+RSpec.describe API::Services do
   let_it_be(:user) { create(:user) }
 
   let_it_be(:project) do

ee/spec/requests/api/settings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Settings, 'EE Settings' do
+RSpec.describe API::Settings, 'EE Settings' do
   include StubENV
 
   let(:user) { create(:user) }

ee/spec/requests/api/templates_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Templates do
+RSpec.describe API::Templates do
   files = {
     'Dockerfile/custom.dockerfile' => 'Custom dockerfiles',
     'gitignore/custom.gitignore'   => 'Custom gitignores',

ee/spec/requests/api/todos_spec.rb

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

ee/spec/requests/api/triggers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Triggers do
+RSpec.describe API::Triggers do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, :auto_devops, creator: user) }
 

ee/spec/requests/api/unleash_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Unleash do
+RSpec.describe API::Unleash do
   include FeatureFlagHelpers
 
   let_it_be(:project) { create(:project) }

ee/spec/requests/api/users_spec.rb

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

ee/spec/requests/api/v3/github_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::V3::Github do
+RSpec.describe API::V3::Github do
   let(:user) { create(:user) }
   let(:unauthorized_user) { create(:user) }
   let(:admin) { create(:user, :admin) }

ee/spec/requests/api/visual_review_discussions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::VisualReviewDiscussions do
+RSpec.describe API::VisualReviewDiscussions do
   shared_examples_for 'accepting request without authentication' do
     let(:request) do
       post api("/projects/#{project_id}/merge_requests/#{merge_request.iid}/visual_review_discussions"), params: note_params

ee/spec/requests/api/vulnerabilities_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::Vulnerabilities do
+RSpec.describe API::Vulnerabilities do
   include AccessMatchersForRequest
 
   before do

ee/spec/requests/api/vulnerability_exports_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::VulnerabilityExports do
+RSpec.describe API::VulnerabilityExports do
   include AccessMatchersForRequest
 
   before do

ee/spec/requests/api/vulnerability_findings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::VulnerabilityFindings do
+RSpec.describe API::VulnerabilityFindings do
   include AccessMatchersForRequest
 
   let_it_be(:project) { create(:project, :public) }

ee/spec/requests/api/vulnerability_issue_links_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::VulnerabilityIssueLinks do
+RSpec.describe API::VulnerabilityIssueLinks do
   include AccessMatchersForRequest
 
   before do

ee/spec/requests/git_http_geo_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Git HTTP requests (Geo)", :geo do
+RSpec.describe "Git HTTP requests (Geo)", :geo do
   include TermsHelper
   include ::EE::GeoHelpers
   include GitHttpHelpers

ee/spec/requests/git_http_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Git HTTP requests' do
+RSpec.describe 'Git HTTP requests' do
   include GitHttpHelpers
   include WorkhorseHelpers
 

ee/spec/requests/groups/audit_events_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'view audit events' do
+RSpec.describe 'view audit events' do
   describe 'GET /groups/:group/-/audit_events' do
     let_it_be(:group) { create(:group) }
     let_it_be(:user) { create(:user) }

ee/spec/requests/groups/clusters_controller_spec.rb

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

ee/spec/requests/groups/contribution_analytics_spec.rb

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

ee/spec/requests/groups/roadmap_controller_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Groups::RoadmapController do
+RSpec.describe Groups::RoadmapController do
   let(:user) { create(:user) }
   let(:group) { create(:group, :public) }
 

ee/spec/requests/groups/security/vulnerable_projects_index_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'GET /groups/*group_id/-/security/projects' do
+RSpec.describe 'GET /groups/*group_id/-/security/projects' do
   let(:group) { create(:group) }
   let(:user) { create(:user) }
 

ee/spec/requests/groups_controller_spec.rb

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

ee/spec/requests/jira_authorizations_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Jira authorization requests' do
+RSpec.describe 'Jira authorization requests' do
   let(:user) { create :user }
   let(:application) { create :oauth_application, scopes: 'api' }
   let(:redirect_uri) { oauth_jira_callback_url(host: "http://www.example.com") }

ee/spec/requests/jira_routing_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Jira referenced paths', type: :request do
+RSpec.describe 'Jira referenced paths', type: :request do
   using RSpec::Parameterized::TableSyntax
 
   let(:user) { create(:user) }

ee/spec/requests/jwt_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe JwtController do
+RSpec.describe JwtController do
   context 'authenticating against container registry' do
     let(:user) { create(:user) }
     let(:group) { create(:group) }

ee/spec/requests/lfs_http_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Git LFS API and storage' do
+RSpec.describe 'Git LFS API and storage' do
   include WorkhorseHelpers
 
   let(:user) { create(:user) }

ee/spec/requests/omniauth_kerberos_spnego_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'OmniAuth Kerberos SPNEGO' do
+RSpec.describe 'OmniAuth Kerberos SPNEGO' do
   let(:path) { '/users/auth/kerberos_spnego/negotiate' }
   let(:controller_class) { OmniauthKerberosSpnegoController }
 

ee/spec/requests/projects/analytics/code_reviews_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Analytics::CodeReviewsController, type: :request do
+RSpec.describe Projects::Analytics::CodeReviewsController, type: :request do
   let(:user) { create :user }
   let(:project) { create(:project) }
 

ee/spec/requests/projects/audit_events_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'view audit events' do
+RSpec.describe 'view audit events' do
   describe 'GET /:namespace/:project/-/audit_events' do
     let_it_be(:project) { create(:project, :repository) }
     let_it_be(:user) { project.owner }

ee/spec/requests/projects/issue_links_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::IssueLinksController do
+RSpec.describe Projects::IssueLinksController do
   let(:user) { create :user }
   let(:project) { create(:project_empty_repo) }
   let(:issue) { create :issue, project: project }

ee/spec/requests/projects/issues_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::IssuesController do
+RSpec.describe Projects::IssuesController do
   let_it_be(:issue) { create(:issue) }
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { issue.project }

ee/spec/requests/projects/merge_requests_controller_spec.rb

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

ee/spec/requests/projects/mirrors_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MirrorsController do
+RSpec.describe Projects::MirrorsController do
   let(:project) do
     create(:project, :repository,
            mirror: true,

ee/spec/requests/rack_attack_global_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Rack Attack global throttles' do
+RSpec.describe 'Rack Attack global throttles' do
   include_context 'rack attack cache store'
 
   context 'when the request is from Geo secondary' do

ee/spec/requests/rack_attack_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Rack Attack EE throttles' do
+RSpec.describe 'Rack Attack EE throttles' do
   include RackAttackSpecHelpers
 
   let(:project) { create(:project) }

ee/spec/requests/repositories/git_http_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Repositories::GitHttpController, type: :request do
+RSpec.describe Repositories::GitHttpController, type: :request do
   include GitHttpHelpers
   include ::EE::GeoHelpers
 

ee/spec/requests/search_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SearchController, type: :request do
+RSpec.describe SearchController, type: :request do
   let_it_be(:user) { create(:user) }
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, :public, :repository, :wiki_repo, name: 'awesome project', group: group) }

ee/spec/requests/security/vulnerability_findings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'GET /-/security/vulnerability_findings' do
+RSpec.describe 'GET /-/security/vulnerability_findings' do
   it_behaves_like 'security dashboard JSON endpoint' do
     let(:security_dashboard_request) do
       get security_vulnerability_findings_path, headers: { 'ACCEPT' => 'application/json' }
@@ -147,7 +147,7 @@ describe 'GET /-/security/vulnerability_findings' do
   end
 end
 
-describe 'GET /-/security/vulnerability_findings/summary' do
+RSpec.describe 'GET /-/security/vulnerability_findings/summary' do
   it_behaves_like 'security dashboard JSON endpoint' do
     let(:security_dashboard_request) do
       get summary_security_vulnerability_findings_path, headers: { 'ACCEPT' => 'application/json' }
@@ -229,7 +229,7 @@ describe 'GET /-/security/vulnerability_findings/summary' do
   end
 end
 
-describe 'GET /-/security/vulnerability_findings/history' do
+RSpec.describe 'GET /-/security/vulnerability_findings/history' do
   it_behaves_like 'security dashboard JSON endpoint' do
     let(:security_dashboard_request) do
       get(

ee/spec/requests/security/vulnerable_projects_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'GET /-/security/vulnerable_projects' do
+RSpec.describe 'GET /-/security/vulnerable_projects' do
   it_behaves_like 'security dashboard JSON endpoint' do
     let(:security_dashboard_request) do
       get security_vulnerable_projects_path, headers: { 'ACCEPT' => 'application/json' }

ee/spec/requests/smartcard_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SmartcardController, type: :request do
+RSpec.describe SmartcardController, type: :request do
   include LdapHelpers
 
   let(:smartcard_host) { 'smartcard.example.com' }

ee/spec/routing/admin_routing_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'EE-specific admin routing' do
+RSpec.describe 'EE-specific admin routing' do
   describe Admin::Geo::ProjectsController, 'routing' do
     let(:project_registry) { create(:geo_project_registry) }
 

ee/spec/routing/analytics_routing_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Analytics' do
+RSpec.describe 'Analytics' do
   include Warden::Test::Helpers
 
   it 'redirects to sign_in if user is not authenticated' do

ee/spec/routing/group_routing_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group routing', "routing" do
+RSpec.describe 'Group routing', "routing" do
   include RSpec::Rails::RoutingExampleGroup
 
   describe 'subgroup "boards"' do

ee/spec/routing/project_routing_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe 'EE-specific project routing' do
+RSpec.describe 'EE-specific project routing' do
   before do
     allow(Project).to receive(:find_by_full_path).with('gitlab/gitlabhq', any_args).and_return(true)
   end

ee/spec/routing/webhook_routes_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'routes to the proper webhooks controller', type: :routing do
+RSpec.describe 'routes to the proper webhooks controller', type: :routing do
   context 'with a project context' do
     let(:project) { create(:project) }
     let(:project_hook) { create(:project_hook) }

ee/spec/serializers/analytics/cycle_analytics/event_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Analytics::CycleAnalytics::EventEntity do
+RSpec.describe Analytics::CycleAnalytics::EventEntity do
   describe '#type' do
     it 'returns `simple` for non-label based events' do
       event = Gitlab::Analytics::CycleAnalytics::StageEvents::IssueCreated

ee/spec/serializers/audit_event_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AuditEventEntity do
+RSpec.describe AuditEventEntity do
   let(:event) { create(:audit_event) }
 
   subject { described_class.new(event) }

ee/spec/serializers/audit_event_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AuditEventSerializer do
+RSpec.describe AuditEventSerializer do
   describe '.represent' do
     it 'returns an empty array when there are no audit events' do
       result = described_class.new.represent([])

ee/spec/serializers/blocking_merge_request_entity_spec.rb

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

ee/spec/serializers/board_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BoardSerializer do
+RSpec.describe BoardSerializer do
   let(:resource) { create(:board) }
   let(:json_entity) do
     described_class.new

ee/spec/serializers/clusters/deployment_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Clusters::DeploymentEntity do
+RSpec.describe Clusters::DeploymentEntity do
   let(:deployment) { create(:deployment) }
 
   subject { described_class.new(deployment).as_json }

ee/spec/serializers/clusters/environment_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Clusters::EnvironmentEntity do
+RSpec.describe Clusters::EnvironmentEntity do
   let_it_be(:user) { create(:user) }
   let_it_be(:group) { create(:group) }
   let_it_be(:project, refind: true) { create(:project, group: group) }

ee/spec/serializers/clusters/environment_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Clusters::EnvironmentSerializer do
+RSpec.describe Clusters::EnvironmentSerializer do
   include KubernetesHelpers
 
   let_it_be(:user) { create(:user) }

ee/spec/serializers/dashboard_environment_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DashboardEnvironmentEntity do
+RSpec.describe DashboardEnvironmentEntity do
   describe '.as_json' do
     it 'includes environment attributes' do
       user = create(:user)

ee/spec/serializers/dashboard_environments_project_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DashboardEnvironmentsProjectEntity do
+RSpec.describe DashboardEnvironmentsProjectEntity do
   describe '.as_json' do
     it 'includes project attributes' do
       current_user = create(:user)

ee/spec/serializers/dashboard_environments_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DashboardEnvironmentsSerializer do
+RSpec.describe DashboardEnvironmentsSerializer do
   describe '.represent' do
     it 'returns an empty array when there are no projects' do
       current_user = create(:user)

ee/spec/serializers/dashboard_operations_project_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DashboardOperationsProjectEntity do
+RSpec.describe DashboardOperationsProjectEntity do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:resource) { Dashboard::Operations::ListService::DashboardProject.new(project, nil, 0, nil) }

ee/spec/serializers/dependency_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DependencyEntity do
+RSpec.describe DependencyEntity do
   describe '#as_json' do
     subject { described_class.represent(dependency, request: request).as_json }
 

ee/spec/serializers/dependency_list_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DependencyListEntity do
+RSpec.describe DependencyListEntity do
   it_behaves_like 'report list' do
     let(:name) { :dependencies }
     let(:collection) { [build(:dependency)] }

ee/spec/serializers/dependency_list_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DependencyListSerializer do
+RSpec.describe DependencyListSerializer do
   let_it_be(:project) { create(:project, :repository, :private) }
   let_it_be(:user) { create(:user) }
   let(:ci_build) { create(:ee_ci_build, :success) }

ee/spec/serializers/ee/blob_entity_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe BlobEntity do
+RSpec.describe BlobEntity do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:blob) { project.commit('master').diffs.diff_files.first.blob }

ee/spec/serializers/ee/issue_board_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssueBoardEntity do
+RSpec.describe IssueBoardEntity do
   let_it_be(:project) { create(:project) }
   let_it_be(:issue) { create(:issue, project: project) }
   let_it_be(:user) { create(:user) }

ee/spec/serializers/ee/issue_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssueEntity do
+RSpec.describe IssueEntity do
   let_it_be(:project) { create(:project) }
   let_it_be(:resource) { create(:issue, project: project) }
   let_it_be(:user) { create(:user) }

ee/spec/serializers/ee/job_entity_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-describe JobEntity do
+RSpec.describe JobEntity do
   using RSpec::Parameterized::TableSyntax
 
   let(:user) { create(:user) }

ee/spec/serializers/ee/merge_request_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MergeRequestSerializer do
+RSpec.describe MergeRequestSerializer do
   let_it_be(:user) { create(:user) }
   let_it_be(:resource) { create(:merge_request, description: "Description") }
 

ee/spec/serializers/ee/note_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe NoteEntity do
+RSpec.describe NoteEntity do
   include Gitlab::Routing
 
   let(:issue) { create(:issue) }

ee/spec/serializers/environment_entity_spec.rb

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

ee/spec/serializers/epic_entity_spec.rb

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

ee/spec/serializers/epic_note_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EpicNoteEntity do
+RSpec.describe EpicNoteEntity do
   include Gitlab::Routing
 
   let(:request) { double('request', current_user: user, noteable: note.noteable) }

ee/spec/serializers/feature_flag_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FeatureFlagEntity do
+RSpec.describe FeatureFlagEntity do
   let(:feature_flag) { create(:operations_feature_flag, project: project) }
   let(:project) { create(:project) }
   let(:request) { double('request', current_user: user) }

ee/spec/serializers/feature_flag_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FeatureFlagSerializer do
+RSpec.describe FeatureFlagSerializer do
   let(:serializer) { described_class.new(project: project, current_user: user) }
   let(:user) { create(:user) }
   let(:project) { create(:project) }

ee/spec/serializers/feature_flag_summary_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FeatureFlagSummaryEntity do
+RSpec.describe FeatureFlagSummaryEntity do
   let!(:feature_flag) { create(:operations_feature_flag, project: project) }
   let(:project) { create(:project) }
   let(:request) { double('request', current_user: user) }

ee/spec/serializers/feature_flag_summary_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FeatureFlagSummarySerializer do
+RSpec.describe FeatureFlagSummarySerializer do
   let(:serializer) { described_class.new(project: project, current_user: user) }
   let(:user) { create(:user) }
   let(:project) { create(:project) }

ee/spec/serializers/feature_flags_client_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FeatureFlagsClientSerializer do
+RSpec.describe FeatureFlagsClientSerializer do
   let(:project) { create(:project) }
   let(:feature_flags_client) { project.create_operations_feature_flags_client! }
   let(:serializer) { described_class.new }

ee/spec/serializers/geo_project_registry_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GeoProjectRegistryEntity do
+RSpec.describe GeoProjectRegistryEntity do
   let(:registry) { create(:geo_project_registry, :synced) }
 
   let(:entity) do

ee/spec/serializers/group_issuable_autocomplete_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupIssuableAutocompleteEntity do
+RSpec.describe GroupIssuableAutocompleteEntity do
   let(:group) { build_stubbed(:group) }
   let(:project) { build_stubbed(:project, group: group) }
   let(:issue) { build_stubbed(:issue, project: project) }

ee/spec/serializers/invited_group_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InvitedGroupEntity do
+RSpec.describe InvitedGroupEntity do
   describe '#as_json' do
     let(:group) { build(:group, id: 1) }
 

ee/spec/serializers/invited_group_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InvitedGroupSerializer do
+RSpec.describe InvitedGroupSerializer do
   describe '#represent' do
     it 'includes the id, name, and avatar URL' do
       group = build(:group, id: 1)

ee/spec/serializers/issuable_sidebar_extras_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuableSidebarExtrasEntity do
+RSpec.describe IssuableSidebarExtrasEntity do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:resource) { create(:issue, project: project, assignees: [user]) }

ee/spec/serializers/issue_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssueSerializer do
+RSpec.describe IssueSerializer do
   let(:resource) { create(:issue) }
   let(:user)     { create(:user) }
   let(:json_entity) do

ee/spec/serializers/license_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe LicenseEntity do
+RSpec.describe LicenseEntity do
   describe "#as_json" do
     subject { described_class.represent(license_policy).as_json }
 

ee/spec/serializers/license_scanning_report_dependency_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LicenseScanningReportDependencyEntity do
+RSpec.describe LicenseScanningReportDependencyEntity do
   include LicenseScanningReportHelper
 
   let(:dependency) { create_dependency }

ee/spec/serializers/license_scanning_report_license_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LicenseScanningReportLicenseEntity do
+RSpec.describe LicenseScanningReportLicenseEntity do
   include LicenseScanningReportHelper
 
   let(:user) { build(:user) }

ee/spec/serializers/license_scanning_reports_comparer_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LicenseScanningReportsComparerEntity do
+RSpec.describe LicenseScanningReportsComparerEntity do
   include LicenseScanningReportHelper
 
   let(:user) { build(:user) }

ee/spec/serializers/licenses_list_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LicensesListEntity do
+RSpec.describe LicensesListEntity do
   let!(:pipeline) { create(:ee_ci_pipeline, :with_license_scanning_report, project: project) }
   let(:license_compliance) { ::SCA::LicenseCompliance.new(project) }
 

ee/spec/serializers/licenses_list_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LicensesListSerializer do
+RSpec.describe LicensesListSerializer do
   describe '#to_json' do
     subject do
       described_class.new(project: project, user: user)

ee/spec/serializers/linked_project_issue_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LinkedProjectIssueEntity do
+RSpec.describe LinkedProjectIssueEntity do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:issue_link) { create(:issue_link) }

ee/spec/serializers/managed_license_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ManagedLicenseEntity do
+RSpec.describe ManagedLicenseEntity do
   let(:software_license_policy) { create(:software_license_policy) }
   let(:entity) { described_class.new(software_license_policy) }
 

ee/spec/serializers/merge_request_compliance_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MergeRequestComplianceEntity do
+RSpec.describe MergeRequestComplianceEntity do
   include Gitlab::Routing
 
   let_it_be(:project) { create(:project) }

ee/spec/serializers/merge_request_poll_widget_entity_spec.rb

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

ee/spec/serializers/merge_request_sidebar_basic_entity_spec.rb

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

ee/spec/serializers/merge_request_widget_entity_spec.rb

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

ee/spec/serializers/metrics_report_metric_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MetricsReportMetricEntity do
+RSpec.describe MetricsReportMetricEntity do
   let(:metric) { ::Gitlab::Ci::Reports::Metrics::ReportsComparer::ComparedMetric.new('metric_name', 'metric_value') }
   let(:entity) { described_class.new(metric) }
 

ee/spec/serializers/metrics_reports_comparer_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MetricsReportsComparerEntity do
+RSpec.describe MetricsReportsComparerEntity do
   let(:base_report) { build(:ci_reports_metrics_report, :base_metrics) }
   let(:head_report) { build(:ci_reports_metrics_report, :head_metrics) }
   let(:comparer) { Gitlab::Ci::Reports::Metrics::ReportsComparer.new(base_report, head_report) }

ee/spec/serializers/pipeline_serializer_spec.rb

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

ee/spec/serializers/productivity_analytics_merge_request_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProductivityAnalyticsMergeRequestEntity do
+RSpec.describe ProductivityAnalyticsMergeRequestEntity do
   subject { described_class.represent(merge_request).as_json.with_indifferent_access }
 
   let(:merge_request) { create(:merge_request) }

ee/spec/serializers/project_mirror_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectMirrorEntity do
+RSpec.describe ProjectMirrorEntity do
   subject(:entity) { described_class.new(project).as_json.deep_symbolize_keys }
 
   describe 'pull mirror' do

ee/spec/serializers/rollout_status_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RolloutStatusEntity do
+RSpec.describe RolloutStatusEntity do
   include KubernetesHelpers
 
   let(:rollout_status) { kube_deployment_rollout_status }

ee/spec/serializers/scim_oauth_access_token_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ScimOauthAccessTokenEntity do
+RSpec.describe ScimOauthAccessTokenEntity do
   let(:entity) do
     described_class.new(create(:scim_oauth_access_token))
   end

ee/spec/serializers/status_page/incident_comment_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StatusPage::IncidentCommentEntity do
+RSpec.describe StatusPage::IncidentCommentEntity do
   let_it_be(:note, reload: true) { create(:note, note: ':ok:') }
   let(:json) { subject.as_json }
   let(:issue) { instance_double(Issue, iid: 1) }

ee/spec/serializers/status_page/incident_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StatusPage::IncidentEntity do
+RSpec.describe StatusPage::IncidentEntity do
   let_it_be(:user) { create(:user) }
 
   let_it_be(:issue, reload: true) do

ee/spec/serializers/status_page/incident_serializer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StatusPage::IncidentSerializer do
+RSpec.describe StatusPage::IncidentSerializer do
   let_it_be(:issue) { create(:issue) }
 
   shared_examples 'valid JSON schema' do |schema:|

ee/spec/serializers/status_page/renderer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StatusPage::Renderer do
+RSpec.describe StatusPage::Renderer do
   describe '.markdown' do
     it 'delegates to MarkupHelper.markdown_field' do
       object = Object.new

ee/spec/serializers/storage_shard_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StorageShardEntity do
+RSpec.describe StorageShardEntity do
   let(:entity) { described_class.new(StorageShard.new, request: double) }
 
   subject { entity.as_json }