diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/services/notification_service_spec.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/services/notification_service_spec.rb')
-rw-r--r-- | spec/services/notification_service_spec.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb index 6eff768eac2..c3a0766cb17 100644 --- a/spec/services/notification_service_spec.rb +++ b/spec/services/notification_service_spec.rb @@ -412,7 +412,7 @@ RSpec.describe NotificationService, :mailer do it_should_not_email! end - context 'do exist' do + context 'do exist and note not confidential' do let!(:issue_email_participant) { issue.issue_email_participants.create!(email: 'service.desk@example.com') } before do @@ -422,6 +422,18 @@ RSpec.describe NotificationService, :mailer do it_should_email! end + + context 'do exist and note is confidential' do + let(:note) { create(:note, noteable: issue, project: project, confidential: true) } + let!(:issue_email_participant) { issue.issue_email_participants.create!(email: 'service.desk@example.com') } + + before do + issue.update!(external_author: 'service.desk@example.com') + project.update!(service_desk_enabled: true) + end + + it_should_not_email! + end end describe '#new_note' do |