Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 12 insertions, 13 deletions

diff --git a/spec/frontend/performance_bar/components/add_request_spec.js b/spec/frontend/performance_bar/components/add_request_spec.js
index c5247a43f27..5422481439e 100644
--- a/spec/frontend/performance_bar/components/add_request_spec.js
+++ b/spec/frontend/performance_bar/components/add_request_spec.js
@@ -1,4 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
 import AddRequest from '~/performance_bar/components/add_request.vue';
 
 describe('add request form', () => {
@@ -17,9 +18,9 @@ describe('add request form', () => {
   });
 
   describe('when clicking the button', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       wrapper.find('button').trigger('click');
-      return wrapper.vm.$nextTick();
+      await nextTick();
     });
 
     it('shows the form', () => {
@@ -27,9 +28,9 @@ describe('add request form', () => {
     });
 
     describe('when pressing escape', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         wrapper.find('input').trigger('keyup.esc');
-        return wrapper.vm.$nextTick();
+        await nextTick();
       });
 
       it('hides the input', () => {
@@ -38,12 +39,11 @@ describe('add request form', () => {
     });
 
     describe('when submitting the form', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         wrapper.find('input').setValue('http://gitlab.example.com/users/root/calendar.json');
-        return wrapper.vm.$nextTick().then(() => {
-          wrapper.find('input').trigger('keyup.enter');
-          return wrapper.vm.$nextTick();
-        });
+        await nextTick();
+        wrapper.find('input').trigger('keyup.enter');
+        await nextTick();
       });
 
       it('emits an event to add the request', () => {
@@ -57,11 +57,10 @@ describe('add request form', () => {
         expect(wrapper.find('input').exists()).toBe(false);
       });
 
-      it('clears the value for next time', () => {
+      it('clears the value for next time', async () => {
         wrapper.find('button').trigger('click');
-        return wrapper.vm.$nextTick().then(() => {
-          expect(wrapper.find('input').text()).toEqual('');
-        });
+        await nextTick();
+        expect(wrapper.find('input').text()).toEqual('');
       });
     });
   });