Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 1 deletions

diff --git a/app/assets/javascripts/alerts_settings/components/alerts_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_form.vue
index 388d925196b..a0d5cb7f4c3 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_form.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_form.vue
@@ -83,7 +83,7 @@ export default {
     </p>
     <form ref="settingsForm" @submit.prevent="updateAlertsIntegrationSettings">
       <gl-form-group class="gl-pl-0">
-        <gl-form-checkbox v-model="createIssueEnabled" data-qa-selector="create_issue_checkbox">
+        <gl-form-checkbox v-model="createIssueEnabled" data-qa-selector="create_incident_checkbox">
           <span>{{ $options.i18n.createIncident.label }}</span>
         </gl-form-checkbox>
       </gl-form-group>
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
index 03bc4b825ae..65c3bc732ed 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
@@ -430,6 +430,7 @@ export default {
             v-model="integrationForm.type"
             :disabled="isSelectDisabled"
             class="gl-max-w-full"
+            data-qa-selector="integration_type_dropdown"
             :options="integrationTypesOptions"
           />
 
@@ -461,6 +462,7 @@ export default {
               v-model="integrationForm.name"
               type="text"
               :placeholder="$options.i18n.integrationFormSteps.nameIntegration.placeholder"
+              data-qa-selector="integration_name_field"
               @input="validateName"
             />
           </gl-form-group>
@@ -483,6 +485,7 @@ export default {
               v-model="integrationForm.active"
               :is-loading="loading"
               :label="$options.i18n.integrationFormSteps.nameIntegration.activeToggle"
+              data-qa-selector="active_toggle_container"
               class="gl-mt-4 gl-font-weight-normal"
             />
           </gl-form-group>
@@ -594,6 +597,7 @@ export default {
             category="secondary"
             class="gl-ml-3 js-no-auto-disable"
             data-testid="integration-form-test-and-submit"
+            data-qa-selector="save_and_create_alert_button"
             @click="submit(true)"
           >
             {{ $options.i18n.saveAndTestIntegration }}
@@ -695,6 +699,7 @@ export default {
             :debounce="$options.JSON_VALIDATE_DELAY"
             rows="6"
             max-rows="10"
+            data-qa-selector="test_payload_field"
             @input="validateJson(false)"
           />
         </gl-form-group>
@@ -706,6 +711,7 @@ export default {
             data-testid="send-test-alert"
             variant="confirm"
             class="js-no-auto-disable"
+            data-qa-selector="send_test_alert_button"
             @click="isFormDirty ? null : sendTestAlert()"
           >
             {{ $options.i18n.send }}
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
index bf456b6adaa..010cb5721a1 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
@@ -375,6 +375,7 @@ export default {
         category="secondary"
         variant="confirm"
         data-testid="add-integration-btn"
+        data-qa-selector="add_integration_button"
         class="gl-mt-3"
         @click="setFormVisibility(true)"
       >