Add latest changes from gitlab-org/gitlab@master

6 files changed, 387 insertions, 379 deletions

diff --git a/qa/qa/specs/features/api/3_create/repository/files_spec.rb b/qa/qa/specs/features/api/3_create/repository/files_spec.rb
index 4d28937fbf8..151fd0fffe3 100644
--- a/qa/qa/specs/features/api/3_create/repository/files_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/files_spec.rb
@@ -3,68 +3,69 @@
 require 'airborne'
 
 module QA
-  RSpec.describe 'API basics' do
-    before(:context) do
-      @api_client = Runtime::API::Client.new(:gitlab)
-    end
+  RSpec.describe 'Create' do
+    describe 'API basics' do
+      before(:context) do
+        @api_client = Runtime::API::Client.new(:gitlab)
+      end
 
-    let(:project_name) { "api-basics-#{SecureRandom.hex(8)}" }
-    let(:sanitized_project_path) { CGI.escape("#{Runtime::User.username}/#{project_name}") }
+      let(:project_name) { "api-basics-#{SecureRandom.hex(8)}" }
+      let(:sanitized_project_path) { CGI.escape("#{Runtime::User.username}/#{project_name}") }
 
-    it 'user creates a project with a file and deletes them afterwards', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347745' do
-      create_project_request = Runtime::API::Request.new(@api_client, '/projects')
-      post create_project_request.url, path: project_name, name: project_name
+      it 'user creates a project with a file and deletes them afterwards', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347745' do
+        create_project_request = Runtime::API::Request.new(@api_client, '/projects')
+        post create_project_request.url, path: project_name, name: project_name
 
-      expect_status(201)
-      expect(json_body).to match(
-        a_hash_including(name: project_name, path: project_name)
-      )
+        expect_status(201)
+        expect(json_body).to match(
+          a_hash_including(name: project_name, path: project_name)
+        )
 
-      default_branch = json_body[:default_branch].to_s.empty? ? Runtime::Env.default_branch : json_body[:default_branch]
+        default_branch = json_body[:default_branch].to_s.empty? ? Runtime::Env.default_branch : json_body[:default_branch]
 
-      create_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md")
-      post create_file_request.url, branch: default_branch, content: 'Hello world', commit_message: 'Add README.md'
+        create_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md")
+        post create_file_request.url, branch: default_branch, content: 'Hello world', commit_message: 'Add README.md'
 
-      expect_status(201)
-      expect(json_body).to match(
-        a_hash_including(branch: default_branch, file_path: 'README.md')
-      )
+        expect_status(201)
+        expect(json_body).to match(
+          a_hash_including(branch: default_branch, file_path: 'README.md')
+        )
 
-      get_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md", ref: default_branch)
-      get get_file_request.url
+        get_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md", ref: default_branch)
+        get get_file_request.url
 
-      expect_status(200)
-      expect(json_body).to match(
-        a_hash_including(
-          ref: default_branch,
-          file_path: 'README.md', file_name: 'README.md',
-          encoding: 'base64', content: 'SGVsbG8gd29ybGQ='
+        expect_status(200)
+        expect(json_body).to match(
+          a_hash_including(
+            ref: default_branch,
+            file_path: 'README.md', file_name: 'README.md',
+            encoding: 'base64', content: 'SGVsbG8gd29ybGQ='
+          )
         )
-      )
 
-      delete_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md", branch: default_branch, commit_message: 'Remove README.md')
-      delete delete_file_request.url
+        delete_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md", branch: default_branch, commit_message: 'Remove README.md')
+        delete delete_file_request.url
 
-      expect_status(204)
+        expect_status(204)
 
-      get_tree_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/tree")
-      get get_tree_request.url
+        get_tree_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/tree")
+        get get_tree_request.url
 
-      expect_status(200)
-      expect(json_body).to eq([])
+        expect_status(200)
+        expect(json_body).to eq([])
 
-      delete_project_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}")
-      delete delete_project_request.url
+        delete_project_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}")
+        delete delete_project_request.url
 
