1 files changed, 23 insertions, 7 deletions
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index 7dcd03496bb..90771825f5c 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -7,15 +7,21 @@ describe Projects::DestroyService, services: true do
   let!(:remove_path) { path.sub(/\.git\Z/, "+#{project.id}+deleted.git") }
   let!(:async) { false } # execute or async_execute
 
+  shared_examples 'deleting the project' do
+    it 'deletes the project' do
+      expect(Project.all).not_to include(project)
+      expect(Dir.exist?(path)).to be_falsey
+      expect(Dir.exist?(remove_path)).to be_falsey
+    end
+  end
+
   context 'Sidekiq inline' do
     before do
       # Run sidekiq immediatly to check that renamed repository will be removed
       Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
     end
 
-    it { expect(Project.all).not_to include(project) }
-    it { expect(Dir.exist?(path)).to be_falsey }
-    it { expect(Dir.exist?(remove_path)).to be_falsey }
+    it_behaves_like 'deleting the project'
   end
 
   context 'Sidekiq fake' do
@@ -38,11 +44,21 @@ describe Projects::DestroyService, services: true do
       Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
     end
 
-    it 'deletes the project' do
-      expect(Project.all).not_to include(project)
-      expect(Dir.exist?(path)).to be_falsey
-      expect(Dir.exist?(remove_path)).to be_falsey
+    it_behaves_like 'deleting the project'
+  end
+
+  context 'delete with pipeline' do # which has optimistic locking
+    let!(:pipeline) { create(:ci_pipeline, project: project) }
+
+    before do
+      expect(project).to receive(:destroy!).and_call_original
+
+      perform_enqueued_jobs do
+        destroy_project(project, user, {})
+      end
     end
+
+    it_behaves_like 'deleting the project'
   end
 
   context 'container registry' do