Fix: Project deletion may not log audit events during user deletion

1 files changed, 26 insertions, 13 deletions

diff --git a/spec/services/users/destroy_service_spec.rb b/spec/services/users/destroy_service_spec.rb
index 3bae8bfbd42..83f1495a1c6 100644
--- a/spec/services/users/destroy_service_spec.rb
+++ b/spec/services/users/destroy_service_spec.rb
@@ -20,7 +20,7 @@ describe Users::DestroyService do
 
       it 'will delete the project' do
         expect_next_instance_of(Projects::DestroyService) do |destroy_service|
-          expect(destroy_service).to receive(:execute).once
+          expect(destroy_service).to receive(:execute).once.and_return(true)
         end
 
         service.execute(user)
@@ -35,7 +35,7 @@ describe Users::DestroyService do
 
       it 'destroys a project in pending_delete' do
         expect_next_instance_of(Projects::DestroyService) do |destroy_service|
-          expect(destroy_service).to receive(:execute).once
+          expect(destroy_service).to receive(:execute).once.and_return(true)
         end
 
         service.execute(user)
@@ -172,23 +172,36 @@ describe Users::DestroyService do
     end
 
     describe "user personal's repository removal" do
-      before do
-        perform_enqueued_jobs { service.execute(user) }
-      end
+      context 'storages' do
+        before do
+          perform_enqueued_jobs { service.execute(user) }
+        end
+
+        context 'legacy storage' do
+          let!(:project) { create(:project, :empty_repo, :legacy_storage, namespace: user.namespace) }
+
+          it 'removes repository' do
+            expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey
+          end
+        end
 
-      context 'legacy storage' do
-        let!(:project) { create(:project, :empty_repo, :legacy_storage, namespace: user.namespace) }
+        context 'hashed storage' do
+          let!(:project) { create(:project, :empty_repo, namespace: user.namespace) }
 
-        it 'removes repository' do
-          expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey
+          it 'removes repository' do
+            expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey
+          end
         end
       end
 
-      context 'hashed storage' do
-        let!(:project) { create(:project, :empty_repo, namespace: user.namespace) }
+      context 'repository removal status is taken into account' do
+        it 'raises exception' do
+          expect_next_instance_of(::Projects::DestroyService) do |destroy_service|
+            expect(destroy_service).to receive(:execute).and_return(false)
+          end
 
-        it 'removes repository' do
-          expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey
+          expect { service.execute(user) }
+            .to raise_error(Users::DestroyService::DestroyError, "Project #{project.id} can't be deleted" )
         end
       end
     end