-      expect_status(202)
-      expect(json_body).to match(
-        a_hash_including(message: '202 Accepted')
-      )
-    end
+        expect_status(202)
+        expect(json_body).to match(
+          a_hash_including(message: '202 Accepted')
+        )
+      end
 
-    describe 'raw file access' do
-      let(:svg_file) do
-        <<-SVG
+      describe 'raw file access' do
+        let(:svg_file) do
+          <<-SVG
           <?xml version="1.0" standalone="no"?>
           <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
@@ -74,44 +75,45 @@ module QA
                alert("surprise");
             </script>
           </svg>
-        SVG
-      end
-
-      it 'sets no-cache headers as expected', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347746' do
-        create_project_request = Runtime::API::Request.new(@api_client, '/projects')
-        post create_project_request.url, path: project_name, name: project_name
-
-        default_branch = json_body[:default_branch].to_s.empty? ? Runtime::Env.default_branch : json_body[:default_branch]
-
-        create_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/test.svg")
-        post create_file_request.url, branch: default_branch, content: svg_file, commit_message: 'Add test.svg'
-
-        get_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/test.svg/raw", ref: default_branch)
-
-        3.times do
-          response = get get_file_request.url
-
-          # Subsequent responses aren't cached, so headers should match from
-          #   request to request, especially a 200 response rather than a 304
-          #   (indicating a cached response.) Further, :content_disposition
-          #   should include `attachment` for all responses.
-          #
-          expect(response.headers[:cache_control]).to include("no-store")
-          expect(response.headers[:cache_control]).to include("no-cache")
-          expect(response.headers[:pragma]).to eq("no-cache")
-          expect(response.headers[:expires]).to eq("Fri, 01 Jan 1990 00:00:00 GMT")
-          expect(response.headers[:content_disposition]).to include("attachment")
-          expect(response.headers[:content_disposition]).not_to include("inline")
-          expect(response.headers[:content_type]).to include("image/svg+xml")
+          SVG
         end
 
-        delete_project_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}")
-        delete delete_project_request.url
-
-        expect_status(202)
-        expect(json_body).to match(
-          a_hash_including(message: '202 Accepted')
-        )
+        it 'sets no-cache headers as expected', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347746' do
+          create_project_request = Runtime::API::Request.new(@api_client, '/projects')
+          post create_project_request.url, path: project_name, name: project_name
+
+          default_branch = json_body[:default_branch].to_s.empty? ? Runtime::Env.default_branch : json_body[:default_branch]
+
+          create_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/test.svg")
+          post create_file_request.url, branch: default_branch, content: svg_file, commit_message: 'Add test.svg'
+
+          get_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/test.svg/raw", ref: default_branch)
+
+          3.times do
+            response = get get_file_request.url
+
+            # Subsequent responses aren't cached, so headers should match from
+            #   request to request, especially a 200 response rather than a 304
+            #   (indicating a cached response.) Further, :content_disposition
+            #   should include `attachment` for all responses.
+            #
+            expect(response.headers[:cache_control]).to include("no-store")
+            expect(response.headers[:cache_control]).to include("no-cache")
+            expect(response.headers[:pragma]).to eq("no-cache")
+            expect(response.headers[:expires]).to eq("Fri, 01 Jan 1990 00:00:00 GMT")
+            expect(response.headers[:content_disposition]).to include("attachment")
+            expect(response.headers[:content_disposition]).not_to include("inline")
+            expect(response.headers[:content_type]).to include("image/svg+xml")
+          end
+
+          delete_project_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}")
+          delete delete_project_request.url
+
+          expect_status(202)
+          expect(json_body).to match(
+            a_hash_including(message: '202 Accepted')
+          )
+        end
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_default_enabled_spec.rb b/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_default_enabled_spec.rb
index bb4e0d71710..72090306fd9 100644
--- a/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_default_enabled_spec.rb
+++ b/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_default_enabled_spec.rb
@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Service ping default enabled' do
-    context 'When using default enabled from gitlab.yml config', :requires_admin, except: { job: 'review-qa-*' } do
-      before do
-        Flow::Login.sign_in_as_admin
+  RSpec.describe 'Non-devops' do
+    describe 'Service ping default enabled' do
+      context 'when using default enabled from gitlab.yml config', :requires_admin, except: { job: 'review-qa-*' } do
+        before do
+          Flow::Login.sign_in_as_admin
 
