Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules

* upstream/master: (1723 commits)
  Resolve "Editor icons"
  Refactor issuable destroy action
  Ignore routes matching legacy_*_redirect in route specs
  Gitlab::Git::RevList and LfsChanges use lazy popen
  Gitlab::Git::Popen can lazily hand output to a block
  Merge branch 'master-i18n' into 'master'
  Remove unique validation from external_url in Environment
  Expose `duration` in Job API entity
  Add TimeCop freeze for DST and Regular time
  Harcode project visibility
  update a changelog
  Put a condition to old migration that adds fast_forward column to MRs
  Expose project visibility as CI variable
  fix flaky tests by removing unneeded clicks and focus actions
  fix flaky test in gfm_autocomplete_spec.rb
  Use Gitlab::Git operations for repository mirroring
  Encapsulate git operations for mirroring in Gitlab::Git
  Create a Wiki Repository's raw_repository properly
  Add `Gitlab::Git::Repository#fetch` command
  Fix Gitlab::Metrics::System#real_time and #monotonic_time doc
  ...

1 files changed, 35 insertions, 39 deletions

diff --git a/spec/javascripts/header_spec.js b/spec/javascripts/header_spec.js
index 0e01934d3a3..2443ffd48f3 100644
--- a/spec/javascripts/header_spec.js
+++ b/spec/javascripts/header_spec.js
@@ -1,53 +1,49 @@
-/* eslint-disable space-before-function-paren, no-var */
+import initTodoToggle from '~/header';
 
-import '~/header';
-import '~/lib/utils/text_utility';
+describe('Header', function () {
+  const todosPendingCount = '.todos-count';
+  const fixtureTemplate = 'issues/open-issue.html.raw';
 
-(function() {
-  describe('Header', function() {
-    var todosPendingCount = '.todos-count';
-    var fixtureTemplate = 'issues/open-issue.html.raw';
+  function isTodosCountHidden() {
+    return $(todosPendingCount).hasClass('hidden');
+  }
 
-    function isTodosCountHidden() {
-      return $(todosPendingCount).hasClass('hidden');
-    }
+  function triggerToggle(newCount) {
+    $(document).trigger('todo:toggle', newCount);
+  }
 
-    function triggerToggle(newCount) {
-      $(document).trigger('todo:toggle', newCount);
-    }
+  preloadFixtures(fixtureTemplate);
+  beforeEach(() => {
+    initTodoToggle();
+    loadFixtures(fixtureTemplate);
+  });
 
-    preloadFixtures(fixtureTemplate);
-    beforeEach(function() {
-      loadFixtures(fixtureTemplate);
-    });
+  it('should update todos-count after receiving the todo:toggle event', () => {
+    triggerToggle('5');
+    expect($(todosPendingCount).text()).toEqual('5');
+  });
 
-    it('should update todos-count after receiving the todo:toggle event', function() {
-      triggerToggle(5);
-      expect($(todosPendingCount).text()).toEqual('5');
-    });
+  it('should hide todos-count when it is 0', () => {
+    triggerToggle('0');
+    expect(isTodosCountHidden()).toEqual(true);
+  });
 
-    it('should hide todos-count when it is 0', function() {
-      triggerToggle(0);
-      expect(isTodosCountHidden()).toEqual(true);
+  it('should show todos-count when it is more than 0', () => {
+    triggerToggle('10');
+    expect(isTodosCountHidden()).toEqual(false);
+  });
+
+  describe('when todos-count is 1000', () => {
+    beforeEach(() => {
+      triggerToggle('1000');
     });
 
-    it('should show todos-count when it is more than 0', function() {
-      triggerToggle(10);
+    it('should show todos-count', () => {
       expect(isTodosCountHidden()).toEqual(false);
     });
 
-    describe('when todos-count is 1000', function() {
-      beforeEach(function() {
-        triggerToggle(1000);
-      });
-
-      it('should show todos-count', function() {
-        expect(isTodosCountHidden()).toEqual(false);
-      });
-
-      it('should show 99+ for todos-count', function() {
-        expect($(todosPendingCount).text()).toEqual('99+');
-      });
+    it('should show 99+ for todos-count', () => {
+      expect($(todosPendingCount).text()).toEqual('99+');
     });
   });
-}).call(window);
+});