Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 9 deletions

diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 5440a42348e..80b8d36aa07 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -155,7 +155,7 @@ describe NotificationService, :mailer do
   describe '#async' do
     let(:async) { notification.async }
 
-    set(:key) { create(:personal_key) }
+    let_it_be(:key) { create(:personal_key) }
 
     it 'returns an Async object with the correct parent' do
       expect(async).to be_a(described_class::Async)
@@ -2508,14 +2508,14 @@ describe NotificationService, :mailer do
   end
 
   describe 'Pages domains' do
-    set(:project) { create(:project) }
-    set(:domain) { create(:pages_domain, project: project) }
-    set(:u_blocked) { create(:user, :blocked) }
-    set(:u_silence) { create_user_with_notification(:disabled, 'silent', project) }
-    set(:u_owner)   { project.owner }
-    set(:u_maintainer1) { create(:user) }
-    set(:u_maintainer2) { create(:user) }
-    set(:u_developer) { create(:user) }
+    let_it_be(:project, reload: true) { create(:project) }
+    let_it_be(:domain, reload: true) { create(:pages_domain, project: project) }
+    let_it_be(:u_blocked) { create(:user, :blocked) }
+    let_it_be(:u_silence) { create_user_with_notification(:disabled, 'silent', project) }
+    let_it_be(:u_owner) { project.owner }
+    let_it_be(:u_maintainer1) { create(:user) }
+    let_it_be(:u_maintainer2) { create(:user) }
+    let_it_be(:u_developer) { create(:user) }
 
     before do
       project.add_maintainer(u_blocked)