-        Page::Main::Menu.perform(&:go_to_admin_area)
-        Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
-      end
+          Page::Main::Menu.perform(&:go_to_admin_area)
+          Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
+        end
 
-      it 'has service ping toggle enabled', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348335' do
-        Page::Admin::Settings::MetricsAndProfiling.perform do |setting|
-          setting.expand_usage_statistics do |page|
-            expect(page).not_to have_disabled_usage_data_checkbox
+        it 'has service ping toggle enabled', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348335' do
+          Page::Admin::Settings::MetricsAndProfiling.perform do |setting|
+            setting.expand_usage_statistics do |page|
+              expect(page).not_to have_disabled_usage_data_checkbox
+            end
           end
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_disabled_spec.rb b/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_disabled_spec.rb
index cab8bd367f5..791bd688cea 100644
--- a/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_disabled_spec.rb
+++ b/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_disabled_spec.rb
@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Service ping disabled', :orchestrated, :service_ping_disabled, :requires_admin do
-    context 'when disabled from gitlab.yml config' do
-      before do
-        Flow::Login.sign_in_as_admin
+  RSpec.describe 'Non-devops' do
+    describe 'Service ping disabled', :orchestrated, :service_ping_disabled, :requires_admin do
+      context 'when disabled from gitlab.yml config' do
+        before do
+          Flow::Login.sign_in_as_admin
 
-        Page::Main::Menu.perform(&:go_to_admin_area)
-        Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
-      end
+          Page::Main::Menu.perform(&:go_to_admin_area)
+          Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
+        end
 
-      it 'has service ping toggle is disabled', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348340' do
-        Page::Admin::Settings::MetricsAndProfiling.perform do |settings|
-          settings.expand_usage_statistics do |usage_statistics|
-            expect(usage_statistics).to have_disabled_usage_data_checkbox
+        it 'has service ping toggle is disabled', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348340' do
+          Page::Admin::Settings::MetricsAndProfiling.perform do |settings|
+            settings.expand_usage_statistics do |usage_statistics|
+              expect(usage_statistics).to have_disabled_usage_data_checkbox
+            end
           end
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
index b0eb3ac7b37..a1a795ce0f3 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
@@ -1,34 +1,36 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'SSH keys support', :smoke, :skip_fips_env do
-    key_title = "key for ssh tests #{Time.now.to_f}"
-    key = nil
+  RSpec.describe 'Create' do
+    describe 'SSH keys support', :smoke, :skip_fips_env do
+      key_title = "key for ssh tests #{Time.now.to_f}"
+      key = nil
 
-    before do
-      Flow::Login.sign_in
-    end
+      before do
+        Flow::Login.sign_in
+      end
+
+      it 'user can add an SSH key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347819' do
+        key = Resource::SSHKey.fabricate_via_browser_ui! do |resource|
+          resource.title = key_title
+        end
 
-    it 'user can add an SSH key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347819' do
-      key = Resource::SSHKey.fabricate_via_browser_ui! do |resource|
-        resource.title = key_title
+        expect(page).to have_content(key.title)
+        expect(page).to have_content(key.md5_fingerprint)
       end
 
-      expect(page).to have_content(key.title)
-      expect(page).to have_content(key.md5_fingerprint)
-    end
+      # Note this context ensures that the example it contains is executed after the example above. Be aware of the order of execution if you add new examples in either context.
+      context 'after adding an ssh key' do
+        it 'can delete an ssh key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347820' do
+          Page::Main::Menu.perform(&:click_edit_profile_link)
+          Page::Profile::Menu.perform(&:click_ssh_keys)
+          Page::Profile::SSHKeys.perform do |ssh_keys|
+            ssh_keys.remove_key(key.title)
+          end
 
