Merge branch '26200-convert-sidebar-to-dropdown' into 'master'

Resolve "Update global sidebar to dropdown"

Closes #26200

See merge request !9199

3 files changed, 0 insertions, 168 deletions

diff --git a/spec/javascripts/dashboard_spec.js.es6 b/spec/javascripts/dashboard_spec.js.es6
deleted file mode 100644
index c0bdb89ed63..00000000000
--- a/spec/javascripts/dashboard_spec.js.es6
+++ /dev/null
@@ -1,37 +0,0 @@
-/* eslint-disable no-new */
-
-require('~/sidebar');
-require('~/lib/utils/text_utility');
-
-((global) => {
-  describe('Dashboard', () => {
-    const fixtureTemplate = 'static/dashboard.html.raw';
-
-    function todosCountText() {
-      return $('.js-todos-count').text();
-    }
-
-    function triggerToggle(newCount) {
-      $(document).trigger('todo:toggle', newCount);
-    }
-
-    preloadFixtures(fixtureTemplate);
-    beforeEach(() => {
-      loadFixtures(fixtureTemplate);
-      new global.Sidebar();
-    });
-
-    it('should update todos-count after receiving the todo:toggle event', () => {
-      triggerToggle(5);
-      expect(todosCountText()).toEqual('5');
-    });
-
-    it('should display todos-count with delimiter', () => {
-      triggerToggle(1000);
-      expect(todosCountText()).toEqual('1,000');
-
-      triggerToggle(1000000);
-      expect(todosCountText()).toEqual('1,000,000');
-    });
-  });
-})(window.gl);
diff --git a/spec/javascripts/fixtures/dashboard.html.haml b/spec/javascripts/fixtures/dashboard.html.haml
deleted file mode 100644
index 32446acfd60..00000000000
--- a/spec/javascripts/fixtures/dashboard.html.haml
+++ /dev/null
@@ -1,45 +0,0 @@
-%ul.nav.nav-sidebar
-  %li.home.active
-    %a.dashboard-shortcuts-projects
-      %span
-        Projects
-  %li
-    %a
-      %span
-        Todos
-        %span.count.js-todos-count
-        1
-  %li
-    %a.dashboard-shortcuts-activity
-      %span
-        Activity
-  %li
-    %a
-      %span
-        Groups
-  %li
-    %a
-      %span
-        Milestones
-  %li
-    %a.dashboard-shortcuts-issues
-      %span
-        Issues
-        %span
-        1
-  %li
-    %a.dashboard-shortcuts-merge_requests
-      %span
-        Merge Requests
-  %li
-    %a
-      %span
-        Snippets
-  %li
-    %a
-      %span
-        Help
-  %li
-    %a
-      %span
-        Profile Settings
diff --git a/spec/javascripts/project_dashboard_spec.js.es6 b/spec/javascripts/project_dashboard_spec.js.es6
deleted file mode 100644
index 24833b4eb57..00000000000
--- a/spec/javascripts/project_dashboard_spec.js.es6
+++ /dev/null
@@ -1,86 +0,0 @@
-require('~/sidebar');
-
-(() => {
-  describe('Project dashboard page', () => {
-    let $pageWithSidebar = null;
-    let $sidebarToggle = null;
-    let sidebar = null;
-    const fixtureTemplate = 'projects/dashboard.html.raw';
-
-    const assertSidebarStateExpanded = (shouldBeExpanded) => {
-      expect(sidebar.isExpanded).toBe(shouldBeExpanded);
-      expect($pageWithSidebar.hasClass('page-sidebar-expanded')).toBe(shouldBeExpanded);
-    };
-
-    preloadFixtures(fixtureTemplate);
-    beforeEach(() => {
-      loadFixtures(fixtureTemplate);
-
-      $pageWithSidebar = $('.page-with-sidebar');
-      $sidebarToggle = $('.toggle-nav-collapse');
-
-      // otherwise instantiating the Sidebar for the second time
-      // won't do anything, as the Sidebar is a singleton class
-      gl.Sidebar.singleton = null;
-      sidebar = new gl.Sidebar();
-    });
-
-    it('can show the sidebar when the toggler is clicked', () => {
-      assertSidebarStateExpanded(false);
-      $sidebarToggle.click();
-      assertSidebarStateExpanded(true);
-    });
-
-    it('should dismiss the sidebar when clone button clicked', () => {
-      $sidebarToggle.click();
-      assertSidebarStateExpanded(true);
-
-      const cloneButton = $('.project-clone-holder a.clone-dropdown-btn');
-      cloneButton.click();
-      assertSidebarStateExpanded(false);
-    });
-
-    it('should dismiss the sidebar when download button clicked', () => {
-      $sidebarToggle.click();
-      assertSidebarStateExpanded(true);
-
-      const downloadButton = $('.project-action-button .btn:has(i.fa-download)');
-      downloadButton.click();
-      assertSidebarStateExpanded(false);
-    });
-
-    it('should dismiss the sidebar when add button clicked', () => {
-      $sidebarToggle.click();
-      assertSidebarStateExpanded(true);
-
-      const addButton = $('.project-action-button .btn:has(i.fa-plus)');
-      addButton.click();
-      assertSidebarStateExpanded(false);
-    });
-
-    it('should dismiss the sidebar when notification button clicked', () => {
-      $sidebarToggle.click();
-      assertSidebarStateExpanded(true);
-
-      const notifButton = $('.js-notification-toggle-btns .notifications-btn');
-      notifButton.click();
-      assertSidebarStateExpanded(false);
-    });
-
-    it('should dismiss the sidebar when clicking on the body', () => {
-      $sidebarToggle.click();
-      assertSidebarStateExpanded(true);
-
-      $('body').click();
-      assertSidebarStateExpanded(false);
-    });
-
-    it('should dismiss the sidebar when clicking on the project description header', () => {
-      $sidebarToggle.click();
-      assertSidebarStateExpanded(true);
-
-      $('.project-home-panel').click();
-      assertSidebarStateExpanded(false);
-    });
-  });
-})();