1 files changed, 67 insertions, 78 deletions

diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js
index 43e4db4c712..992e17978c1 100644
--- a/spec/javascripts/right_sidebar_spec.js
+++ b/spec/javascripts/right_sidebar_spec.js
@@ -1,98 +1,87 @@
-/* eslint-disable no-var, one-var, no-return-assign, vars-on-top */
-
 import $ from 'jquery';
 import MockAdapter from 'axios-mock-adapter';
 import '~/commons/bootstrap';
 import axios from '~/lib/utils/axios_utils';
 import Sidebar from '~/right_sidebar';
 
-(function() {
-  var $aside, $icon, $labelsIcon, $page, $toggle, assertSidebarState;
-
-  $aside = null;
-
-  $toggle = null;
-
-  $icon = null;
-
-  $page = null;
-
-  $labelsIcon = null;
-
-  assertSidebarState = function(state) {
-    var shouldBeCollapsed, shouldBeExpanded;
-    shouldBeExpanded = state === 'expanded';
-    shouldBeCollapsed = state === 'collapsed';
-    expect($aside.hasClass('right-sidebar-expanded')).toBe(shouldBeExpanded);
-    expect($page.hasClass('right-sidebar-expanded')).toBe(shouldBeExpanded);
-    expect($icon.hasClass('fa-angle-double-right')).toBe(shouldBeExpanded);
-    expect($aside.hasClass('right-sidebar-collapsed')).toBe(shouldBeCollapsed);
-    expect($page.hasClass('right-sidebar-collapsed')).toBe(shouldBeCollapsed);
-    return expect($icon.hasClass('fa-angle-double-left')).toBe(shouldBeCollapsed);
-  };
-
-  describe('RightSidebar', function() {
-    describe('fixture tests', () => {
-      var fixtureName = 'issues/open-issue.html.raw';
-      preloadFixtures(fixtureName);
-      loadJSONFixtures('todos/todos.json');
-      let mock;
-
-      beforeEach(function() {
-        loadFixtures(fixtureName);
-        mock = new MockAdapter(axios);
-        new Sidebar(); // eslint-disable-line no-new
-        $aside = $('.right-sidebar');
-        $page = $('.layout-page');
-        $icon = $aside.find('i');
-        $toggle = $aside.find('.js-sidebar-toggle');
-        return $labelsIcon = $aside.find('.sidebar-collapsed-icon');
-      });
+let $aside = null;
+let $toggle = null;
+let $icon = null;
+let $page = null;
+let $labelsIcon = null;
+
+const assertSidebarState = function(state) {
+  const shouldBeExpanded = state === 'expanded';
+  const shouldBeCollapsed = state === 'collapsed';
+  expect($aside.hasClass('right-sidebar-expanded')).toBe(shouldBeExpanded);
+  expect($page.hasClass('right-sidebar-expanded')).toBe(shouldBeExpanded);
+  expect($icon.hasClass('fa-angle-double-right')).toBe(shouldBeExpanded);
+  expect($aside.hasClass('right-sidebar-collapsed')).toBe(shouldBeCollapsed);
+  expect($page.hasClass('right-sidebar-collapsed')).toBe(shouldBeCollapsed);
+  expect($icon.hasClass('fa-angle-double-left')).toBe(shouldBeCollapsed);
+};
+
+describe('RightSidebar', function() {
+  describe('fixture tests', () => {
+    const fixtureName = 'issues/open-issue.html.raw';
+    preloadFixtures(fixtureName);
+    loadJSONFixtures('todos/todos.json');
+    let mock;
+
+    beforeEach(function() {
+      loadFixtures(fixtureName);
+      mock = new MockAdapter(axios);
+      new Sidebar(); // eslint-disable-line no-new
+      $aside = $('.right-sidebar');
+      $page = $('.layout-page');
+      $icon = $aside.find('i');
+      $toggle = $aside.find('.js-sidebar-toggle');
+      $labelsIcon = $aside.find('.sidebar-collapsed-icon');
+    });
 
-      afterEach(() => {
-        mock.restore();
-      });
+    afterEach(() => {
+      mock.restore();
+    });
 
-      it('should expand/collapse the sidebar when arrow is clicked', function() {
-        assertSidebarState('expanded');
-        $toggle.click();
-        assertSidebarState('collapsed');
-        $toggle.click();
-        assertSidebarState('expanded');
-      });
+    it('should expand/collapse the sidebar when arrow is clicked', function() {
+      assertSidebarState('expanded');
+      $toggle.click();
+      assertSidebarState('collapsed');
+      $toggle.click();
+      assertSidebarState('expanded');
+    });
 
-      it('should float over the page and when sidebar icons clicked', function() {
-        $labelsIcon.click();
-        return assertSidebarState('expanded');
-      });
+    it('should float over the page and when sidebar icons clicked', function() {
+      $labelsIcon.click();
+      assertSidebarState('expanded');
+    });
 
-      it('should collapse when the icon arrow clicked while it is floating on page', function() {
-        $labelsIcon.click();
-        assertSidebarState('expanded');
-        $toggle.click();
-        return assertSidebarState('collapsed');
-      });
+    it('should collapse when the icon arrow clicked while it is floating on page', function() {
+      $labelsIcon.click();
+      assertSidebarState('expanded');
+      $toggle.click();
+      assertSidebarState('collapsed');
+    });
 
-      it('should broadcast todo:toggle event when add todo clicked', function(done) {
-        var todos = getJSONFixture('todos/todos.json');
-        mock.onPost(/(.*)\/todos$/).reply(200, todos);
+    it('should broadcast todo:toggle event when add todo clicked', function(done) {
+      const todos = getJSONFixture('todos/todos.json');
+      mock.onPost(/(.*)\/todos$/).reply(200, todos);
 
-        var todoToggleSpy = spyOnEvent(document, 'todo:toggle');
+      const todoToggleSpy = spyOnEvent(document, 'todo:toggle');
 
-        $('.issuable-sidebar-header .js-issuable-todo').click();
+      $('.issuable-sidebar-header .js-issuable-todo').click();
 
-        setTimeout(() => {
-          expect(todoToggleSpy.calls.count()).toEqual(1);
+      setTimeout(() => {
+        expect(todoToggleSpy.calls.count()).toEqual(1);
 
-          done();
-        });
+        done();
       });
+    });
 
-      it('should not hide collapsed icons', () => {
-        [].forEach.call(document.querySelectorAll('.sidebar-collapsed-icon'), (el) => {
-          expect(el.querySelector('.fa, svg').classList.contains('hidden')).toBeFalsy();
-        });
+    it('should not hide collapsed icons', () => {
+      [].forEach.call(document.querySelectorAll('.sidebar-collapsed-icon'), el => {
+        expect(el.querySelector('.fa, svg').classList.contains('hidden')).toBeFalsy();
       });
     });
   });
-}).call(window);
+});