-    # Note this context ensures that the example it contains is executed after the example above. Be aware of the order of execution if you add new examples in either context.
-    context 'after adding an ssh key' do
-      it 'can delete an ssh key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347820' do
-        Page::Main::Menu.perform(&:click_edit_profile_link)
-        Page::Profile::Menu.perform(&:click_ssh_keys)
-        Page::Profile::SSHKeys.perform do |ssh_keys|
-          ssh_keys.remove_key(key.title)
+          expect(page).not_to have_content("Title: #{key.title}")
+          expect(page).not_to have_content(key.md5_fingerprint)
         end
-
-        expect(page).not_to have_content("Title: #{key.title}")
-        expect(page).not_to have_content(key.md5_fingerprint)
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
index 0ee5f1b6a0b..61a92daf129 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
@@ -1,170 +1,170 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package Registry', :orchestrated, :reliable, :packages, :object_storage do
-    describe 'npm instance level endpoint' do
-      using RSpec::Parameterized::TableSyntax
-      include Runtime::Fixtures
-      include Support::Helpers::MaskToken
-
-      let!(:registry_scope) { Runtime::Namespace.sandbox_name }
-      let!(:personal_access_token) do
-        unless Page::Main::Menu.perform(&:signed_in?)
-          Flow::Login.sign_in
+  RSpec.describe 'Package' do
+    describe 'Package Registry', :orchestrated, :reliable, :packages, :object_storage do
+      describe 'npm instance level endpoint' do
+        using RSpec::Parameterized::TableSyntax
+        include Runtime::Fixtures
+        include Support::Helpers::MaskToken
+
+        let!(:registry_scope) { Runtime::Namespace.sandbox_name }
+        let!(:personal_access_token) do
+          Flow::Login.sign_in unless Page::Main::Menu.perform(&:signed_in?)
+
+          Resource::PersonalAccessToken.fabricate!.token
         end
 
-        Resource::PersonalAccessToken.fabricate!.token
-      end
-
-      let(:project_deploy_token) do
-        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
-          deploy_token.name = 'npm-deploy-token'
-          deploy_token.project = project
-          deploy_token.scopes = %w[
-            read_repository
-            read_package_registry
-            write_package_registry
-          ]
+        let(:project_deploy_token) do
+          Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
+            deploy_token.name = 'npm-deploy-token'
+            deploy_token.project = project
+            deploy_token.scopes = %w[
+              read_repository
+              read_package_registry
+              write_package_registry
+            ]
+          end
         end
-      end
 
-      let(:uri) { URI.parse(Runtime::Scenario.gitlab_address) }
-      let(:gitlab_address_with_port) { "#{uri.scheme}://#{uri.host}:#{uri.port}" }
-      let(:gitlab_host_with_port) { "#{uri.host}:#{uri.port}" }
+        let(:uri) { URI.parse(Runtime::Scenario.gitlab_address) }
+        let(:gitlab_address_with_port) { "#{uri.scheme}://#{uri.host}:#{uri.port}" }
+        let(:gitlab_host_with_port) { "#{uri.host}:#{uri.port}" }
 
-      let!(:project) do
-        Resource::Project.fabricate_via_api! do |project|
-          project.name = 'npm-instace-level-publish'
+        let!(:project) do
+          Resource::Project.fabricate_via_api! do |project|
+            project.name = 'npm-instace-level-publish'
+          end
         end
-      end
 
-      let!(:another_project) do
-        Resource::Project.fabricate_via_api! do |another_project|
-          another_project.name = 'npm-instance-level-install'
-          another_project.template_name = 'express'
-          another_project.group = project.group
+        let!(:another_project) do
+          Resource::Project.fabricate_via_api! do |another_project|
+            another_project.name = 'npm-instance-level-install'
+            another_project.template_name = 'express'
+            another_project.group = project.group
+          end
         end
-      end
 
-      let!(:runner) do
-        Resource::Runner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.group.name}"]
-          runner.executor = :docker
-          runner.token = project.group.reload!.runners_token
+        let!(:runner) do
+          Resource::Runner.fabricate! do |runner|
+            runner.name = "qa-runner-#{Time.now.to_i}"
+            runner.tags = ["runner-for-#{project.group.name}"]
+            runner.executor = :docker
+            runner.token = project.group.reload!.runners_token
+          end
         end
