Specs on force deleting of a user

2 files changed, 43 insertions, 7 deletions

diff --git a/app/services/delete_user_service.rb b/app/services/delete_user_service.rb
index 390960257c0..5f2e4f75b79 100644
--- a/app/services/delete_user_service.rb
+++ b/app/services/delete_user_service.rb
@@ -12,7 +12,7 @@ class DeleteUserService
     end
 
     user.solo_owned_groups.each do |group|
-      DeleteGroupService.new(group, current_user).execute
+      DestroyGroupService.new(group, current_user).execute
     end
 
     user.personal_projects.each do |project|
diff --git a/spec/workers/delete_user_worker_spec.rb b/spec/workers/delete_user_worker_spec.rb
index 73005c507c6..bec9aecb48c 100644
--- a/spec/workers/delete_user_worker_spec.rb
+++ b/spec/workers/delete_user_worker_spec.rb
@@ -7,16 +7,52 @@ describe DeleteUserWorker do
     let!(:namespace)    { create(:namespace, owner: user) }
     let!(:project)      { create(:project, namespace: namespace) }
 
-    before do
-      DeleteUserWorker.new.perform(current_user.id, user.id)
+    context 'no force flag given' do
+      before do
+        DeleteUserWorker.new.perform(current_user.id, user.id)
+      end
+
+      it 'deletes all personal projects' do
+        expect { Project.find(project.id) }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it 'deletes the user' do
+        expect { User.find(user.id) }.to raise_error(ActiveRecord::RecordNotFound)
+      end
     end
 
-    it 'deletes all personal projects' do
-      expect { Project.find(project.id) }.to raise_error(ActiveRecord::RecordNotFound)
+    context "solo owned groups present" do
+      let(:solo_owned)  { create(:group) }
+      let(:member)      { create(:group_member) }
+      let(:user)        { user = member.user }
+
+      before do
+        solo_owned.group_members = [member]
+        DeleteUserWorker.new.perform(current_user.id, user.id)
+      end
+
+      it 'does not delete the user' do
+        expect(User.find(user.id)).to eq user
+      end
     end
 
-    it 'deletes the user' do
-      expect { User.find(user.id) }.to raise_error(ActiveRecord::RecordNotFound)
+    context "deletions with force" do
+      let(:solo_owned)      { create(:group) }
+      let(:member)          { create(:group_member) }
+      let(:user)            { user = member.user }
+
+      before do
+        solo_owned.group_members = [member]
+        DeleteUserWorker.new.perform(current_user.id, user.id, "force" => true)
+      end
+
+      it 'deletes solo owned groups' do
+        expect { Project.find(solo_owned.id) }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it 'deletes the user' do
+        expect { User.find(user.id) }.to raise_error(ActiveRecord::RecordNotFound)
+      end
     end
   end
 end