Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

10 files changed, 22 insertions, 26 deletions

diff --git a/spec/services/packages/composer/create_package_service_spec.rb b/spec/services/packages/composer/create_package_service_spec.rb
index b04a6c8382f..26429a7b5d9 100644
--- a/spec/services/packages/composer/create_package_service_spec.rb
+++ b/spec/services/packages/composer/create_package_service_spec.rb
@@ -88,7 +88,7 @@ RSpec.describe Packages::Composer::CreatePackageService do
       end
 
       context 'belonging to another project' do
-        let(:other_project) { create(:project)}
+        let(:other_project) { create(:project) }
         let!(:other_package) { create(:composer_package, name: package_name, version: 'dev-master', project: other_project) }
 
         it 'fails with an error' do
diff --git a/spec/services/packages/create_dependency_service_spec.rb b/spec/services/packages/create_dependency_service_spec.rb
index 55414ea68fe..f95e21cd045 100644
--- a/spec/services/packages/create_dependency_service_spec.rb
+++ b/spec/services/packages/create_dependency_service_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 RSpec.describe Packages::CreateDependencyService do
   describe '#execute' do
-    let_it_be(:namespace) {create(:namespace)}
+    let_it_be(:namespace) { create(:namespace) }
     let_it_be(:version) { '1.0.1' }
     let_it_be(:package_name) { "@#{namespace.path}/my-app" }
 
diff --git a/spec/services/packages/debian/extract_deb_metadata_service_spec.rb b/spec/services/packages/debian/extract_deb_metadata_service_spec.rb
index ee3f3d179dc..66a9ca5f9e0 100644
--- a/spec/services/packages/debian/extract_deb_metadata_service_spec.rb
+++ b/spec/services/packages/debian/extract_deb_metadata_service_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe Packages::Debian::ExtractDebMetadataService do
     let(:file_name) { 'README.md' }
 
     it 'raise error' do
-      expect {subject.execute}.to raise_error(described_class::CommandFailedError, /is not a Debian format archive/i)
+      expect { subject.execute }.to raise_error(described_class::CommandFailedError, /is not a Debian format archive/i)
     end
   end
 end
diff --git a/spec/services/packages/debian/extract_metadata_service_spec.rb b/spec/services/packages/debian/extract_metadata_service_spec.rb
index e3911dbbfe0..02c81ad1644 100644
--- a/spec/services/packages/debian/extract_metadata_service_spec.rb
+++ b/spec/services/packages/debian/extract_metadata_service_spec.rb
@@ -11,15 +11,10 @@ RSpec.describe Packages::Debian::ExtractMetadataService do
   end
 
   RSpec.shared_examples 'Test Debian ExtractMetadata Service' do |expected_file_type, expected_architecture, expected_fields|
-    it "returns file_type #{expected_file_type.inspect}" do
+    it "returns file_type #{expected_file_type.inspect}, architecture #{expected_architecture.inspect} and fields #{expected_fields.nil? ? '' : 'including '}#{expected_fields.inspect}", :aggregate_failures do
       expect(subject[:file_type]).to eq(expected_file_type)
-    end
-
-    it "returns architecture #{expected_architecture.inspect}" do
       expect(subject[:architecture]).to eq(expected_architecture)
-    end
 
-    it "returns fields #{expected_fields.nil? ? '' : 'including '}#{expected_fields.inspect}" do
       if expected_fields.nil?
         expect(subject[:fields]).to be_nil
       else
diff --git a/spec/services/packages/debian/parse_debian822_service_spec.rb b/spec/services/packages/debian/parse_debian822_service_spec.rb
index cad4e81f350..ff146fda250 100644
--- a/spec/services/packages/debian/parse_debian822_service_spec.rb
+++ b/spec/services/packages/debian/parse_debian822_service_spec.rb
@@ -102,7 +102,7 @@ RSpec.describe Packages::Debian::ParseDebian822Service do
     let(:input) { ' continuation' }
 
     it 'raise error' do
