diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-22 21:07:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-22 21:07:27 +0300 |
commit | 0c6f357040350390191b975c864064b027ec1026 (patch) | |
tree | e546c504086b9ca84fbdf297de302a864d976bf1 /spec/mailers | |
parent | b52aefb5996cdd22dc969161d414244a59046e6e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/emails/service_desk_spec.rb | 4 | ||||
-rw-r--r-- | spec/mailers/notify_spec.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/mailers/emails/service_desk_spec.rb b/spec/mailers/emails/service_desk_spec.rb index 8c0efe3f480..e7775022e9a 100644 --- a/spec/mailers/emails/service_desk_spec.rb +++ b/spec/mailers/emails/service_desk_spec.rb @@ -295,7 +295,7 @@ RSpec.describe Emails::ServiceDesk, feature_category: :service_desk do end context 'with all-user reference in a an external author comment' do - let_it_be(:note) { create(:note_on_issue, noteable: issue, project: project, note: "Hey @all, just a ping", author: User.support_bot) } + let_it_be(:note) { create(:note_on_issue, noteable: issue, project: project, note: "Hey @all, just a ping", author: Users::Internal.support_bot) } let(:template_content) { 'some text %{ NOTE_TEXT }' } @@ -443,7 +443,7 @@ RSpec.describe Emails::ServiceDesk, feature_category: :service_desk do it_behaves_like 'a custom email verification process email' it 'uses service bot name and custom email as sender' do - expect_sender(User.support_bot, sender_email: service_desk_setting.custom_email) + expect_sender(Users::Internal.support_bot, sender_email: service_desk_setting.custom_email) end it 'forcibly uses SMTP delivery method and has correct settings' do diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 976fe214c95..79ba71b0830 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -1560,7 +1560,7 @@ RSpec.describe Notify do end it 'uses service bot name by default' do - expect_sender(User.support_bot) + expect_sender(Users::Internal.support_bot) end context 'when custom outgoing name is set' do @@ -1577,7 +1577,7 @@ RSpec.describe Notify do let_it_be(:settings) { create(:service_desk_setting, project: project, outgoing_name: '') } it 'uses service bot name' do - expect_sender(User.support_bot) + expect_sender(Users::Internal.support_bot) end end @@ -1589,7 +1589,7 @@ RSpec.describe Notify do it_behaves_like 'a mail with default delivery method' it 'uses service bot name by default' do - expect_sender(User.support_bot) + expect_sender(Users::Internal.support_bot) end context 'when custom email is enabled' do @@ -1611,7 +1611,7 @@ RSpec.describe Notify do end it 'uses custom email and service bot name in "from" header' do - expect_sender(User.support_bot, sender_email: 'supersupport@example.com') + expect_sender(Users::Internal.support_bot, sender_email: 'supersupport@example.com') end it 'uses SMTP delivery method and has correct settings' do |