-      end
 
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "@#{registry_scope}/#{project.name}-#{SecureRandom.hex(8)}"
-          package.project = project
+        let(:package) do
+          Resource::Package.init do |package|
+            package.name = "@#{registry_scope}/#{project.name}-#{SecureRandom.hex(8)}"
+            package.project = project
+          end
         end
-      end
-
-      after do
-        package.remove_via_api!
-        runner.remove_via_api!
-        project.remove_via_api!
-        another_project.remove_via_api!
-      end
 
-      where(:case_name, :authentication_token_type, :token_name, :testcase) do
-        'using personal access token' | :personal_access_token | 'Personal Access Token' | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347600'
-        'using ci job token'          | :ci_job_token          | 'CI Job Token'          | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347599'
-        'using project deploy token'  | :project_deploy_token  | 'Deploy Token'          | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347598'
-      end
+        after do
+          package.remove_via_api!
+          runner.remove_via_api!
+          project.remove_via_api!
+          another_project.remove_via_api!
+        end
 
-      with_them do
-        let(:auth_token) do
-          case authentication_token_type
-          when :personal_access_token
-            use_ci_variable(name: 'PERSONAL_ACCESS_TOKEN', value: personal_access_token, project: project)
-            use_ci_variable(name: 'PERSONAL_ACCESS_TOKEN', value: personal_access_token, project: another_project)
-          when :ci_job_token
-            '${CI_JOB_TOKEN}'
-          when :project_deploy_token
-            use_ci_variable(name: 'PROJECT_DEPLOY_TOKEN', value: project_deploy_token.token, project: project)
-            use_ci_variable(name: 'PROJECT_DEPLOY_TOKEN', value: project_deploy_token.token, project: another_project)
-          end
+        where(:case_name, :authentication_token_type, :token_name, :testcase) do
+          'using personal access token' | :personal_access_token | 'Personal Access Token' | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347600'
+          'using ci job token'          | :ci_job_token          | 'CI Job Token'          | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347599'
+          'using project deploy token'  | :project_deploy_token  | 'Deploy Token'          | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347598'
         end
 
-        it 'push and pull a npm package via CI', testcase: params[:testcase] do
-          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
-            npm_upload_yaml = ERB.new(read_fixture('package_managers/npm', 'npm_upload_package_instance.yaml.erb')).result(binding)
-            package_json = ERB.new(read_fixture('package_managers/npm', 'package_instance.json.erb')).result(binding)
-
-            Resource::Repository::Commit.fabricate_via_api! do |commit|
-              commit.project = project
-              commit.commit_message = 'Add files'
-              commit.add_files([
-                                {
-                                  file_path: '.gitlab-ci.yml',
-                                  content: npm_upload_yaml
-                                },
-                                {
-                                  file_path: 'package.json',
-                                  content: package_json
-                                }
-                              ])
+        with_them do
+          let(:auth_token) do
+            case authentication_token_type
+            when :personal_access_token
+              use_ci_variable(name: 'PERSONAL_ACCESS_TOKEN', value: personal_access_token, project: project)
+              use_ci_variable(name: 'PERSONAL_ACCESS_TOKEN', value: personal_access_token, project: another_project)
+            when :ci_job_token
+              '${CI_JOB_TOKEN}'
+            when :project_deploy_token
+              use_ci_variable(name: 'PROJECT_DEPLOY_TOKEN', value: project_deploy_token.token, project: project)
+              use_ci_variable(name: 'PROJECT_DEPLOY_TOKEN', value: project_deploy_token.token, project: another_project)
             end
           end
 
-          project.visit!
-          Flow::Pipeline.visit_latest_pipeline
+          it 'push and pull a npm package via CI', testcase: params[:testcase] do
+            Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+              npm_upload_yaml = ERB.new(read_fixture('package_managers/npm', 'npm_upload_package_instance.yaml.erb')).result(binding)
+              package_json = ERB.new(read_fixture('package_managers/npm', 'package_instance.json.erb')).result(binding)
+
+              Resource::Repository::Commit.fabricate_via_api! do |commit|
+                commit.project = project
+                commit.commit_message = 'Add files'
+                commit.add_files([
+                                   {
+                                     file_path: '.gitlab-ci.yml',
+                                     content: npm_upload_yaml
+                                   },
+                                   {
+                                     file_path: 'package.json',
+                                     content: package_json
+                                   }
+                                 ])
+              end
+            end
 
