Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'

# Conflicts:
#   db/schema.rb

2 files changed, 15 insertions, 1 deletions

diff --git a/spec/workers/build_finished_worker_spec.rb b/spec/workers/build_finished_worker_spec.rb
index 2868167c7d4..8cc3f37ebe8 100644
--- a/spec/workers/build_finished_worker_spec.rb
+++ b/spec/workers/build_finished_worker_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe BuildFinishedWorker do
   describe '#perform' do
     context 'when build exists' do
-      let(:build) { create(:ci_build) }
+      let!(:build) { create(:ci_build) }
 
       it 'calculates coverage and calls hooks' do
         expect(BuildCoverageWorker)
diff --git a/spec/workers/namespaceless_project_destroy_worker_spec.rb b/spec/workers/namespaceless_project_destroy_worker_spec.rb
index 817e103fd9a..20cf580af8a 100644
--- a/spec/workers/namespaceless_project_destroy_worker_spec.rb
+++ b/spec/workers/namespaceless_project_destroy_worker_spec.rb
@@ -75,5 +75,19 @@ describe NamespacelessProjectDestroyWorker do
         end
       end
     end
+
+    context 'project has non-existing namespace' do
+      let!(:project) do
+        project = build(:project, namespace_id: Namespace.maximum(:id).to_i.succ)
+        project.save(validate: false)
+        project
+      end
+
+      it 'deletes the project' do
+        subject.perform(project.id)
+
+        expect(Project.unscoped.all).not_to include(project)
+      end
+    end
   end
 end