Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

2 files changed, 21 insertions, 1 deletions

diff --git a/spec/models/packages/cleanup/policy_spec.rb b/spec/models/packages/cleanup/policy_spec.rb
index 972071aa0ad..c08ae4aa7e7 100644
--- a/spec/models/packages/cleanup/policy_spec.rb
+++ b/spec/models/packages/cleanup/policy_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Packages::Cleanup::Policy, type: :model do
       is_expected
         .to validate_inclusion_of(:keep_n_duplicated_package_files)
               .in_array(described_class::KEEP_N_DUPLICATED_PACKAGE_FILES_VALUES)
-              .with_message('keep_n_duplicated_package_files is invalid')
+              .with_message('is invalid')
     end
   end
 
diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb
index a9ed811e77d..06f02f021cf 100644
--- a/spec/models/packages/package_spec.rb
+++ b/spec/models/packages/package_spec.rb
@@ -1336,4 +1336,24 @@ RSpec.describe Packages::Package, type: :model do
       end
     end
   end
+
+  describe '#normalized_pypi_name' do
+    let_it_be(:package) { create(:pypi_package) }
+
+    subject { package.normalized_pypi_name }
+
+    where(:package_name, :normalized_name) do
+      'ASDF' | 'asdf'
+      'a.B_c-d' | 'a-b-c-d'
+      'a-------b....c___d' | 'a-b-c-d'
+    end
+
+    with_them do
+      before do
+        package.update_column(:name, package_name)
+      end
+
+      it { is_expected.to eq(normalized_name) }
+    end
+  end
 end