Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 19 insertions, 3 deletions

diff --git a/spec/graphql/mutations/container_repositories/destroy_spec.rb b/spec/graphql/mutations/container_repositories/destroy_spec.rb
index 97da7846339..9f3ff8da80b 100644
--- a/spec/graphql/mutations/container_repositories/destroy_spec.rb
+++ b/spec/graphql/mutations/container_repositories/destroy_spec.rb
@@ -20,11 +20,10 @@ RSpec.describe Mutations::ContainerRepositories::Destroy do
     end
 
     shared_examples 'destroying the container repository' do
-      it 'destroys the container repistory' do
+      it 'marks the repository as delete_scheduled' do
         expect(::Packages::CreateEventService)
           .to receive(:new).with(nil, user, event_name: :delete_repository, scope: :container).and_call_original
-        expect(DeleteContainerRepositoryWorker)
-          .to receive(:perform_async).with(user.id, container_repository.id)
+        expect(DeleteContainerRepositoryWorker).not_to receive(:perform_async)
 
         expect { subject }.to change { ::Packages::Event.count }.by(1)
         expect(container_repository.reload.delete_scheduled?).to be true
@@ -56,6 +55,23 @@ RSpec.describe Mutations::ContainerRepositories::Destroy do
 
         it_behaves_like params[:shared_examples_name]
       end
+
+      context 'with container_registry_delete_repository_with_cron_worker disabled' do
+        before do
+          project.add_maintainer(user)
+          stub_feature_flags(container_registry_delete_repository_with_cron_worker: false)
+        end
+
+        it 'enqueues a removal job' do
+          expect(::Packages::CreateEventService)
+            .to receive(:new).with(nil, user, event_name: :delete_repository, scope: :container).and_call_original
+          expect(DeleteContainerRepositoryWorker)
+            .to receive(:perform_async).with(user.id, container_repository.id)
+
+          expect { subject }.to change { ::Packages::Event.count }.by(1)
+          expect(container_repository.reload.delete_scheduled?).to be true
+        end
+      end
     end
   end
 end