-          Page::Project::Pipeline::Show.perform do |pipeline|
-            pipeline.click_job('deploy')
-          end
+            project.visit!
+            Flow::Pipeline.visit_latest_pipeline
 
-          Page::Project::Job::Show.perform do |job|
-            expect(job).to be_successful(timeout: 800)
-          end
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.click_job('deploy')
+            end
 
-          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
-            Resource::Repository::Commit.fabricate_via_api! do |commit|
-              npm_install_yaml = ERB.new(read_fixture('package_managers/npm', 'npm_install_package_instance.yaml.erb')).result(binding)
-
-              commit.project = another_project
-              commit.commit_message = 'Add .gitlab-ci.yml'
-              commit.add_files([
-                {
-                  file_path: '.gitlab-ci.yml',
-                  content: npm_install_yaml
-                }
-              ])
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_successful(timeout: 800)
             end
-          end
 
-          another_project.visit!
-          Flow::Pipeline.visit_latest_pipeline
+            Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+              Resource::Repository::Commit.fabricate_via_api! do |commit|
+                npm_install_yaml = ERB.new(read_fixture('package_managers/npm', 'npm_install_package_instance.yaml.erb')).result(binding)
+
+                commit.project = another_project
+                commit.commit_message = 'Add .gitlab-ci.yml'
+                commit.add_files([
+                                   {
+                                     file_path: '.gitlab-ci.yml',
+                                     content: npm_install_yaml
+                                   }
+                                 ])
+              end
+            end
 
-          Page::Project::Pipeline::Show.perform do |pipeline|
-            pipeline.click_job('install')
-          end
+            another_project.visit!
+            Flow::Pipeline.visit_latest_pipeline
 
-          Page::Project::Job::Show.perform do |job|
-            expect(job).to be_successful(timeout: 800)
-            job.click_browse_button
-          end
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.click_job('install')
+            end
 
-          Page::Project::Artifact::Show.perform do |artifacts|
-            artifacts.go_to_directory('node_modules')
-            artifacts.go_to_directory("@#{registry_scope}")
-            expect(artifacts).to have_content("#{project.name}")
-          end
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_successful(timeout: 800)
+              job.click_browse_button
+            end
+
+            Page::Project::Artifact::Show.perform do |artifacts|
+              artifacts.go_to_directory('node_modules')
+              artifacts.go_to_directory("@#{registry_scope}")
+              expect(artifacts).to have_content(project.name.to_s)
+            end
 
-          project.visit!
-          Page::Project::Menu.perform(&:click_packages_link)
+            project.visit!
+            Page::Project::Menu.perform(&:click_packages_link)
 
-          Page::Project::Packages::Index.perform do |index|
-            expect(index).to have_package(package.name)
+            Page::Project::Packages::Index.perform do |index|
+              expect(index).to have_package(package.name)
 
-            index.click_package(package.name)
-          end
+              index.click_package(package.name)
+            end
 
-          Page::Project::Packages::Show.perform do |show|
-            expect(show).to have_package_info(package.name, "1.0.0")
+            Page::Project::Packages::Show.perform do |show|
+              expect(show).to have_package_info(package.name, "1.0.0")
+            end
           end
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
index 5ebcb94d0d0..59324c7338a 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
@@ -1,142 +1,142 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package Registry', :orchestrated, :reliable, :packages, :object_storage do
-    describe 'npm project level endpoint' do
-      using RSpec::Parameterized::TableSyntax
-      include Runtime::Fixtures
-      include Support::Helpers::MaskToken
-
-      let!(:registry_scope) { Runtime::Namespace.sandbox_name }
-      let!(:personal_access_token) do
-        unless Page::Main::Menu.perform(&:signed_in?)
-          Flow::Login.sign_in
+  RSpec.describe 'Package' do
+    describe 'Package Registry', :orchestrated, :reliable, :packages, :object_storage do
+      describe 'npm project level endpoint' do
+        using RSpec::Parameterized::TableSyntax
+        include Runtime::Fixtures
+        include Support::Helpers::MaskToken
+
+        let!(:registry_scope) { Runtime::Namespace.sandbox_name }
+        let!(:personal_access_token) do
+          Flow::Login.sign_in unless Page::Main::Menu.perform(&:signed_in?)
+
+          Resource::PersonalAccessToken.fabricate!.token
         end
 
