Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-12 15:11:30 +0300
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-15 23:09:25 +0300
commit8077a5f9589e365f58f22015819bff7debcd7299 (patch)
tree29ae91d16fdce68d9ae1004cfcd6eb088e72e324 /spec
parenta09323c9f5df69a60d00278dec64775821751711 (diff)
Clearify who deletes the user
Diffstat (limited to 'spec')
-rw-r--r--spec/models/abuse_report_spec.rb7
-rw-r--r--spec/workers/delete_user_worker_spec.rb2
2 files changed, 5 insertions, 4 deletions
diff --git a/spec/models/abuse_report_spec.rb b/spec/models/abuse_report_spec.rb
index 8d16239bcb1..ac12ab6c757 100644
--- a/spec/models/abuse_report_spec.rb
+++ b/spec/models/abuse_report_spec.rb
@@ -32,13 +32,14 @@ RSpec.describe AbuseReport, type: :model do
describe '#remove_user' do
it 'blocks the user' do
- expect { subject.remove_user(user) }.to change { subject.user.blocked? }.to(true)
+ expect { subject.remove_user(deleted_by: user) }.to change { subject.user.blocked? }.to(true)
end
it 'lets a worker delete the user' do
- expect(DeleteUserWorker).to receive(:perform_async).with(user.id, subject.user.id, force: true)
+ expect(DeleteUserWorker).to receive(:perform_async).with(user.id, subject.user.id,
+ delete_solo_owned_groups: true)
- subject.remove_user(user)
+ subject.remove_user(deleted_by: user)
end
end
diff --git a/spec/workers/delete_user_worker_spec.rb b/spec/workers/delete_user_worker_spec.rb
index a98ce6e5999..975b0470cb5 100644
--- a/spec/workers/delete_user_worker_spec.rb
+++ b/spec/workers/delete_user_worker_spec.rb
@@ -43,7 +43,7 @@ describe DeleteUserWorker do
before do
solo_owned.group_members = [member]
- DeleteUserWorker.new.perform(current_user.id, user.id, "force" => true)
+ DeleteUserWorker.new.perform(current_user.id, user.id, "delete_solo_owned_groups" => true)
end
it 'deletes solo owned groups' do