Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 4 deletions

diff --git a/spec/frontend/confirm_modal_spec.js b/spec/frontend/confirm_modal_spec.js
index 5e5345cbd2b..e5e85910945 100644
--- a/spec/frontend/confirm_modal_spec.js
+++ b/spec/frontend/confirm_modal_spec.js
@@ -1,4 +1,4 @@
-import Vue from 'vue';
+import { nextTick } from 'vue';
 import { TEST_HOST } from 'helpers/test_constants';
 import initConfirmModal from '~/confirm_modal';
 
@@ -92,10 +92,9 @@ describe('ConfirmModal', () => {
       });
 
       describe('Cancel Button', () => {
-        beforeEach(() => {
+        beforeEach(async () => {
           findModalCancelButton(findModal()).click();
-
-          return Vue.nextTick();
+          await nextTick();
         });
 
         it('closes the modal', () => {