Add latest changes from gitlab-org/gitlab@15-11-stable-eev15.11.0-rc42

4 files changed, 55 insertions, 32 deletions

diff --git a/spec/factories/packages/debian/file_metadatum.rb b/spec/factories/packages/debian/file_metadatum.rb
index ef6c4e1f222..6b6cd9c51f3 100644
--- a/spec/factories/packages/debian/file_metadatum.rb
+++ b/spec/factories/packages/debian/file_metadatum.rb
@@ -2,11 +2,18 @@
 
 FactoryBot.define do
   factory :debian_file_metadatum, class: 'Packages::Debian::FileMetadatum' do
-    package_file { association(:debian_package_file, without_loaded_metadatum: true) }
+    package_file do
+      if file_type == 'unknown'
+        association(:debian_package_file, :unknown, without_loaded_metadatum: true)
+      else
+        association(:debian_package_file, without_loaded_metadatum: true)
+      end
+    end
+
     file_type { 'deb' }
     component { 'main' }
     architecture { 'amd64' }
-    fields { { 'a': 'b' } }
+    fields { { 'a' => 'b' } }
 
     trait(:unknown) do
       file_type { 'unknown' }
@@ -32,19 +39,20 @@ FactoryBot.define do
           'Source' => package_file.package.name,
           'Binary' => 'sample-dev, libsample0, sample-udeb, sample-ddeb',
           'Architecture' => 'any',
-          'Version': package_file.package.version,
+          'Version' => package_file.package.version,
           'Maintainer' => "#{FFaker::Name.name} <#{FFaker::Internet.email}>",
           'Homepage' => FFaker::Internet.http_url,
           'Standards-Version' => '4.5.0',
           'Build-Depends' => 'debhelper-compat (= 13)',
-          'Package-List' => <<~EOF.rstrip,
-           libsample0 deb libs optional arch=any',
-           'sample-ddeb deb libs optional arch=any',
-           sample-dev deb libdevel optional arch=any',
-           sample-udeb udeb libs optional arch=any',
-          EOF
+          'Package-List' => <<~PACKAGELIST.rstrip,
+          libsample0 deb libs optional arch=any
+          sample-ddeb deb libs optional arch=any
+          sample-dev deb libdevel optional arch=any
+          sample-udeb udeb libs optional arch=any
+          PACKAGELIST
           'Checksums-Sha1' => "\n4a9cb2a7c77a68dc0fe54ba8ecef133a7c949e9d 964 sample_1.2.3~alpha2.tar.xz",
-          'Checksums-Sha256' => "\nc9d05185ca158bb804977fa9d7b922e8a0f644a2da41f99d2787dd61b1e2e2c5 964 sample_1.2.3~alpha2.tar.xz",
+          'Checksums-Sha256' =>
+            "\nc9d05185ca158bb804977fa9d7b922e8a0f644a2da41f99d2787dd61b1e2e2c5 964 sample_1.2.3~alpha2.tar.xz",
           'Files' => "\nadc69e57cda38d9bb7c8d59cacfb6869 964 sample_1.2.3~alpha2.tar.xz"
         }
       end
@@ -56,22 +64,22 @@ FactoryBot.define do
       architecture { 'amd64' }
       fields do
         {
-        'Package' => 'libsample0',
-        'Source' => package_file.package.name,
-        'Version' => package_file.package.version,
-        'Architecture' => 'amd64',
-        'Maintainer' => "#{FFaker::Name.name} <#{FFaker::Internet.email}>",
-        'Installed-Size' => '7',
-        'Section' => 'libs',
-        'Priority' => 'optional',
-        'Multi-Arch' => 'same',
-        'Homepage' => FFaker::Internet.http_url,
-        'Description' => <<~EOF.rstrip
-        Some mostly empty lib
-        Used in GitLab tests.
+          'Package' => 'libsample0',
+          'Source' => package_file.package.name,
+          'Version' => package_file.package.version,
+          'Architecture' => 'amd64',
+          'Maintainer' => "#{FFaker::NameCN.name} #{FFaker::Name.name} <#{FFaker::Internet.email}>",
+          'Installed-Size' => '7',
+          'Section' => 'libs',
+          'Priority' => 'optional',
+          'Multi-Arch' => 'same',
+          'Homepage' => FFaker::Internet.http_url,
+          'Description' => <<~DESCRIPTION.rstrip
+          Some mostly empty lib
+          Used in GitLab tests.
 
-        Testing another paragraph.
-        EOF
+          Testing another paragraph.
+          DESCRIPTION
         }
       end
     end
