Add latest changes from gitlab-org/security/gitlab@14-7-stable-ee

3 files changed, 68 insertions, 0 deletions

diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index bb4e2981070..4f9c207f976 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -364,6 +364,7 @@ RSpec.describe 'Every Sidekiq worker' do
         'Packages::CleanupPackageFileWorker' => 0,
         'Packages::Composer::CacheUpdateWorker' => false,
         'Packages::Go::SyncPackagesWorker' => 3,
+        'Packages::MarkPackageFilesForDestructionWorker' => 3,
         'Packages::Maven::Metadata::SyncWorker' => 3,
         'Packages::Nuget::ExtractionWorker' => 3,
         'Packages::Rubygems::ExtractionWorker' => 3,
diff --git a/spec/workers/packages/cleanup_package_file_worker_spec.rb b/spec/workers/packages/cleanup_package_file_worker_spec.rb
index b423c4d3f06..33f89826312 100644
--- a/spec/workers/packages/cleanup_package_file_worker_spec.rb
+++ b/spec/workers/packages/cleanup_package_file_worker_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe Packages::CleanupPackageFileWorker do
         expect(worker).to receive(:log_extra_metadata_on_done).twice
 
         expect { subject }.to change { Packages::PackageFile.count }.by(-1)
+          .and not_change { Packages::Package.count }
       end
     end
 
@@ -38,6 +39,17 @@ RSpec.describe Packages::CleanupPackageFileWorker do
         expect(package_file.reload).to be_error
       end
     end
+
+    context 'removing the last package file' do
+      let_it_be(:package_file) { create(:package_file, :pending_destruction, package: package) }
+
+      it 'deletes the package file and the package' do
+        expect(worker).to receive(:log_extra_metadata_on_done).twice
+
+        expect { subject }.to change { Packages::PackageFile.count }.by(-1)
+          .and change { Packages::Package.count }.by(-1)
+      end
+    end
   end
 
   describe '#max_running_jobs' do
diff --git a/spec/workers/packages/mark_package_files_for_destruction_worker_spec.rb b/spec/workers/packages/mark_package_files_for_destruction_worker_spec.rb
new file mode 100644
index 00000000000..15d9e4c347b
--- /dev/null
+++ b/spec/workers/packages/mark_package_files_for_destruction_worker_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Packages::MarkPackageFilesForDestructionWorker, :aggregate_failures do
+  describe '#perform' do
+    let_it_be(:package) { create(:package) }
+    let_it_be(:package_files) { create_list(:package_file, 3, package: package) }
+
+    let(:worker) { described_class.new }
+    let(:job_args) { [package.id] }
+
+    subject { worker.perform(*job_args) }
+
+    context 'with a valid package id' do
+      it_behaves_like 'an idempotent worker'
+
+      it 'marks all package files as pending_destruction' do
+        package_files_count = package.package_files.count
+
+        expect(package.package_files.pending_destruction.count).to eq(0)
+        expect(package.package_files.default.count).to eq(package_files_count)
+
+        subject
+
+        expect(package.package_files.default.count).to eq(0)
+        expect(package.package_files.pending_destruction.count).to eq(package_files_count)
+      end
+    end
+
+    context 'with an invalid package id' do
+      let(:job_args) { [non_existing_record_id] }
+
+      it_behaves_like 'an idempotent worker'
+
+      it 'marks no packag files' do
+        expect(::Packages::MarkPackageFilesForDestructionService).not_to receive(:new)
+
+        expect { subject }.not_to change { ::Packages::PackageFile.pending_destruction.count }
+      end
+    end
+
+    context 'with a nil package id' do
+      let(:job_args) { [nil] }
+
+      it_behaves_like 'an idempotent worker'
+
+      it 'marks no packag files' do
+        expect(::Packages::MarkPackageFilesForDestructionService).not_to receive(:new)
+
+        expect { subject }.not_to change { ::Packages::PackageFile.pending_destruction.count }
+      end
+    end
+  end
+end