Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 0 deletions

diff --git a/spec/workers/packages/debian/generate_distribution_worker_spec.rb b/spec/workers/packages/debian/generate_distribution_worker_spec.rb
index a4627ec5d36..a3e956f14c8 100644
--- a/spec/workers/packages/debian/generate_distribution_worker_spec.rb
+++ b/spec/workers/packages/debian/generate_distribution_worker_spec.rb
@@ -18,6 +18,12 @@ RSpec.describe Packages::Debian::GenerateDistributionWorker, type: :worker do
       context "for #{container_type}" do
         include_context 'with Debian distribution', container_type
 
+        context 'with FIPS mode enabled', :fips_mode do
+          it 'raises an error' do
+            expect { subject }.to raise_error(::Packages::FIPS::DisabledError)
+          end
+        end
+
         context 'with mocked service' do
           it 'calls GenerateDistributionService' do
             expect(Gitlab::ErrorTracking).not_to receive(:log_exception)
diff --git a/spec/workers/packages/debian/process_changes_worker_spec.rb b/spec/workers/packages/debian/process_changes_worker_spec.rb
index 4a8eb855398..93eba4bfa9a 100644
--- a/spec/workers/packages/debian/process_changes_worker_spec.rb
+++ b/spec/workers/packages/debian/process_changes_worker_spec.rb
@@ -16,6 +16,12 @@ RSpec.describe Packages::Debian::ProcessChangesWorker, type: :worker do
 
     subject { worker.perform(package_file_id, user_id) }
 
+    context 'with FIPS mode enabled', :fips_mode do
+      it 'raises an error' do
+        expect { subject }.to raise_error(::Packages::FIPS::DisabledError)
+      end
+    end
+
     context 'with mocked service' do
       it 'calls ProcessChangesService' do
         expect(Gitlab::ErrorTracking).not_to receive(:log_exception)