Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/frontend/super_sidebar/super_sidebar_collapsed_state_manager_spec.js b/spec/frontend/super_sidebar/super_sidebar_collapsed_state_manager_spec.js
index aa1f0765411..4028d91c82f 100644
--- a/spec/frontend/super_sidebar/super_sidebar_collapsed_state_manager_spec.js
+++ b/spec/frontend/super_sidebar/super_sidebar_collapsed_state_manager_spec.js
@@ -91,6 +91,12 @@ describe('Super Sidebar Collapsed State Manager', () => {
         expect(setCookie).not.toHaveBeenCalled();
       },
     );
+
+    it('does not collapse sidebar when forceDesktopExpandedSidebar is true and windowWidth is xl', () => {
+      jest.spyOn(bp, 'windowWidth').mockReturnValue(xl);
+      initSuperSidebarCollapsedState(true);
+      expect(findPage().classList).not.toContain(SIDEBAR_COLLAPSED_CLASS);
+    });
   });
 
   describe('bindSuperSidebarCollapsedEvents', () => {