Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 7 deletions

diff --git a/spec/frontend/mocks_spec.js b/spec/frontend/mocks_spec.js
index 110c418e579..0813d2073b9 100644
--- a/spec/frontend/mocks_spec.js
+++ b/spec/frontend/mocks_spec.js
@@ -8,13 +8,10 @@ describe('Mock auto-injection', () => {
       failMock = jest.spyOn(global, 'fail').mockImplementation();
     });
 
-    it('~/lib/utils/axios_utils', () => {
-      return Promise.all([
-        expect(axios.get('http://gitlab.com')).rejects.toThrow('Unexpected unmocked request'),
-        setImmediate(() => {
-          expect(failMock).toHaveBeenCalledTimes(1);
-        }),
-      ]);
+    it('~/lib/utils/axios_utils', async () => {
+      await expect(axios.get('http://gitlab.com')).rejects.toThrow('Unexpected unmocked request');
+
+      expect(failMock).toHaveBeenCalledTimes(1);
     });
 
     it('jQuery.ajax()', () => {