From f9f496e7f19f574992b9543763490fda6d920e77 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 31 Dec 2020 00:10:12 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/mailers/emails/service_desk_spec.rb | 11 +---------- spec/mailers/notify_spec.rb | 3 +-- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'spec/mailers') diff --git a/spec/mailers/emails/service_desk_spec.rb b/spec/mailers/emails/service_desk_spec.rb index cb74194020d..7d04b373be6 100644 --- a/spec/mailers/emails/service_desk_spec.rb +++ b/spec/mailers/emails/service_desk_spec.rb @@ -13,13 +13,8 @@ RSpec.describe Emails::ServiceDesk do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } let_it_be(:issue) { create(:issue, project: project) } - let_it_be(:email) { 'someone@gitlab.com' } let(:template) { double(content: template_content) } - before_all do - issue.issue_email_participants.create!(email: email) - end - before do stub_const('ServiceEmailClass', Class.new(ApplicationMailer)) @@ -77,10 +72,6 @@ RSpec.describe Emails::ServiceDesk do let(:template_content) { 'custom text' } let(:issue) { create(:issue, project: project)} - before do - issue.issue_email_participants.create!(email: email) - end - context 'when a template is in the repository' do let(:project) { create(:project, :custom_repo, files: { ".gitlab/service_desk_templates/#{template_key}.md" => template_content }) } @@ -160,7 +151,7 @@ RSpec.describe Emails::ServiceDesk do let_it_be(:note) { create(:note_on_issue, noteable: issue, project: project) } let_it_be(:default_text) { note.note } - subject { ServiceEmailClass.service_desk_new_note_email(issue.id, note.id, email) } + subject { ServiceEmailClass.service_desk_new_note_email(issue.id, note.id) } it_behaves_like 'read template from repository', 'new_note' diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 645b015bd67..3ebc2fc1e36 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -1285,7 +1285,6 @@ RSpec.describe Notify do context 'for service desk issues' do before do issue.update!(external_author: 'service.desk@example.com') - issue.issue_email_participants.create!(email: 'service.desk@example.com') end def expect_sender(username) @@ -1334,7 +1333,7 @@ RSpec.describe Notify do describe 'new note email' do let_it_be(:first_note) { create(:discussion_note_on_issue, note: 'Hello world') } - subject { described_class.service_desk_new_note_email(issue.id, first_note.id, 'service.desk@example.com') } + subject { described_class.service_desk_new_note_email(issue.id, first_note.id) } it_behaves_like 'an unsubscribeable thread' -- cgit v1.2.1