Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 2 deletions

diff --git a/qa/qa/page/project/monitor/incidents/index.rb b/qa/qa/page/project/monitor/incidents/index.rb
index 9317cb27562..1b30e484723 100644
--- a/qa/qa/page/project/monitor/incidents/index.rb
+++ b/qa/qa/page/project/monitor/incidents/index.rb
@@ -8,11 +8,16 @@ module QA
           class Index < Page::Base
             view 'app/assets/javascripts/incidents/components/incidents_list.vue' do
               element :create_incident_button
+              element :incident_link
             end
 
             def create_incident
               click_element :create_incident_button
             end
+
+            def has_incident?(wait: Support::Repeater::DEFAULT_MAX_WAIT_TIME)
+              wait_until(max_duration: wait) { has_element?(:incident_link) }
+            end
           end
         end
       end
diff --git a/qa/qa/page/project/settings/alerts.rb b/qa/qa/page/project/settings/alerts.rb
index 7b1d738ec3c..0f27fdb9d23 100644
--- a/qa/qa/page/project/settings/alerts.rb
+++ b/qa/qa/page/project/settings/alerts.rb
@@ -26,8 +26,12 @@ module QA
             element :prometheus_url_field
           end
 
+          def go_to_alert_settings
+            click_link_with_text('Alert settings')
+          end
+
           def enable_incident_for_alert
-            check_element(:create_incident_checkbox)
+            check_element(:create_incident_checkbox, true)
           end
 
           def select_issue_template(template)
@@ -37,7 +41,7 @@ module QA
             end
           end
 
-          def save_incident_settings
+          def save_alert_settings
             click_element :save_changes_button
           end