Merge branch 'master' into zj-create-mattermost-team

1 files changed, 6 insertions, 6 deletions

diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 839250b7d84..ebbaea4e59a 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -1050,22 +1050,22 @@ describe NotificationService, services: true do
         should_not_email(@u_lazy_participant)
       end
 
-      it "notifies the merger when merge_when_build_succeeds is true" do
-        merge_request.merge_when_build_succeeds = true
+      it "notifies the merger when the pipeline succeeds is true" do
+        merge_request.merge_when_pipeline_succeeds = true
         notification.merge_mr(merge_request, @u_watcher)
 
         should_email(@u_watcher)
       end
 
-      it "does not notify the merger when merge_when_build_succeeds is false" do
-        merge_request.merge_when_build_succeeds = false
+      it "does not notify the merger when the pipeline succeeds is false" do
+        merge_request.merge_when_pipeline_succeeds = false
         notification.merge_mr(merge_request, @u_watcher)
 
         should_not_email(@u_watcher)
       end
 
-      it "notifies the merger when merge_when_build_succeeds is false but they've opted into notifications about their activity" do
-        merge_request.merge_when_build_succeeds = false
+      it "notifies the merger when the pipeline succeeds is false but they've opted into notifications about their activity" do
+        merge_request.merge_when_pipeline_succeeds = false
         @u_watcher.notified_of_own_activity = true
         notification.merge_mr(merge_request, @u_watcher)