Add latest changes from gitlab-org/gitlab@master

app/services/projects/lfs_pointers/lfs_download_service.rb

@@ -34,7 +34,7 @@ module Projects
       def wrap_download_errors(&block)
         yield
       rescue SizeError, OidError, ResponseError, StandardError => e
-        error("LFS file with oid #{lfs_oid} could't be downloaded from #{lfs_sanitized_url}: #{e.message}")
+        error("LFS file with oid #{lfs_oid} couldn't be downloaded from #{lfs_sanitized_url}: #{e.message}")
       end
 
       def download_lfs_file!
@@ -104,7 +104,7 @@ module Projects
         rescue StandardError => e
           # If the lfs file is successfully downloaded it will be removed
           # when it is added to the project's lfs files.
-          # Nevertheless if any excetion raises the file would remain
+          # Nevertheless if any exception raises the file would remain
           # in the file system. Here we ensure to remove it
           File.unlink(file) if File.exist?(file)
 

qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb

@@ -78,8 +78,10 @@ module QA
         Page::Project::Packages::Show.perform(&:click_delete)
 
         Page::Project::Packages::Index.perform do |index|
-          expect(index).to have_content("Package deleted successfully")
-          expect(index).not_to have_package(package.name)
+          aggregate_failures 'package deletion' do
+            expect(index).to have_content("Package deleted successfully")
+            expect(index).not_to have_package(package.name)
+          end
         end
       end
     end

qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb

@@ -81,21 +81,11 @@ module QA
         package.remove_via_api!
       end
 
-      it 'uploads a generic package, downloads and deletes it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348017' do
+      it 'uploads a generic package and downloads it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348017' do
         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(&:click_delete)
-
-        Page::Project::Packages::Index.perform do |index|
-          aggregate_failures 'package deletion' do
-            expect(index).to have_content("Package deleted successfully")
-            expect(index).to have_no_package(package.name)
-          end
         end
       end
     end

qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb

@@ -162,13 +162,6 @@ module QA
 
           Page::Project::Packages::Show.perform do |show|
             expect(show).to have_package_info(package.name, "1.0.0")
-
-            show.click_delete
-          end
-
-          Page::Project::Packages::Index.perform do |index|
-            expect(index).to have_content("Package deleted successfully")
-            expect(index).not_to have_package(package.name)
           end
         end
       end

qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb

@@ -135,13 +135,6 @@ module QA
 
           Page::Project::Packages::Show.perform do |show|
             expect(show).to have_package_info(package.name, "1.0.0")
-
-            show.click_delete
-          end
-
-          Page::Project::Packages::Index.perform do |index|
-            expect(index).to have_content("Package deleted successfully")
-            expect(index).not_to have_package(package.name)
           end
         end
       end

qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb

@@ -92,7 +92,7 @@ module QA
           end
         end
 
-        it 'publishes a nuget package at the project level, installs and deletes it at the group level', testcase: params[:testcase] do
+        it 'publishes a nuget package at the project endpoint and installs it from the group endpoint', testcase: params[:testcase] do
           Flow::Login.sign_in
 
           Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
@@ -174,14 +174,6 @@ module QA
 
           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(&:click_delete)
-
-          Page::Project::Packages::Index.perform do |index|
-            expect(index).to have_content('Package deleted successfully')
-            expect(index).not_to have_package(package.name)
           end
         end
       end

qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb

@@ -82,21 +82,11 @@ module QA
       end
 
       context 'when at the project level' do
-        it 'publishes and installs a pypi package and deletes it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348015' do
+        it 'publishes and installs a pypi package', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348015' do
           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(&:click_delete)
-
-          Page::Project::Packages::Index.perform do |index|
-            aggregate_failures do
-              expect(index).to have_content("Package deleted successfully")
-              expect(index).not_to have_package(package.name)
-            end
           end
         end
       end

qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb

@@ -43,7 +43,7 @@ module QA
         project.remove_via_api!
       end
 
-      it 'publishes and deletes a Ruby gem', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347649' do
+      it 'publishes a Ruby gem', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347649' do
         Flow::Login.sign_in
 
         Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
@@ -94,14 +94,6 @@ module QA
 
         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(&:click_delete)
-
-        Page::Project::Packages::Index.perform do |index|
-          expect(index).to have_content("Package deleted successfully")
-          expect(index).not_to have_package(package.name)
         end
       end
     end