Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

3 files changed, 5 insertions, 10 deletions

diff --git a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
index c3fd4a9bab2..82d7f691efd 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
@@ -50,6 +50,7 @@ exports[`Alert integration settings form default state should match the default
         category="primary"
         data-qa-selector="incident_templates_dropdown"
         headertext=""
+        hideheaderborder="true"
         id="alert-integration-settings-issue-template"
         size="medium"
         text="selecte_tmpl"
diff --git a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
index f0eb54c1b3a..79ad5ad1bb9 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
@@ -52,6 +52,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
       </gl-button-stub>
        
       <gl-modal-stub
+        dismisslabel="Close"
         modalclass=""
         modalid="resetWebhookModal"
         ok-title="Reset webhook URL"
diff --git a/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js b/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js
index 11b9eda2585..c80d9ad2e5b 100644
--- a/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js
+++ b/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js
@@ -39,19 +39,12 @@ describe('IncidentsSettingTabs', () => {
   });
 
   it('should render the tab for each active integration', () => {
-    const activeTabs = wrapper.vm.$options.tabs.filter(tab => tab.active);
+    const activeTabs = wrapper.vm.$options.tabs.filter((tab) => tab.active);
     expect(findIntegrationTabs().length).toBe(activeTabs.length);
     activeTabs.forEach((tab, index) => {
+      expect(findIntegrationTabs().at(index).attributes('title')).toBe(tab.title);
       expect(
-        findIntegrationTabs()
-          .at(index)
-          .attributes('title'),
-      ).toBe(tab.title);
-      expect(
-        findIntegrationTabs()
-          .at(index)
-          .find(`[data-testid="${tab.component}-tab"]`)
-          .exists(),
+        findIntegrationTabs().at(index).find(`[data-testid="${tab.component}-tab"]`).exists(),
       ).toBe(true);
     });
   });