-        Resource::PersonalAccessToken.fabricate!.token
-      end
-
-      let(:project_deploy_token) do
-        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
-          deploy_token.name = 'npm-deploy-token'
-          deploy_token.project = project
-          deploy_token.scopes = %w[
-            read_repository
-            read_package_registry
-            write_package_registry
-          ]
-        end
-      end
-
-      let(:uri) { URI.parse(Runtime::Scenario.gitlab_address) }
-      let(:gitlab_address_with_port) { "#{uri.scheme}://#{uri.host}:#{uri.port}" }
-      let(:gitlab_host_with_port) { "#{uri.host}:#{uri.port}" }
-
-      let!(:project) do
-        Resource::Project.fabricate_via_api! do |project|
-          project.name = 'npm-project-level'
-          project.visibility = :private
-        end
-      end
-
-      let!(:runner) do
-        Resource::Runner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.name}"]
-          runner.executor = :docker
-          runner.project = project
-        end
-      end
-
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "@#{registry_scope}/mypackage-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
-      end
-
-      after do
-        package.remove_via_api!
-        runner.remove_via_api!
-        project.remove_via_api!
-      end
-
-      where(:case_name, :authentication_token_type, :token_name, :testcase) do
-        'using personal access token' | :personal_access_token | 'Personal Access Token' | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347592'
-        'using ci job token'          | :ci_job_token          | 'CI Job Token'          | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347594'
-        'using project deploy token'  | :project_deploy_token  | 'Deploy Token'          | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347593'
-      end
-
-      with_them do
-        let(:auth_token) do
-          case authentication_token_type
-          when :personal_access_token
-            use_ci_variable(name: 'PERSONAL_ACCESS_TOKEN', value: personal_access_token, project: project)
-          when :ci_job_token
-            '${CI_JOB_TOKEN}'
-          when :project_deploy_token
-            use_ci_variable(name: 'PROJECT_DEPLOY_TOKEN', value: project_deploy_token.token, project: project)
+        let(:project_deploy_token) do
+          Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
+            deploy_token.name = 'npm-deploy-token'
+            deploy_token.project = project
+            deploy_token.scopes = %w[
+              read_repository
+              read_package_registry
+              write_package_registry
+            ]
           end
         end
 
-        it 'push and pull a npm package via CI', testcase: params[:testcase] do
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            npm_upload_install_yaml = ERB.new(read_fixture('package_managers/npm', 'npm_upload_install_package_project.yaml.erb')).result(binding)
-            package_json = ERB.new(read_fixture('package_managers/npm', 'package_project.json.erb')).result(binding)
-
-            commit.project = project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([
-                              {
-                                file_path: '.gitlab-ci.yml',
-                                content: npm_upload_install_yaml
-                              },
-                              {
-                                file_path: 'package.json',
-                                content: package_json
-                              }
-                            ])
-          end
-
-          project.visit!
-          Flow::Pipeline.visit_latest_pipeline
-
-          Page::Project::Pipeline::Show.perform do |pipeline|
-            pipeline.click_job('deploy')
-          end
+        let(:uri) { URI.parse(Runtime::Scenario.gitlab_address) }
+        let(:gitlab_address_with_port) { "#{uri.scheme}://#{uri.host}:#{uri.port}" }
+        let(:gitlab_host_with_port) { "#{uri.host}:#{uri.port}" }
 