@@ -93,12 +101,12 @@ FactoryBot.define do
           'Priority' => 'optional',
           'Multi-Arch' => 'same',
           'Homepage' => FFaker::Internet.http_url,
-          'Description' => <<~EOF.rstrip
+          'Description' => <<~DESCRIPTION.rstrip
           Some mostly empty development files
           Used in GitLab tests.
 
           Testing another paragraph.
-          EOF
+          DESCRIPTION
         }
       end
     end
@@ -107,28 +115,28 @@ FactoryBot.define do
       file_type { 'udeb' }
       component { 'main' }
       architecture { 'amd64' }
-      fields { { 'a': 'b' } }
+      fields { { 'a' => 'b' } }
     end
 
     trait(:ddeb) do
       file_type { 'ddeb' }
       component { 'main' }
       architecture { 'amd64' }
-      fields { { 'a': 'b' } }
+      fields { { 'a' => 'b' } }
     end
 
     trait(:buildinfo) do
       file_type { 'buildinfo' }
       component { 'main' }
       architecture { nil }
-      fields { { 'Architecture': 'amd64 source' } }
+      fields { { 'Architecture' => 'amd64 source' } }
     end
 
     trait(:changes) do
       file_type { 'changes' }
       component { nil }
       architecture { nil }
-      fields { { 'Architecture': 'source amd64' } }
+      fields { { 'Architecture' => 'source amd64' } }
     end
   end
 end
diff --git a/spec/factories/packages/npm/metadata_cache.rb b/spec/factories/packages/npm/metadata_cache.rb
new file mode 100644
index 00000000000..b06915bcb46
--- /dev/null
+++ b/spec/factories/packages/npm/metadata_cache.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :npm_metadata_cache, class: 'Packages::Npm::MetadataCache' do
+    project
+    sequence(:package_name) { |n| "@#{project.root_namespace.path}/package-#{n}" }
+    file { 'unnamed' }
+    size { 100.kilobytes }
+  end
+end
diff --git a/spec/factories/packages/package_files.rb b/spec/factories/packages/package_files.rb
index ababa8fa7f5..4a2d412832c 100644
--- a/spec/factories/packages/package_files.rb
+++ b/spec/factories/packages/package_files.rb
@@ -215,6 +215,7 @@ FactoryBot.define do
       end
 
       trait(:keep) do
+        # do not override attributes
       end
     end
 
diff --git a/spec/factories/packages/packages.rb b/spec/factories/packages/packages.rb
index 1d5119638ca..283df3428db 100644
--- a/spec/factories/packages/packages.rb
+++ b/spec/factories/packages/packages.rb
@@ -78,13 +78,17 @@ FactoryBot.define do
 
       after :build do |package, evaluator|
         if evaluator.published_in == :create
-          create(:debian_publication, package: package)
+          build(:debian_publication, package: package)
         elsif !evaluator.published_in.nil?
           create(:debian_publication, package: package, distribution: evaluator.published_in)
         end
       end
 
       after :create do |package, evaluator|
+        if evaluator.published_in == :create
+          package.debian_publication.save!
+        end
+
         unless evaluator.without_package_files
           create :debian_package_file, :source, evaluator.file_metadatum_trait, package: package
           create :debian_package_file, :dsc, evaluator.file_metadatum_trait, package: package