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

1 files changed, 19 insertions, 2 deletions

diff --git a/spec/services/packages/maven/metadata/append_package_file_service_spec.rb b/spec/services/packages/maven/metadata/append_package_file_service_spec.rb
index c406ab93630..f3a90d31158 100644
--- a/spec/services/packages/maven/metadata/append_package_file_service_spec.rb
+++ b/spec/services/packages/maven/metadata/append_package_file_service_spec.rb
@@ -22,6 +22,18 @@ RSpec.describe ::Packages::Maven::Metadata::AppendPackageFileService do
         expect_file("#{metadata_file_name}.sha256")
         expect_file("#{metadata_file_name}.sha512")
       end
+
+      context 'with FIPS mode', :fips_mode do
+        it 'does not generate file_md5' do
+          expect { subject }.to change { package.package_files.count }.by(4)
+          expect(subject).to be_success
+
+          expect_file(metadata_file_name, with_content: content, with_content_type: 'application/xml', fips: true)
+          expect_file("#{metadata_file_name}.sha1", fips: true)
+          expect_file("#{metadata_file_name}.sha256", fips: true)
+          expect_file("#{metadata_file_name}.sha512", fips: true)
+        end
+      end
     end
 
     context 'with nil content' do
@@ -36,17 +48,22 @@ RSpec.describe ::Packages::Maven::Metadata::AppendPackageFileService do
       it_behaves_like 'returning an error service response', message: 'package is not set'
     end
 
-    def expect_file(file_name, with_content: nil, with_content_type: '')
+    def expect_file(file_name, fips: false, with_content: nil, with_content_type: '')
       package_file = package.package_files.recent.with_file_name(file_name).first
 
       expect(package_file.file).to be_present
       expect(package_file.file_name).to eq(file_name)
       expect(package_file.size).to be > 0
-      expect(package_file.file_md5).to be_present
       expect(package_file.file_sha1).to be_present
       expect(package_file.file_sha256).to be_present
       expect(package_file.file.content_type).to eq(with_content_type)
 
+      if fips
+        expect(package_file.file_md5).not_to be_present
+      else
+        expect(package_file.file_md5).to be_present
+      end
+
       if with_content
         expect(package_file.file.read).to eq(with_content)
       end