Add latest changes from gitlab-org/gitlab@master

4 files changed, 15 insertions, 13 deletions

diff --git a/spec/frontend/integrations/edit/components/active_checkbox_spec.js b/spec/frontend/integrations/edit/components/active_checkbox_spec.js
index 0dc31616166..c335b593f7d 100644
--- a/spec/frontend/integrations/edit/components/active_checkbox_spec.js
+++ b/spec/frontend/integrations/edit/components/active_checkbox_spec.js
@@ -1,6 +1,7 @@
 import { GlFormCheckbox } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 
+import { nextTick } from 'vue';
 import ActiveCheckbox from '~/integrations/edit/components/active_checkbox.vue';
 import { createStore } from '~/integrations/edit/store';
 
@@ -68,7 +69,7 @@ describe('ActiveCheckbox', () => {
         it('switches the form value', async () => {
           findInputInCheckbox().trigger('click');
 
-          await wrapper.vm.$nextTick();
+          await nextTick();
           expect(findGlFormCheckbox().vm.$attrs.checked).toBe(false);
         });
       });
diff --git a/spec/frontend/integrations/edit/components/confirmation_modal_spec.js b/spec/frontend/integrations/edit/components/confirmation_modal_spec.js
index 805d3971994..cbe3402727a 100644
--- a/spec/frontend/integrations/edit/components/confirmation_modal_spec.js
+++ b/spec/frontend/integrations/edit/components/confirmation_modal_spec.js
@@ -1,6 +1,7 @@
 import { GlModal } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 
+import { nextTick } from 'vue';
 import ConfirmationModal from '~/integrations/edit/components/confirmation_modal.vue';
 import { createStore } from '~/integrations/edit/store';
 
@@ -40,7 +41,7 @@ describe('ConfirmationModal', () => {
 
       findGlModal().vm.$emit('primary');
 
-      await wrapper.vm.$nextTick();
+      await nextTick();
 
       expect(wrapper.emitted().submit).toHaveLength(1);
     });
diff --git a/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js b/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
index 18afbf25bf0..33fd08a5959 100644
--- a/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
+++ b/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
@@ -1,4 +1,5 @@
 import { GlFormCheckbox, GlFormInput } from '@gitlab/ui';
+import { nextTick } from 'vue';
 import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
 
 import JiraIssuesFields from '~/integrations/edit/components/jira_issues_fields.vue';
@@ -193,7 +194,7 @@ describe('JiraIssuesFields', () => {
         await setEnableCheckbox(true);
         expect(findJiraForVulnerabilities().attributes('show-full-feature')).toBe('true');
         wrapper.setProps({ showJiraVulnerabilitiesIntegration: false });
-        await wrapper.vm.$nextTick();
+        await nextTick();
         expect(findJiraForVulnerabilities().attributes('show-full-feature')).toBeUndefined();
       });
 
diff --git a/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js b/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js
index 9e01371f542..49fbebb9396 100644
--- a/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js
+++ b/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js
@@ -1,4 +1,5 @@
 import { GlFormCheckbox } from '@gitlab/ui';
+import { nextTick } from 'vue';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 
 import JiraTriggerFields from '~/integrations/edit/components/jira_trigger_fields.vue';
@@ -71,12 +72,11 @@ describe('JiraTriggerFields', () => {
       });
 
       describe('on enable comments', () => {
-        it('shows comment detail', () => {
+        it('shows comment detail', async () => {
           findCommentSettingsCheckbox().vm.$emit('input', true);
 
-          return wrapper.vm.$nextTick().then(() => {
-            expect(findCommentDetail().isVisible()).toBe(true);
-          });
+          await nextTick();
+          expect(findCommentDetail().isVisible()).toBe(true);
         });
       });
     });
@@ -107,7 +107,7 @@ describe('JiraTriggerFields', () => {
     });
 
     describe('initialJiraIssueTransitionAutomatic is false, initialJiraIssueTransitionId is not set', () => {
-      it('selects automatic transitions when enabling transitions', () => {
+      it('selects automatic transitions when enabling transitions', async () => {
         createComponent({
           initialTriggerCommit: true,
           initialEnableComments: true,
@@ -117,11 +117,10 @@ describe('JiraTriggerFields', () => {
         expect(checkbox.element.checked).toBe(false);
         checkbox.trigger('click');
 
-        return wrapper.vm.$nextTick().then(() => {
-          const [radio1, radio2] = findIssueTransitionModeRadios().wrappers;
-          expect(radio1.element.checked).toBe(true);
-          expect(radio2.element.checked).toBe(false);
-        });
+        await nextTick();
+        const [radio1, radio2] = findIssueTransitionModeRadios().wrappers;
+        expect(radio1.element.checked).toBe(true);
+        expect(radio2.element.checked).toBe(false);
       });
     });