Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 12 insertions, 9 deletions

diff --git a/spec/frontend_integration/fly_out_nav_browser_spec.js b/spec/frontend_integration/fly_out_nav_browser_spec.js
index ef2afa20528..47f3c6a0ac2 100644
--- a/spec/frontend_integration/fly_out_nav_browser_spec.js
+++ b/spec/frontend_integration/fly_out_nav_browser_spec.js
@@ -184,19 +184,21 @@ describe('Fly out sidebar navigation', () => {
       mockBoundingRects();
     });
 
-    it('shows sub-items after 0ms if no menu is open', (done) => {
+    it('shows sub-items after 0ms if no menu is open', () => {
       const subItems = findSubItems();
       mouseEnterTopItems(el);
 
       expect(getHideSubItemsInterval()).toBe(0);
 
-      setTimeout(() => {
-        expect(subItems.style.display).toBe('block');
-        done();
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          expect(subItems.style.display).toBe('block');
+          resolve();
+        });
       });
     });
 
-    it('shows sub-items after 300ms if a menu is currently open', (done) => {
+    it('shows sub-items after 300ms if a menu is currently open', () => {
       const subItems = findSubItems();
 
       documentMouseMove({
@@ -213,10 +215,11 @@ describe('Fly out sidebar navigation', () => {
 
       mouseEnterTopItems(el, 0);
 
-      setTimeout(() => {
-        expect(subItems.style.display).toBe('block');
-
-        done();
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          expect(subItems.style.display).toBe('block');
+          resolve();
+        });
       });
     });
   });