Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 43 deletions

diff --git a/spec/frontend/alerts_settings/alert_mapping_builder_spec.js b/spec/frontend/alerts_settings/alert_mapping_builder_spec.js
index 12536c27dfe..5acf0f050ae 100644
--- a/spec/frontend/alerts_settings/alert_mapping_builder_spec.js
+++ b/spec/frontend/alerts_settings/alert_mapping_builder_spec.js
@@ -28,11 +28,7 @@ describe('AlertMappingBuilder', () => {
   });
 
   const findColumnInRow = (row, column) =>
-    wrapper
-      .findAll('.gl-display-table-row')
-      .at(row)
-      .findAll('.gl-display-table-cell ')
-      .at(column);
+    wrapper.findAll('.gl-display-table-row').at(row).findAll('.gl-display-table-cell ').at(column);
 
   it('renders column captions', () => {
     expect(findColumnInRow(0, 0).text()).toContain(i18n.columns.gitlabKeyTitle);
diff --git a/spec/frontend/alerts_settings/alerts_integrations_list_spec.js b/spec/frontend/alerts_settings/alerts_integrations_list_spec.js
index 3a7392f64f7..5a3874d055b 100644
--- a/spec/frontend/alerts_settings/alerts_integrations_list_spec.js
+++ b/spec/frontend/alerts_settings/alerts_integrations_list_spec.js
@@ -72,11 +72,7 @@ describe('AlertIntegrationsList', () => {
 
   it('renders an highlighted row when a current integration is selected to edit', () => {
     mountComponent({ data: { currentIntegration: { id: '1' } } });
-    expect(
-      findTableComponentRows()
-        .at(0)
-        .classes(),
-    ).toContain('gl-bg-blue-50');
+    expect(findTableComponentRows().at(0).classes()).toContain('gl-bg-blue-50');
   });
 
   describe('integration status', () => {
diff --git a/spec/frontend/alerts_settings/alerts_settings_form_spec.js b/spec/frontend/alerts_settings/alerts_settings_form_spec.js
index 428c6f93444..af0999a997f 100644
--- a/spec/frontend/alerts_settings/alerts_settings_form_spec.js
+++ b/spec/frontend/alerts_settings/alerts_settings_form_spec.js
@@ -86,11 +86,7 @@ describe('AlertsSettingsFormNew', () => {
 
       await wrapper.vm.$nextTick();
 
-      expect(
-        findFormFields()
-          .at(0)
-          .isVisible(),
-      ).toBe(true);
+      expect(findFormFields().at(0).isVisible()).toBe(true);
     });
 
     it('disables the dropdown and shows help text when multi integrations are not supported', async () => {
@@ -104,11 +100,7 @@ describe('AlertsSettingsFormNew', () => {
       const options = findSelect().findAll('option');
       await options.at(2).setSelected();
 
-      expect(
-        findFormFields()
-          .at(0)
-          .attributes('disabled'),
-      ).toBe('disabled');
+      expect(findFormFields().at(0).attributes('disabled')).toBe('disabled');
     });
   });
 
@@ -119,9 +111,7 @@ describe('AlertsSettingsFormNew', () => {
       const options = findSelect().findAll('option');
       await options.at(1).setSelected();
 
-      await findFormFields()
-        .at(0)
-        .setValue('Test integration');
+      await findFormFields().at(0).setValue('Test integration');
       await findFormToggle().trigger('click');
 
       await wrapper.vm.$nextTick();
@@ -145,12 +135,8 @@ describe('AlertsSettingsFormNew', () => {
       const options = findSelect().findAll('option');
       await options.at(2).setSelected();
 
-      await findFormFields()
-        .at(0)
-        .setValue('Test integration');
-      await findFormFields()
-        .at(1)
-        .setValue('https://test.com');
+      await findFormFields().at(0).setValue('Test integration');
+      await findFormFields().at(1).setValue('https://test.com');
       await findFormToggle().trigger('click');
 
       await wrapper.vm.$nextTick();
@@ -179,9 +165,7 @@ describe('AlertsSettingsFormNew', () => {
         },
       });
 
-      await findFormFields()
-        .at(0)
-        .setValue('Test integration post');
+      await findFormFields().at(0).setValue('Test integration post');
       await findFormToggle().trigger('click');
 
       await wrapper.vm.$nextTick();
@@ -210,12 +194,8 @@ describe('AlertsSettingsFormNew', () => {
         },
       });
 
-      await findFormFields()
-        .at(0)
-        .setValue('Test integration');
-      await findFormFields()
-        .at(1)
-        .setValue('https://test-post.com');
+      await findFormFields().at(0).setValue('Test integration');
+      await findFormFields().at(1).setValue('https://test-post.com');
       await findFormToggle().trigger('click');
 
       await wrapper.vm.$nextTick();
@@ -300,11 +280,7 @@ describe('AlertsSettingsFormNew', () => {
           resetSamplePayloadConfirmed,
         });
         await wrapper.vm.$nextTick();
-        expect(
-          findTestPayloadSection()
-            .find(GlFormTextarea)
-            .attributes('disabled'),
-        ).toBe(disabled);
+        expect(findTestPayloadSection().find(GlFormTextarea).attributes('disabled')).toBe(disabled);
       });
     });