Merge branch 'pl-fix-package-cleanup-worker-flaky' into 'master'

Fix order dependent cleanup package file worker spec

See merge request gitlab-org/gitlab!85235

spec/workers/packages/cleanup_package_file_worker_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe Packages::CleanupPackageFileWorker do
 
       context 'with an error during the destroy' do
         before do
-          expect(worker).to receive(:log_metadata).and_raise('Error!')
+          allow(worker).to receive(:log_metadata).and_raise('Error!')
         end
 
         it 'handles the error' do
@@ -76,7 +76,7 @@ RSpec.describe Packages::CleanupPackageFileWorker do
       end
     end
 
-    context 'removing the last package file' do
+    describe '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
@@ -101,12 +101,12 @@ RSpec.describe Packages::CleanupPackageFileWorker do
   end
 
   describe '#remaining_work_count' do
-    before(:context) do
-      create_list(:package_file, 3, :pending_destruction, package: package)
+    before_all do
+      create_list(:package_file, 2, :pending_destruction, package: package)
     end
 
     subject { worker.remaining_work_count }
 
-    it { is_expected.to eq(3) }
+    it { is_expected.to eq(2) }
   end
 end