From 2c695c8065b4f575cb4444f59b04de568795095c Mon Sep 17 00:00:00 2001 From: charlie ablett Date: Tue, 25 Jan 2022 12:03:20 +1300 Subject: [PATCH] Handle multiple owners in disabled worker notifier --- app/workers/auto_devops/disable_worker.rb | 8 ++++++-- spec/workers/auto_devops/disable_worker_spec.rb | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/workers/auto_devops/disable_worker.rb b/app/workers/auto_devops/disable_worker.rb index 9ec3e5490c220e..03613db3f29b4a 100644 --- a/app/workers/auto_devops/disable_worker.rb +++ b/app/workers/auto_devops/disable_worker.rb @@ -32,8 +32,12 @@ def send_notification_email(pipeline, project) def email_receivers_for(pipeline, project) recipients = [pipeline.user&.email] - recipients << project.owner.email unless project.group - recipients.uniq.compact + + if project.personal? + recipients << project.owners.map(&:email) + end + + recipients.flatten.uniq.compact end end end diff --git a/spec/workers/auto_devops/disable_worker_spec.rb b/spec/workers/auto_devops/disable_worker_spec.rb index 239f4b09f5ce5a..e1de97e0ce5119 100644 --- a/spec/workers/auto_devops/disable_worker_spec.rb +++ b/spec/workers/auto_devops/disable_worker_spec.rb @@ -26,7 +26,7 @@ let(:namespace) { create(:namespace, owner: owner) } let(:project) { create(:project, :repository, :auto_devops, namespace: namespace) } - it 'sends an email to pipeline user and project owner' do + it 'sends an email to pipeline user and project owner(s)' do expect(NotificationService).to receive_message_chain(:new, :autodevops_disabled).with(pipeline, [user.email, owner.email]) subject.perform(pipeline.id) -- GitLab