-          Page::Project::Job::Show.perform do |job|
-            expect(job).to be_successful(timeout: 800)
-          end
-
-          Flow::Pipeline.visit_latest_pipeline
-
-          Page::Project::Pipeline::Show.perform do |pipeline|
-            pipeline.click_job('install')
+        let!(:project) do
+          Resource::Project.fabricate_via_api! do |project|
+            project.name = 'npm-project-level'
+            project.visibility = :private
           end
+        end
 
-          Page::Project::Job::Show.perform do |job|
-            expect(job).to be_successful(timeout: 800)
-            job.click_browse_button
+        let!(:runner) do
+          Resource::Runner.fabricate! do |runner|
+            runner.name = "qa-runner-#{Time.now.to_i}"
+            runner.tags = ["runner-for-#{project.name}"]
+            runner.executor = :docker
+            runner.project = project
           end
+        end
 
-          Page::Project::Artifact::Show.perform do |artifacts|
-            artifacts.go_to_directory('node_modules')
-            artifacts.go_to_directory("@#{registry_scope}")
-            expect(artifacts).to have_content('mypackage')
+        let(:package) do
+          Resource::Package.init do |package|
+            package.name = "@#{registry_scope}/mypackage-#{SecureRandom.hex(8)}"
+            package.project = project
           end
+        end
 
-          project.visit!
-          Page::Project::Menu.perform(&:click_packages_link)
+        after do
+          package.remove_via_api!
+          runner.remove_via_api!
+          project.remove_via_api!
+        end
 
-          Page::Project::Packages::Index.perform do |index|
-            expect(index).to have_package(package.name)
+        where(:case_name, :authentication_token_type, :token_name, :testcase) do
+          'using personal access token' | :personal_access_token | 'Personal Access Token' | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347592'
+          'using ci job token'          | :ci_job_token          | 'CI Job Token'          | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347594'
+          'using project deploy token'  | :project_deploy_token  | 'Deploy Token'          | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347593'
+        end
 
-            index.click_package(package.name)
+        with_them do
+          let(:auth_token) do
+            case authentication_token_type
+            when :personal_access_token
+              use_ci_variable(name: 'PERSONAL_ACCESS_TOKEN', value: personal_access_token, project: project)
+            when :ci_job_token
+              '${CI_JOB_TOKEN}'
+            when :project_deploy_token
+              use_ci_variable(name: 'PROJECT_DEPLOY_TOKEN', value: project_deploy_token.token, project: project)
+            end
           end
 
-          Page::Project::Packages::Show.perform do |show|
-            expect(show).to have_package_info(package.name, "1.0.0")
+          it 'push and pull a npm package via CI', testcase: params[:testcase] do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              npm_upload_install_yaml = ERB.new(read_fixture('package_managers/npm', 'npm_upload_install_package_project.yaml.erb')).result(binding)
+              package_json = ERB.new(read_fixture('package_managers/npm', 'package_project.json.erb')).result(binding)
+
+              commit.project = project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.add_files([
+                                 {
+                                   file_path: '.gitlab-ci.yml',
+                                   content: npm_upload_install_yaml
+                                 },
+                                 {
+                                   file_path: 'package.json',
+                                   content: package_json
+                                 }
+                               ])
+            end
+
+            project.visit!
+            Flow::Pipeline.visit_latest_pipeline
+
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.click_job('deploy')
+            end
+
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_successful(timeout: 800)
+            end
+
+            Flow::Pipeline.visit_latest_pipeline
+
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.click_job('install')
+            end
+
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_successful(timeout: 800)
+              job.click_browse_button
+            end
+
+            Page::Project::Artifact::Show.perform do |artifacts|
+              artifacts.go_to_directory('node_modules')
+              artifacts.go_to_directory("@#{registry_scope}")
+              expect(artifacts).to have_content('mypackage')
+            end
+
+            project.visit!
+            Page::Project::Menu.perform(&:click_packages_link)
+
+            Page::Project::Packages::Index.perform do |index|
+              expect(index).to have_package(package.name)
+
+              index.click_package(package.name)
+            end
+
+            Page::Project::Packages::Show.perform do |show|
+              expect(show).to have_package_info(package.name, "1.0.0")
+            end
           end
         end
       end