Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 6 deletions

diff --git a/spec/frontend/mocks_spec.js b/spec/frontend/mocks_spec.js
index a4a1fdea396..110c418e579 100644
--- a/spec/frontend/mocks_spec.js
+++ b/spec/frontend/mocks_spec.js
@@ -8,12 +8,13 @@ describe('Mock auto-injection', () => {
       failMock = jest.spyOn(global, 'fail').mockImplementation();
     });
 
-    it('~/lib/utils/axios_utils', done => {
-      expect(axios.get('http://gitlab.com')).rejects.toThrow('Unexpected unmocked request');
-      setImmediate(() => {
-        expect(failMock).toHaveBeenCalledTimes(1);
-        done();
-      });
+    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('jQuery.ajax()', () => {