diff options
author | Rémy Coutable <remy@rymai.me> | 2016-06-17 16:33:37 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-06-18 05:46:45 +0200 |
commit | a08a26ac814d7fd9f7523e22847fab0cc25ceb78 (patch) | |
tree | a0b7594e3b12d14cdd1e80adf893c79455d605bf | |
parent | 724f986fb2cf8fee3606bffd01da9842634400ef (diff) | |
download | gitlab-ce-a08a26ac814d7fd9f7523e22847fab0cc25ceb78.tar.gz |
Don't send the "access declined" email on access request withdrawal
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | app/services/members/destroy_service.rb | 4 | ||||
-rw-r--r-- | spec/services/members/destroy_service_spec.rb | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/services/members/destroy_service.rb b/app/services/members/destroy_service.rb index e32eb47b846..59a55e42e38 100644 --- a/app/services/members/destroy_service.rb +++ b/app/services/members/destroy_service.rb @@ -10,7 +10,9 @@ module Members if can?(current_user, "destroy_#{member.type.underscore}".to_sym, member) member.destroy - notification_service.decline_access_request(member) if member.request? + if member.request? && member.user != current_user + notification_service.decline_access_request(member) + end end member diff --git a/spec/services/members/destroy_service_spec.rb b/spec/services/members/destroy_service_spec.rb index aa002b4bd22..04c2782c125 100644 --- a/spec/services/members/destroy_service_spec.rb +++ b/spec/services/members/destroy_service_spec.rb @@ -34,6 +34,14 @@ describe Members::DestroyService, services: true do destroy_member(member, user) end + + context 'when current user is the member' do + it 'does not call Member#after_decline_request' do + expect_any_instance_of(NotificationService).not_to receive(:decline_access_request).with(member) + + destroy_member(member, member.user) + end + end end end |