Add latest changes from gitlab-org/gitlab@14-8-stable-ee

2 files changed, 12 insertions, 9 deletions

diff --git a/spec/services/users/destroy_service_spec.rb b/spec/services/users/destroy_service_spec.rb
index 76b84e3b4ab..602db66dba1 100644
--- a/spec/services/users/destroy_service_spec.rb
+++ b/spec/services/users/destroy_service_spec.rb
@@ -215,8 +215,8 @@ RSpec.describe Users::DestroyService do
       end
     end
 
-    context "migrating associated records" do
-      let!(:issue)     { create(:issue, author: user) }
+    context 'migrating associated records' do
+      let!(:issue) { create(:issue, author: user) }
 
       it 'delegates to the `MigrateToGhostUser` service to move associated records to the ghost user' do
         expect_any_instance_of(Users::MigrateToGhostUserService).to receive(:execute).once.and_call_original
@@ -226,12 +226,14 @@ RSpec.describe Users::DestroyService do
         expect(issue.reload.author).to be_ghost
       end
 
-      it 'does not run `MigrateToGhostUser` if hard_delete option is given' do
-        expect_any_instance_of(Users::MigrateToGhostUserService).not_to receive(:execute)
+      context 'when hard_delete option is given' do
+        it 'will not ghost certain records' do
+          expect_any_instance_of(Users::MigrateToGhostUserService).to receive(:execute).once.and_call_original
 
-        service.execute(user, hard_delete: true)
+          service.execute(user, hard_delete: true)
 
-        expect(Issue.exists?(issue.id)).to be_falsy
+          expect(Issue.exists?(issue.id)).to be_falsy
+        end
       end
     end
 
diff --git a/spec/services/users/migrate_to_ghost_user_service_spec.rb b/spec/services/users/migrate_to_ghost_user_service_spec.rb
index c36889f20ec..073ebaae5b0 100644
--- a/spec/services/users/migrate_to_ghost_user_service_spec.rb
+++ b/spec/services/users/migrate_to_ghost_user_service_spec.rb
@@ -3,9 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe Users::MigrateToGhostUserService do
-  let!(:user)      { create(:user) }
-  let!(:project)   { create(:project, :repository) }
-  let(:service)    { described_class.new(user) }
+  let!(:user)        { create(:user) }
+  let!(:project)     { create(:project, :repository) }
+  let(:service)      { described_class.new(user) }
+  let(:always_ghost) { false }
 
   context "migrating a user's associated records to the ghost user" do
     context 'issues' do