-      expect {subject.execute}.to raise_error(described_class::InvalidDebian822Error, 'Parse error. Unexpected continuation line')
+      expect { subject.execute }.to raise_error(described_class::InvalidDebian822Error, 'Parse error. Unexpected continuation line')
     end
   end
 
@@ -116,7 +116,7 @@ RSpec.describe Packages::Debian::ParseDebian822Service do
     end
 
     it 'raise error' do
-      expect {subject.execute}.to raise_error(described_class::InvalidDebian822Error, "Duplicate field 'Source' in section 'Package: libsample0'")
+      expect { subject.execute }.to raise_error(described_class::InvalidDebian822Error, "Duplicate field 'Source' in section 'Package: libsample0'")
     end
   end
 
@@ -128,7 +128,7 @@ RSpec.describe Packages::Debian::ParseDebian822Service do
     end
 
     it 'raise error' do
-      expect {subject.execute}.to raise_error(described_class::InvalidDebian822Error, 'Parse error on line Hello')
+      expect { subject.execute }.to raise_error(described_class::InvalidDebian822Error, 'Parse error on line Hello')
     end
   end
 
@@ -142,7 +142,7 @@ RSpec.describe Packages::Debian::ParseDebian822Service do
     end
 
     it 'raise error' do
-      expect {subject.execute}.to raise_error(described_class::InvalidDebian822Error, "Duplicate section 'Package: libsample0'")
+      expect { subject.execute }.to raise_error(described_class::InvalidDebian822Error, "Duplicate section 'Package: libsample0'")
     end
   end
 end
diff --git a/spec/services/packages/debian/sign_distribution_service_spec.rb b/spec/services/packages/debian/sign_distribution_service_spec.rb
index 2aec0e50636..fc070b6e45e 100644
--- a/spec/services/packages/debian/sign_distribution_service_spec.rb
+++ b/spec/services/packages/debian/sign_distribution_service_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe Packages::Debian::SignDistributionService do
         end
 
         context 'with an existing key' do
-          let!(:key) { create("debian_#{container_type}_distribution_key", distribution: distribution)}
+          let!(:key) { create("debian_#{container_type}_distribution_key", distribution: distribution) }
 
           it 'returns the content signed', :aggregate_failures do
             expect(Packages::Debian::GenerateDistributionKeyService).not_to receive(:new)
diff --git a/spec/services/packages/helm/process_file_service_spec.rb b/spec/services/packages/helm/process_file_service_spec.rb
index d22c1de2335..1be0153a4a5 100644
--- a/spec/services/packages/helm/process_file_service_spec.rb
+++ b/spec/services/packages/helm/process_file_service_spec.rb
@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 RSpec.describe Packages::Helm::ProcessFileService do
-  let(:package) { create(:helm_package, without_package_files: true, status: 'processing')}
+  let(:package) { create(:helm_package, without_package_files: true, status: 'processing') }
   let!(:package_file) { create(:helm_package_file, without_loaded_metadatum: true, package: package) }
   let(:channel) { 'stable' }
   let(:service) { described_class.new(channel, package_file) }
diff --git a/spec/services/packages/npm/create_package_service_spec.rb b/spec/services/packages/npm/create_package_service_spec.rb
index 5b41055397b..a3e59913918 100644
--- a/spec/services/packages/npm/create_package_service_spec.rb
+++ b/spec/services/packages/npm/create_package_service_spec.rb
@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 RSpec.describe Packages::Npm::CreatePackageService do
-  let(:namespace) {create(:namespace)}
+  let(:namespace) { create(:namespace) }
   let(:project) { create(:project, namespace: namespace) }
   let(:user) { create(:user) }
   let(:version) { '1.0.1' }
@@ -129,7 +129,7 @@ RSpec.describe Packages::Npm::CreatePackageService do
     end
 
     describe 'max file size validation' do
