Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 8 deletions

diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 372808b64d3..76771360e1f 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1572,16 +1572,22 @@ RSpec.describe Notify do
 
           context 'when custom email is enabled' do
             let_it_be(:credentials) { create(:service_desk_custom_email_credential, project: project) }
+            let_it_be(:verification) { create(:service_desk_custom_email_verification, project: project) }
 
             let_it_be(:settings) do
               create(
                 :service_desk_setting,
                 project: project,
-                custom_email_enabled: true,
                 custom_email: 'supersupport@example.com'
               )
             end
 
+            before_all do
+              verification.mark_as_finished!
+              project.reset
+              settings.update!(custom_email_enabled: true)
+            end
+
             it 'uses custom email and service bot name in "from" header' do
               expect_sender(User.support_bot, sender_email: 'supersupport@example.com')
             end
@@ -1630,22 +1636,23 @@ RSpec.describe Notify do
           end
 
           context 'when custom email is enabled' do
-            let_it_be(:credentials) do
-              create(
-                :service_desk_custom_email_credential,
-                project: project
-              )
-            end
+            let_it_be(:credentials) { create(:service_desk_custom_email_credential, project: project) }
+            let_it_be(:verification) { create(:service_desk_custom_email_verification, project: project) }
 
             let_it_be(:settings) do
               create(
                 :service_desk_setting,
                 project: project,
-                custom_email_enabled: true,
                 custom_email: 'supersupport@example.com'
               )
             end
 
+            before_all do
+              verification.mark_as_finished!
+              project.reset
+              settings.update!(custom_email_enabled: true)
+            end
+
             it 'uses custom email and author\'s name in "from" header' do
               expect_sender(first_note.author, sender_email: project.service_desk_setting.custom_email)
             end