Merge pull request #6903 from elastic/jasper/backport/6865/6893/4.5

[backport] PR #6865 to 4.5

src/ui/__tests__/ui_exports.js

@@ -5,7 +5,7 @@ import UiExports from '../UiExports';
 describe('UiExports', function () {
   describe('#find()', function () {
     it('finds exports based on the passed export names', function () {
-      var uiExports = new UiExports({});
+      let uiExports = new UiExports({});
       uiExports.aliases.foo = ['a', 'b', 'c'];
       uiExports.aliases.bar = ['d', 'e', 'f'];
 
@@ -15,7 +15,7 @@ describe('UiExports', function () {
     });
 
     it('allows query types that match nothing', function () {
-      var uiExports = new UiExports({});
+      let uiExports = new UiExports({});
       uiExports.aliases.foo = ['a', 'b', 'c'];
 
       expect(uiExports.find(['foo'])).to.eql(['a', 'b', 'c']);

src/ui/public/Binder/__tests__/Binder.js

@@ -1,9 +1,9 @@
-var $ = require('jquery');
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let $ = require('jquery');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
-var Binder = require('ui/Binder');
+let Binder = require('ui/Binder');
 
 describe('Binder class', function () {
   let $scope;
@@ -16,13 +16,13 @@ describe('Binder class', function () {
   context('Constructing with a $scope', function () {
     it('accepts a $scope and listens for $destroy', function () {
       sinon.stub($scope, '$on');
-      var binder = new Binder($scope);
+      let binder = new Binder($scope);
       expect($scope.$on.callCount).to.be(1);
       expect($scope.$on.args[0][0]).to.be('$destroy');
     });
 
     it('unbinds when the $scope is destroyed', function () {
-      var binder = new Binder($scope);
+      let binder = new Binder($scope);
       sinon.stub(binder, 'destroy');
       $scope.$destroy();
       expect(binder.destroy.callCount).to.be(1);
@@ -31,12 +31,12 @@ describe('Binder class', function () {
 
   describe('Binder#on', function () {
     it('binds to normal event emitters', function () {
-      var binder = new Binder();
-      var emitter = {
+      let binder = new Binder();
+      let emitter = {
         on: sinon.stub(),
         removeListener: sinon.stub()
       };
-      var handler = sinon.stub();
+      let handler = sinon.stub();
 
       binder.on(emitter, 'click', handler);
       expect(emitter.on.callCount).to.be(1);
@@ -52,9 +52,9 @@ describe('Binder class', function () {
 
   describe('Binder#jqOn', function () {
     it('binds jquery event handlers', function () {
-      var binder = new Binder();
-      var el = document.createElement('div');
-      var handler = sinon.stub();
+      let binder = new Binder();
+      let el = document.createElement('div');
+      let handler = sinon.stub();
 
       binder.jqOn(el, 'click', handler);
       $(el).click();

src/ui/public/IndexedArray/__tests__/IndexedArray.js

@@ -1,10 +1,10 @@
 
-var _ = require('lodash');
-var expect = require('expect.js');
-var IndexedArray = require('ui/IndexedArray');
+let _ = require('lodash');
+let expect = require('expect.js');
+let IndexedArray = require('ui/IndexedArray');
 
 // this is generally a data-structure that IndexedArray is good for managing
-var users = [
+let users = [
   { name: 'John', id: 69, username: 'beast', group: 'admins' },
   { name: 'Anon', id:  0, username: 'shhhh', group: 'secret' },
   { name: 'Fern', id: 42, username: 'kitty', group: 'editor' },
@@ -43,7 +43,7 @@ describe('IndexedArray', function () {
 
   describe('Indexing', function () {
     it('provides the initial set', function () {
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         initialSet: [1, 2, 3]
       });
 
@@ -55,7 +55,7 @@ describe('IndexedArray', function () {
     });
 
     it('indexes the initial set', function () {
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         index: ['username'],
         initialSet: users
       });
@@ -66,11 +66,11 @@ describe('IndexedArray', function () {
 
     it('updates indices after values are added', function () {
       // split up the user list, and add it in chunks
-      var firstUser = users.slice(0, 1).pop();
-      var otherUsers = users.slice(1);
+      let firstUser = users.slice(0, 1).pop();
+      let otherUsers = users.slice(1);
 
       // start off with all but the first
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: otherUsers
@@ -86,7 +86,7 @@ describe('IndexedArray', function () {
 
     it('updates indices after values are removed', function () {
       // start off with all
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: users
@@ -95,18 +95,18 @@ describe('IndexedArray', function () {
       // remove the last
       reg.pop();
 
-      var expectedCount = users.length - 1;
+      let expectedCount = users.length - 1;
       // indexed lists should be updated
       expect(reg).to.have.length(expectedCount);
 
-      var sumOfGroups = _.reduce(reg.byGroup, function (note, group) {
+      let sumOfGroups = _.reduce(reg.byGroup, function (note, group) {
         return note + group.length;
       }, 0);
       expect(sumOfGroups).to.eql(expectedCount);
     });
 
     it('removes items based on a predicate', function () {
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: users
@@ -120,26 +120,26 @@ describe('IndexedArray', function () {
     });
 
     it('updates indices after values are re-ordered', function () {
-      var rawUsers = users.slice(0);
+      let rawUsers = users.slice(0);
 
       // collect and shuffle the ids available
-      var ids = [];
+      let ids = [];
       _.times(rawUsers.length, function (i) { ids.push(i); });
       ids = _.shuffle(ids);
 
       // move something here
-      var toI = ids.shift();
+      let toI = ids.shift();
       // from here
-      var fromI = ids.shift();
+      let fromI = ids.shift();
       // do the move
-      var move = function (arr) { arr.splice(toI, 0, arr.splice(fromI, 1)[0]); };
+      let move = function (arr) { arr.splice(toI, 0, arr.splice(fromI, 1)[0]); };
 
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         index: ['username'],
         initialSet: rawUsers
       });
 
-      var index = reg.byUsername;
+      let index = reg.byUsername;
 
       move(reg);
 

src/ui/public/IndexedArray/__tests__/inflector.js

@@ -1,43 +1,43 @@
-var inflector = require('ui/IndexedArray/inflector');
-var expect = require('expect.js');
+let inflector = require('ui/IndexedArray/inflector');
+let expect = require('expect.js');
 
 describe('IndexedArray Inflector', function () {
   it('returns a function', function () {
-    var getter = inflector();
+    let getter = inflector();
     expect(getter).to.be.a('function');
   });
 
   describe('fn', function () {
     it('prepends a prefix', function () {
-      var inflect = inflector('my');
+      let inflect = inflector('my');
 
       expect(inflect('Family')).to.be('myFamily');
       expect(inflect('family')).to.be('myFamily');
       expect(inflect('fAmIlY')).to.be('myFAmIlY');
     });
 
     it('adds both a prefix and suffix', function () {
-      var inflect = inflector('foo', 'Bar');
+      let inflect = inflector('foo', 'Bar');
 
       expect(inflect('box')).to.be('fooBoxBar');
       expect(inflect('box.car.MAX')).to.be('fooBoxCarMaxBar');
       expect(inflect('BaZzY')).to.be('fooBaZzYBar');
     });
 
     it('ignores prefix if it is already at the end of the inflected string', function () {
-      var inflect = inflector('foo', 'Bar');
+      let inflect = inflector('foo', 'Bar');
       expect(inflect('fooBox')).to.be('fooBoxBar');
       expect(inflect('FooBox')).to.be('FooBoxBar');
     });
 
     it('ignores postfix if it is already at the end of the inflected string', function () {
-      var inflect = inflector('foo', 'Bar');
+      let inflect = inflector('foo', 'Bar');
       expect(inflect('bar')).to.be('fooBar');
       expect(inflect('showBoxBar')).to.be('fooShowBoxBar');
     });
 
     it('works with "name"', function () {
-      var inflect = inflector('in', 'Order');
+      let inflect = inflector('in', 'Order');
       expect(inflect('name')).to.be('inNameOrder');
     });
   });