-      let(:max_file_size) { 5.bytes}
+      let(:max_file_size) { 5.bytes }
 
       shared_examples_for 'max file size validation failure' do
         it 'returns a 400 error', :aggregate_failures do
@@ -160,7 +160,7 @@ RSpec.describe Packages::Npm::CreatePackageService do
         end
 
         context "when encoded package data is padded with '='" do
-          let(:max_file_size) { 4.bytes}
+          let(:max_file_size) { 4.bytes }
           # 'Hello' (size = 5 bytes) => 'SGVsbG8='
           let(:encoded_package_data) { 'SGVsbG8=' }
 
@@ -168,7 +168,7 @@ RSpec.describe Packages::Npm::CreatePackageService do
         end
 
         context "when encoded package data is padded with '=='" do
-          let(:max_file_size) { 3.bytes}
+          let(:max_file_size) { 3.bytes }
           # 'Hell' (size = 4 bytes) => 'SGVsbA=='
           let(:encoded_package_data) { 'SGVsbA==' }
 
diff --git a/spec/services/packages/npm/create_tag_service_spec.rb b/spec/services/packages/npm/create_tag_service_spec.rb
index e7a784068fa..a4b07bf97cc 100644
--- a/spec/services/packages/npm/create_tag_service_spec.rb
+++ b/spec/services/packages/npm/create_tag_service_spec.rb
@@ -11,6 +11,7 @@ RSpec.describe Packages::Npm::CreateTagService do
     shared_examples 'it creates the tag' do
       it { expect { subject }.to change { Packages::Tag.count }.by(1) }
       it { expect(subject.name).to eq(tag_name) }
+
       it 'adds tag to the package' do
         tag = subject
         expect(package.reload.tags).to match_array([tag])
diff --git a/spec/services/packages/rubygems/dependency_resolver_service_spec.rb b/spec/services/packages/rubygems/dependency_resolver_service_spec.rb
index f23ed0e5fbc..bb84e0cd361 100644
--- a/spec/services/packages/rubygems/dependency_resolver_service_spec.rb
+++ b/spec/services/packages/rubygems/dependency_resolver_service_spec.rb
@@ -47,9 +47,9 @@ RSpec.describe Packages::Rubygems::DependencyResolverService do
       end
 
       context 'package with dependencies' do
-        let(:dependency_link) { create(:packages_dependency_link, :rubygems, package: package)}
-        let(:dependency_link2) { create(:packages_dependency_link, :rubygems, package: package)}
-        let(:dependency_link3) { create(:packages_dependency_link, :rubygems, package: package)}
+        let(:dependency_link) { create(:packages_dependency_link, :rubygems, package: package) }
+        let(:dependency_link2) { create(:packages_dependency_link, :rubygems, package: package) }
+        let(:dependency_link3) { create(:packages_dependency_link, :rubygems, package: package) }
 
         it 'returns a set of dependencies' do
           expected_result = [{
@@ -68,11 +68,11 @@ RSpec.describe Packages::Rubygems::DependencyResolverService do
       end
 
       context 'package with multiple versions' do
-        let(:dependency_link) { create(:packages_dependency_link, :rubygems, package: package)}
-        let(:dependency_link2) { create(:packages_dependency_link, :rubygems, package: package)}
-        let(:dependency_link3) { create(:packages_dependency_link, :rubygems, package: package)}
+        let(:dependency_link) { create(:packages_dependency_link, :rubygems, package: package) }
+        let(:dependency_link2) { create(:packages_dependency_link, :rubygems, package: package) }
+        let(:dependency_link3) { create(:packages_dependency_link, :rubygems, package: package) }
         let(:package2) { create(:package, project: project, name: package.name, version: '9.9.9') }
-        let(:dependency_link4) { create(:packages_dependency_link, :rubygems, package: package2)}
+        let(:dependency_link4) { create(:packages_dependency_link, :rubygems, package: package2) }
 
         it 'returns a set of dependencies' do
           expected_result = [{