Merge pull request #6691 from elastic/jasper/backport/6653/6690/4.5

[backport] PR #6653 to 4.5

src/cli/plugin/__tests__/setting_parser.js

@@ -70,8 +70,8 @@ describe('kibana cli', function () {
 
       describe('parse function', function () {
 
-        var options;
-        var parser;
+        let options;
+        let parser;
         beforeEach(function () {
           options = { install: 'dummy/dummy', pluginDir: fromRoot('installedPlugins') };
         });

src/server/config/__tests__/config.js

@@ -62,7 +62,7 @@ describe('lib/config/config', function () {
 
     describe('#resetTo(object)', function () {
 
-      var config;
+      let config;
       beforeEach(function () {
         config = new Config(schema);
       });
@@ -79,7 +79,7 @@ describe('lib/config/config', function () {
 
     describe('#has(key)', function () {
 
-      var config;
+      let config;
       beforeEach(function () {
         config = new Config(schema);
       });
@@ -99,7 +99,7 @@ describe('lib/config/config', function () {
     });
 
     describe('#set(key, value)', function () {
-      var config;
+      let config;
 
       beforeEach(function () {
         config = new Config(schema);
@@ -148,7 +148,7 @@ describe('lib/config/config', function () {
 
     describe('#get(key)', function () {
 
-      var config;
+      let config;
 
       beforeEach(function () {
         config = new Config(schema);
@@ -187,7 +187,7 @@ describe('lib/config/config', function () {
     });
 
     describe('#extendSchema(key, schema)', function () {
-      var config;
+      let config;
       beforeEach(function () {
         config = new Config(schema);
       });

src/server/config/flattenWith.js

@@ -1,6 +1,6 @@
 var _ = require('lodash');
 module.exports = function (dot, nestedObj, flattenArrays) {
-  var key; // original key
+  let key; // original key
   var stack = []; // track key stack
   var flatObj = {};
   (function flattenObj(obj) {

src/server/status/__tests__/ServerStatus.js

@@ -7,8 +7,8 @@ var Status = require('../Status');
 var ServerStatus = require('../ServerStatus');
 
 describe('ServerStatus class', function () {
-  var server;
-  var serverStatus;
+  let server;
+  let serverStatus;
 
   beforeEach(function () {
     server = { expose: sinon.stub(), log: sinon.stub() };

src/server/status/__tests__/Status.js

@@ -5,8 +5,8 @@ var ServerStatus = require('../ServerStatus');
 
 describe('Status class', function () {
 
-  var server;
-  var serverStatus;
+  let server;
+  let serverStatus;
 
   beforeEach(function () {
     server = { expose: sinon.stub(), log: sinon.stub() };

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

@@ -6,7 +6,7 @@ var ngMock = require('ngMock');
 var Binder = require('ui/Binder');
 
 describe('Binder class', function () {
-  var $scope;
+  let $scope;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($rootScope) {

src/ui/public/IndexedArray/IndexedArray.js

@@ -75,7 +75,7 @@ define(function (require) {
 
       var from = pathGetter.partial(prop).value();
       var to = inflect(prop);
-      var cache;
+      let cache;
 
       Object.defineProperty(self, to, {
         enumerable: false,

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

@@ -21,7 +21,7 @@ users.inIdOrder = _.sortBy(users, 'id');
 
 describe('IndexedArray', function () {
   describe('Basics', function () {
-    var reg;
+    let reg;
 
     beforeEach(function () {
       reg = new IndexedArray();

src/ui/public/IndexedArray/inflector.js

@@ -17,7 +17,7 @@ define(function (require) {
 
   function inflector(prefix, postfix) {
     return function inflect(key) {
-      var inflected;
+      let inflected;
 
       if (key.indexOf('.') !== -1) {
         inflected = key

src/ui/public/StackTraceMapper/stackLineFormat.js

@@ -5,7 +5,7 @@ var opts = [
   /(?: \(|at )((?:[!#$&-;=?-\[\]_a-z~]|%[0-9a-f]{2})+\.js)\:(\d+)(?:\:(\d+)|())/ig
 ];
 
-var sample;
+let sample;
 try { throw new Error('msg'); } catch (e) { sample = e.stack; }
 
 var format = _.find(opts, function (format) {

src/ui/public/Vis/AggConfig.js

@@ -141,7 +141,7 @@ define(function (require) {
      */
     AggConfig.prototype.resetParams = function () {
       var fieldParam = this.type && this.type.params.byName.field;
-      var field;
+      let field;
 
       if (fieldParam) {
         var prevField = this.params.field;

src/ui/public/Vis/AggConfigs.js

@@ -48,8 +48,8 @@ define(function (require) {
 
     AggConfigs.prototype.toDsl = function () {
       var dslTopLvl = {};
-      var dslLvlCursor;
-      var nestedMetrics;
+      let dslLvlCursor;
+      let nestedMetrics;
 
       if (this.vis.isHierarchical()) {
         // collect all metrics, and filter out the ones that we won't be copying
@@ -85,7 +85,7 @@ define(function (require) {
         }
 
         var dsl = dslLvlCursor[config.id] = config.toDsl();
-        var subAggs;
+        let subAggs;
 
         if (config.schema.group === 'buckets' && i < list.length - 1) {
           // buckets that are not the last item in the list accept sub-aggs

src/ui/public/Vis/__tests__/_AggConfig.js

@@ -3,11 +3,11 @@ describe('AggConfig', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var Vis;
-  var AggType;
-  var AggConfig;
-  var indexPattern;
-  var fieldFormat;
+  let Vis;
+  let AggType;
+  let AggConfig;
+  let indexPattern;
+  let fieldFormat;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/Vis/__tests__/_AggConfigResult.js

@@ -4,9 +4,9 @@ describe('AggConfigResult', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var AggConfig;
-  var indexPattern;
-  var Vis;
+  let AggConfig;
+  let indexPattern;
+  let Vis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/Vis/__tests__/_AggConfigs.js

@@ -4,13 +4,13 @@ describe('AggConfigs', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var Vis;
-  var IndexedArray;
-  var AggConfig;
-  var AggConfigs;
-  var SpiedAggConfig;
-  var indexPattern;
-  var Schemas;
+  let Vis;
+  let IndexedArray;
+  let AggConfig;
+  let AggConfigs;
+  let SpiedAggConfig;
+  let indexPattern;
+  let Schemas;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -95,7 +95,7 @@ describe('AggConfigs', function () {
     });
 
     describe('defaults', function () {
-      var vis;
+      let vis;
       beforeEach(function () {
         vis = {
           indexPattern: indexPattern,

src/ui/public/Vis/__tests__/_Renderbot.js

@@ -1,5 +1,5 @@
 describe('renderbot', function () {
-  var Renderbot;
+  let Renderbot;
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
@@ -12,10 +12,10 @@ describe('renderbot', function () {
   }
 
   describe('API', function () {
-    var vis;
-    var $el;
-    var renderbot;
-    var uiState;
+    let vis;
+    let $el;
+    let renderbot;
+    let uiState;
 
     beforeEach(init);
     beforeEach(function () {

src/ui/public/Vis/__tests__/_Vis.js

@@ -4,11 +4,11 @@ describe('Vis Class', function () {
   var ngMock = require('ngMock');
   var expect = require('expect.js');
 
-  var indexPattern;
-  var Vis;
-  var visTypes;
+  let indexPattern;
+  let Vis;
+  let visTypes;
 
-  var vis;
+  let vis;
   var stateFixture = {
     type: 'pie',
     aggs: [

src/ui/public/agg_response/geo_json/__tests__/geo_json.js

@@ -4,11 +4,11 @@ var expect = require('expect.js');
 var ngMock = require('ngMock');
 
 describe('GeoJson Agg Response Converter', function () {
-  var vis;
-  var tabify;
-  var convert;
-  var esResponse;
-  var aggs;
+  let vis;
+  let tabify;
+  let convert;
+  let esResponse;
+  let aggs;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -103,10 +103,10 @@ describe('GeoJson Agg Response Converter', function () {
         describe('includes one feature per row in the table', function () {
           this.timeout(60000);
 
-          var table;
-          var chart;
-          var geoColI;
-          var metricColI;
+          let table;
+          let chart;
+          let geoColI;
+          let metricColI;
 
           before(function () {
             table = makeTable();

src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js

@@ -4,7 +4,7 @@ var expect = require('expect.js');
 describe('buildHierarchicalData()', function () {
   describe('arrayToLinkedList', function () {
 
-    var results;
+    let results;
     beforeEach(function () {
       results = arrayToLinkedList([
         { id: 1 },

src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js

@@ -5,11 +5,11 @@ var sinon = require('auto-release-sinon');
 var expect = require('expect.js');
 var ngMock = require('ngMock');
 
-var Vis;
-var Notifier;
-var AggConfigs;
-var indexPattern;
-var buildHierarchicalData;
+let Vis;
+let Notifier;
+let AggConfigs;
+let indexPattern;
+let buildHierarchicalData;
 
 describe('buildHierarchicalData', function () {
 
@@ -27,8 +27,8 @@ describe('buildHierarchicalData', function () {
 
 
   describe('metric only', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
       var id = 1;
@@ -99,8 +99,8 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('threeTermBuckets', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
       var id = 1;
@@ -141,8 +141,8 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('oneHistogramBucket', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
       var id = 1;
@@ -173,8 +173,8 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('oneRangeBucket', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
       var id = 1;
@@ -214,8 +214,8 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('oneFilterBucket', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
       var id = 1;
@@ -250,8 +250,8 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('oneFilterBucket that is a split', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
       var id = 1;

src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js

@@ -3,7 +3,7 @@ var _ = require('lodash');
 var collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
 var expect = require('expect.js');
 describe('collectBranch()', function () {
-  var results;
+  let results;
   var convert = function (name) {
     return 'converted:' + name;
   };

src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js

@@ -6,14 +6,14 @@ var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_l
 var expect = require('expect.js');
 var ngMock = require('ngMock');
 
-var AggConfigs;
-var Vis;
-var indexPattern;
+let AggConfigs;
+let Vis;
+let indexPattern;
 
 describe('buildHierarchicalData()', function () {
   describe('createRawData()', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(ngMock.module('kibana'));
 

src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js

@@ -4,8 +4,8 @@ describe('buildHierarchicalData()', function () {
     var _ = require('lodash');
     var expect = require('expect.js');
     var ngMock = require('ngMock');
-    var transform;
-    var fixture;
+    let transform;
+    let fixture;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_response/hierarchical/_array_to_linked_list.js

@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
   return function (buckets) {
-    var previous;
+    let previous;
     _.each(buckets, function (bucket) {
       if (previous) {
         bucket._previous = previous;

src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js

@@ -22,7 +22,7 @@ define(function (require) {
         _.forEachRight($tooltipScope.rows, function (row, i, rows) {
           row.spacer = $sce.trustAsHtml(_.repeat(' ', row.depth));
 
-          var percent;
+          let percent;
           if (row.item.percentOfGroup != null) {
             percent = row.item.percentOfGroup;
           }

src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js

@@ -1,7 +1,7 @@
 describe('addToSiri', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
-  var addToSiri;
+  let addToSiri;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js

@@ -1,10 +1,10 @@
 describe('makeFakeXAspect', function () {
 
-  var makeFakeXAspect;
-  var Vis;
-  var AggType;
-  var AggConfig;
-  var indexPattern;
+  let makeFakeXAspect;
+  let Vis;
+  let AggType;
+  let AggConfig;
+  let indexPattern;
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 

src/ui/public/agg_response/point_series/__tests__/_get_aspects.js

@@ -4,11 +4,11 @@ describe('getAspects', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var Vis;
-  var Table;
-  var AggConfig;
-  var indexPattern;
-  var getAspects;
+  let Vis;
+  let Table;
+  let AggConfig;
+  let indexPattern;
+  let getAspects;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -19,8 +19,8 @@ describe('getAspects', function () {
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
   }));
 
-  var vis;
-  var table;
+  let vis;
+  let table;
 
   var date = _.memoize(function (n) {
     return moment().startOf('day').add(n, 'hour').valueOf();

src/ui/public/agg_response/point_series/__tests__/_get_point.js

@@ -4,7 +4,7 @@ describe('getPoint', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var getPoint;
+  let getPoint;
 
   var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
   var identFormatted = { fieldFormatter: _.constant(_.identity) };
@@ -15,10 +15,10 @@ describe('getPoint', function () {
   }));
 
   describe('Without series aspect', function () {
-    var seriesAspect;
-    var xAspect;
-    var yAspect;
-    var yScale;
+    let seriesAspect;
+    let xAspect;
+    let yAspect;
+    let yScale;
 
     beforeEach(function () {
       seriesAspect = null;
@@ -48,10 +48,10 @@ describe('getPoint', function () {
   });
 
   describe('With series aspect', function () {
-    var row;
-    var xAspect;
-    var yAspect;
-    var yScale;
+    let row;
+    let xAspect;
+    let yAspect;
+    let yScale;
 
     beforeEach(function () {
       row = [ { value: 1 }, { value: 2 }, { value: 3 }];

src/ui/public/agg_response/point_series/__tests__/_get_series.js

@@ -2,7 +2,7 @@ describe('getSeries', function () {
   var _ = require('lodash');
   var expect = require('expect.js');
   var ngMock = require('ngMock');
-  var getSeries;
+  let getSeries;
 
   var agg = { fieldFormatter: _.constant(_.identity) };
 

src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js

@@ -3,7 +3,7 @@ describe('initXAxis', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var initXAxis;
+  let initXAxis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js

@@ -3,7 +3,7 @@ describe('initYAxis', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var initYAxis;
+  let initYAxis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_response/point_series/__tests__/_main.js

@@ -7,10 +7,10 @@ describe('pointSeriesChartDataFromTable', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var pointSeriesChartDataFromTable;
-  var indexPattern;
-  var Table;
-  var Vis;
+  let pointSeriesChartDataFromTable;
+  let indexPattern;
+  let Table;
+  let Vis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js

@@ -27,7 +27,7 @@ describe('orderedDateAxis', function () {
     }
   };
 
-  var orderedDateAxis;
+  let orderedDateAxis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js

@@ -4,7 +4,7 @@ describe('tooltipFormatter', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var tooltipFormatter;
+  let tooltipFormatter;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_response/point_series/_get_series.js

@@ -36,7 +36,7 @@ define(function (require) {
       if (multiY) {
         series = _.sortBy(series, function (siri) {
           var firstVal = siri.values[0];
-          var y;
+          let y;
 
           if (firstVal) {
             var agg = firstVal.aggConfigResult.aggConfig;

src/ui/public/agg_response/tabify/__tests__/_buckets.js

@@ -1,5 +1,5 @@
 describe('Buckets wrapper', function () {
-  var Buckets;
+  let Buckets;
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 

src/ui/public/agg_response/tabify/__tests__/_get_columns.js

@@ -1,7 +1,7 @@
 describe('get columns', function () {
-  var getColumns;
-  var Vis;
-  var indexPattern;
+  let getColumns;
+  let Vis;
+  let indexPattern;
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 

src/ui/public/agg_response/tabify/__tests__/_integration.js

@@ -4,10 +4,10 @@ describe('tabifyAggResponse Integration', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var Vis;
-  var Buckets;
-  var indexPattern;
-  var tabifyAggResponse;
+  let Vis;
+  let Buckets;
+  let indexPattern;
+  let tabifyAggResponse;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -43,12 +43,12 @@ describe('tabifyAggResponse Integration', function () {
   describe('transforms a complex response', function () {
     this.slow(1000);
 
-    var vis;
-    var avg;
-    var ext;
-    var src;
-    var os;
-    var esResp;
+    let vis;
+    let avg;
+    let ext;
+    let src;
+    let os;
+    let esResp;
 
     beforeEach(function () {
       vis = new Vis(indexPattern, {

src/ui/public/agg_response/tabify/__tests__/_response_writer.js

@@ -4,14 +4,14 @@ describe('ResponseWriter class', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var Vis;
-  var Table;
-  var Buckets;
-  var Private;
-  var TableGroup;
-  var getColumns;
-  var indexPattern;
-  var ResponseWriter;
+  let Vis;
+  let Table;
+  let Buckets;
+  let Private;
+  let TableGroup;
+  let getColumns;
+  let indexPattern;
+  let ResponseWriter;
 
   function defineSetup(stubGetColumns) {
     beforeEach(ngMock.module('kibana'));

src/ui/public/agg_response/tabify/__tests__/_table.js

@@ -3,7 +3,7 @@ describe('Table class', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var Table;
+  let Table;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {

src/ui/public/agg_response/tabify/__tests__/_table_group.js

@@ -1,5 +1,5 @@
 describe('Table Group class', function () {
-  var TableGroup;
+  let TableGroup;
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 

src/ui/public/agg_table/__tests__/_group.js

@@ -5,11 +5,11 @@ describe('AggTableGroup Directive', function () {
   var expect = require('expect.js');
   var fixtures = require('fixtures/fake_hierarchical_data');
 
-  var $rootScope;
-  var $compile;
-  var tabifyAggResponse;
-  var Vis;
-  var indexPattern;
+  let $rootScope;
+  let $compile;
+  let tabifyAggResponse;
+  let Vis;
+  let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private) {
@@ -21,7 +21,7 @@ describe('AggTableGroup Directive', function () {
     $compile = $injector.get('$compile');
   }));
 
-  var $scope;
+  let $scope;
   beforeEach(function () {
     $scope = $rootScope.$new();
   });

src/ui/public/agg_table/__tests__/_table.js

@@ -6,11 +6,11 @@ describe('AggTable Directive', function () {
   var fixtures = require('fixtures/fake_hierarchical_data');
   var sinon = require('auto-release-sinon');
 
-  var $rootScope;
-  var $compile;
-  var tabifyAggResponse;
-  var Vis;
-  var indexPattern;
+  let $rootScope;
+  let $compile;
+  let tabifyAggResponse;
+  let Vis;
+  let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private) {
@@ -22,7 +22,7 @@ describe('AggTable Directive', function () {
     $compile = $injector.get('$compile');
   }));
 
-  var $scope;
+  let $scope;
   beforeEach(function () {
     $scope = $rootScope.$new();
   });
@@ -131,7 +131,7 @@ describe('AggTable Directive', function () {
   });
 
   describe('aggTable.exportAsCsv()', function () {
-    var origBlob;
+    let origBlob;
     function FakeBlob(slices, opts) {
       this.slices = slices;
       this.opts = opts;

src/ui/public/agg_types/__tests__/AggParams.js

@@ -3,11 +3,11 @@ describe('AggParams class', function () {
   var ngMock = require('ngMock');
   var expect = require('expect.js');
 
-  var AggParams;
-  var BaseAggParam;
-  var FieldAggParam;
-  var OptionedAggParam;
-  var RegexAggParam;
+  let AggParams;
+  let BaseAggParam;
+  let FieldAggParam;
+  let OptionedAggParam;
+  let RegexAggParam;
 
   beforeEach(ngMock.module('kibana'));
   // stub out the param classes before we get the AggParams

src/ui/public/agg_types/__tests__/AggType.js

@@ -3,12 +3,12 @@ describe('AggType Class', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
   var sinon = require('auto-release-sinon');
-  var AggType;
-  var AggParams;
-  var AggConfig;
-  var indexPattern;
-  var fieldFormat;
-  var Vis;
+  let AggType;
+  let AggParams;
+  let AggConfig;
+  let indexPattern;
+  let fieldFormat;
+  let Vis;
 
   require('ui/private');
 

src/ui/public/agg_types/__tests__/bucketCountBetween.js

@@ -2,12 +2,12 @@ describe('bucketCountBetween util', function () {
   var _ = require('lodash');
   var expect = require('expect.js');
   var ngMock = require('ngMock');
-  var indexPattern;
-  var Vis;
-  var visTypes;
-  var aggTypes;
-  var AggConfig;
-  var bucketCountBetween;
+  let indexPattern;
+  let Vis;
+  let visTypes;
+  let aggTypes;
+  let AggConfig;
+  let bucketCountBetween;
 
   // http://cwestblog.com/2014/02/25/javascript-testing-for-negative-zero/
   // works for -0 and +0

src/ui/public/agg_types/__tests__/buckets/_histogram.js

@@ -4,7 +4,7 @@ describe('Histogram Agg', function () {
   var ngMock = require('ngMock');
 
   describe('ordered', function () {
-    var histogram;
+    let histogram;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -22,7 +22,7 @@ describe('Histogram Agg', function () {
 
 
   describe('params', function () {
-    var paramWriter;
+    let paramWriter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/buckets/_range.js

@@ -7,9 +7,9 @@ describe('Range Agg', function () {
   var resp = require('fixtures/agg_resp/range');
   var buckets = values(resp.aggregations[1].buckets);
 
-  var range;
-  var Vis;
-  var indexPattern;
+  let range;
+  let Vis;
+  let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js

@@ -7,16 +7,16 @@ describe('AggConfig Filters', function () {
     var ngMock = require('ngMock');
     var expect = require('expect.js');
 
-    var vis;
-    var agg;
-    var field;
-    var filter;
-    var bucketKey;
-    var bucketStart;
-    var getIntervalStub;
-    var intervalOptions;
+    let vis;
+    let agg;
+    let field;
+    let filter;
+    let bucketKey;
+    let bucketStart;
+    let getIntervalStub;
+    let intervalOptions;
 
-    var init;
+    let init;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private, $injector) {
@@ -79,7 +79,7 @@ describe('AggConfig Filters', function () {
 
     it('extends the filter edge to 1ms before the next bucket for all interval options', function () {
       intervalOptions.forEach(function (option) {
-        var duration;
+        let duration;
         if (option.val !== 'custom' && moment(1, option.val).isValid()) {
           duration = moment.duration(10, option.val);
 

src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js

@@ -5,10 +5,10 @@ var ngMock = require('ngMock');
 
 describe('AggConfig Filters', function () {
   describe('Date range', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js

@@ -5,10 +5,10 @@ var ngMock = require('ngMock');
 
 describe('AggConfig Filters', function () {
   describe('filters', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js

@@ -5,10 +5,10 @@ var ngMock = require('ngMock');
 
 describe('AggConfig Filters', function () {
   describe('histogram', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js

@@ -3,10 +3,10 @@ describe('AggConfig Filters', function () {
   var ngMock = require('ngMock');
 
   describe('IP range', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/buckets/create_filter/range.js

@@ -3,10 +3,10 @@ describe('AggConfig Filters', function () {
   var ngMock = require('ngMock');
 
   describe('range', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js

@@ -3,10 +3,10 @@ describe('AggConfig Filters', function () {
   var ngMock = require('ngMock');
 
   describe('terms', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js

@@ -4,11 +4,11 @@ describe('editor', function () {
   var ngMock = require('ngMock');
   var expect = require('expect.js');
 
-  var indexPattern;
-  var vis;
-  var agg;
-  var render;
-  var $scope;
+  let indexPattern;
+  let vis;
+  let agg;
+  let render;
+  let $scope;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector, $compile) {
@@ -66,9 +66,9 @@ describe('editor', function () {
   }));
 
   describe('random field/interval', function () {
-    var params;
-    var field;
-    var interval;
+    let params;
+    let field;
+    let interval;
 
     beforeEach(ngMock.inject(function (Private) {
       field = _.sample(indexPattern.fields);
@@ -94,7 +94,7 @@ describe('editor', function () {
   });
 
   describe('interval "auto" and indexPattern timeField', function () {
-    var params;
+    let params;
 
     beforeEach(function () {
       params = render({ field: indexPattern.timeFieldName, interval: 'auto' });

src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js

@@ -4,13 +4,13 @@ describe('params', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var paramWriter;
-  var writeInterval;
+  let paramWriter;
+  let writeInterval;
 
-  var aggTypes;
-  var AggConfig;
-  var setTimeBounds;
-  var timeField;
+  let aggTypes;
+  let AggConfig;
+  let setTimeBounds;
+  let timeField;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {

src/ui/public/agg_types/__tests__/controls/number_list.js

@@ -7,9 +7,9 @@ describe('NumberList directive', function () {
 
   require('ui/number_list');
 
-  var $el;
-  var $scope;
-  var compile;
+  let $el;
+  let $scope;
+  let compile;
 
   function onlyValidValues() {
     return $el.find('[ng-model]').toArray().map(function (el) {

src/ui/public/agg_types/__tests__/index.js

@@ -9,8 +9,8 @@ describe('AggTypesComponent', function () {
   require('./buckets/_range');
 
   describe('bucket aggs', function () {
-    var bucketAggs;
-    var BucketAggType;
+    let bucketAggs;
+    let BucketAggType;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -26,8 +26,8 @@ describe('AggTypesComponent', function () {
   });
 
   describe('metric aggs', function () {
-    var metricAggs;
-    var MetricAggType;
+    let metricAggs;
+    let MetricAggType;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js

@@ -3,11 +3,11 @@ var expect = require('expect.js');
 var ngMock = require('ngMock');
 
 describe('calculateInterval()', function () {
-  var AggConfig;
-  var indexPattern;
-  var Vis;
-  var createFilter;
-  var calculateInterval;
+  let AggConfig;
+  let indexPattern;
+  let Vis;
+  let createFilter;
+  let calculateInterval;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/agg_types/__tests__/param_types/_field.js

@@ -3,8 +3,8 @@ describe('Field', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var BaseAggParam;
-  var FieldAggParam;
+  let BaseAggParam;
+  let FieldAggParam;
 
   beforeEach(ngMock.module('kibana'));
   // fetch out deps

src/ui/public/agg_types/__tests__/param_types/_optioned.js

@@ -3,8 +3,8 @@ describe('Optioned', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var BaseAggParam;
-  var OptionedAggParam;
+  let BaseAggParam;
+  let OptionedAggParam;
 
   beforeEach(ngMock.module('kibana'));
   // fetch out deps

src/ui/public/agg_types/__tests__/param_types/_raw_json.js

@@ -5,11 +5,11 @@ var ngMock = require('ngMock');
 
 module.exports = describe('JSON', function () {
   var paramName = 'json_test';
-  var BaseAggParam;
-  var JsonAggParam;
-  var aggParam;
-  var aggConfig;
-  var output;
+  let BaseAggParam;
+  let JsonAggParam;
+  let aggParam;
+  let aggConfig;
+  let output;
 
   function initAggParam(config) {
     config = config || {};

src/ui/public/agg_types/__tests__/param_types/_regex.js

@@ -3,10 +3,10 @@ describe('Regex', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var BaseAggParam;
-  var RegexAggParam;
-  var Vis;
-  var indexPattern;
+  let BaseAggParam;
+  let RegexAggParam;
+  let Vis;
+  let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   // fetch out deps
@@ -30,8 +30,8 @@ describe('Regex', function () {
   });
 
   describe('write results', function () {
-    var aggParam;
-    var aggConfig;
+    let aggParam;
+    let aggConfig;
     var output = { params: {} };
     var paramName = 'exclude';
 

src/ui/public/agg_types/__tests__/param_types/_string.js

@@ -4,11 +4,11 @@ var ngMock = require('ngMock');
 
 module.exports = describe('String', function () {
   var paramName = 'json_test';
-  var BaseAggParam;
-  var StringAggParam;
-  var aggParam;
-  var aggConfig;
-  var output;
+  let BaseAggParam;
+  let StringAggParam;
+  let aggParam;
+  let aggConfig;
+  let output;
 
   function initAggParam(config) {
     config = config || {};

src/ui/public/agg_types/buckets/create_filter/ip_range.js

@@ -3,7 +3,7 @@ define(function (require) {
   var buildRangeFilter = require('ui/filter_manager/lib/range');
   return function createIpRangeFilterProvider() {
     return function (aggConfig, key) {
-      var range;
+      let range;
       if (aggConfig.params.ipRangeType === 'mask') {
         range = new CidrMask(key).getRange();
       } else {

src/ui/public/agg_types/buckets/date_histogram.js

@@ -40,7 +40,7 @@ define(function (require) {
       },
       createFilter: createFilter,
       decorateAggConfig: function () {
-        var buckets;
+        let buckets;
         return {
           buckets: {
             configurable: true,

src/ui/public/agg_types/param_types/raw_json.js

@@ -25,7 +25,7 @@ define(function (require) {
      * @return {undefined}
      */
     RawJSONAggParam.prototype.write = function (aggConfig, output) {
-      var paramJSON;
+      let paramJSON;
       var param = aggConfig.params[this.name];
 
       if (!param) {

src/ui/public/bind/__tests__/bind.js

@@ -3,8 +3,8 @@ describe('$scope.$bind', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var $rootScope;
-  var $scope;
+  let $rootScope;
+  let $scope;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {

src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js

@@ -12,7 +12,7 @@ require('../app_switcher');
 var DomLocationProvider = require('ui/domLocation');
 
 describe('appSwitcher directive', function () {
-  var env;
+  let env;
 
   beforeEach(ngMock.module('kibana'));
 

src/ui/public/compile_recursive_directive.js

@@ -26,7 +26,7 @@ define(function (require) {
 
         // Break the recursion loop by removing the contents
         var contents = element.contents().remove();
-        var compiledContents;
+        let compiledContents;
         return {
           pre: (link && link.pre) ? link.pre : null,
           /**

src/ui/public/config/__tests__/config.js

@@ -1,7 +1,7 @@
 describe('config component', function () {
-  var $scope;
-  var config;
-  var defaults;
+  let $scope;
+  let config;
+  let defaults;
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 

src/ui/public/config/_delayed_updater.js

@@ -10,7 +10,7 @@ define(function (require) {
       var updater = this;
       var queue = [];
       var log = {};
-      var timer;
+      let timer;
 
       updater.fire = function () {
         clearTimeout(timer);
@@ -19,8 +19,8 @@ define(function (require) {
         if (updater.fired) return;
         updater.fired = true;
 
-        var method;
-        var body;
+        let method;
+        let body;
         var updated = [];
         var deleted = [];
 

src/ui/public/config/config.js

@@ -23,7 +23,7 @@ define(function (require) {
 
     // active or previous instance of DelayedUpdater. This will log and then process an
     // update once it is requested by calling #set() or #clear().
-    var updater;
+    let updater;
 
     var DocSource = Private(require('ui/courier/data_source/doc_source'));
     var doc = (new DocSource())
@@ -77,7 +77,7 @@ define(function (require) {
     });
 
     config.get = function (key, defaultVal) {
-      var keyVal;
+      let keyVal;
 
       if (vals[key] == null) {
         if (defaultVal == null) {

src/ui/public/courier/data_source/__tests__/decorate_query.js

@@ -5,13 +5,13 @@ var ngMock = require('ngMock');
 describe('Query decorator', function () {
 
   var _ = require('lodash');
-  var config;
+  let config;
 
-  var indexPattern;
+  let indexPattern;
 
-  var getComputedFields;
+  let getComputedFields;
 
-  var fn;
+  let fn;
   beforeEach(ngMock.module(
     'kibana',
     function ($provide) {

src/ui/public/courier/data_source/__tests__/normalize_sort_request.js

@@ -5,9 +5,9 @@ describe('SearchSource#normalizeSortRequest', function () {
   var ngMock = require('ngMock');
   var expect = require('expect.js');
 
-  var normalizeSortRequest;
-  var indexPattern;
-  var normalizedSort;
+  let normalizeSortRequest;
+  let indexPattern;
+  let normalizedSort;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {

src/ui/public/courier/data_source/_doc_send_to_es.js

@@ -31,7 +31,7 @@ define(function (require) {
         doc._storeVersion(resp._version);
         doc.id(resp._id);
 
-        var docFetchProm;
+        let docFetchProm;
         if (method !== 'index') {
           docFetchProm = doc.fetch();
         } else {

src/ui/public/courier/data_source/_normalize_sort_request.js

@@ -28,7 +28,7 @@ define(function (require) {
       var indexField = indexPattern.fields.byName[sortField];
 
       if (indexField && indexField.scripted && indexField.sortable) {
-        var direction;
+        let direction;
         if (_.isString(sortValue)) direction = sortValue;
         if (_.isObject(sortValue) && sortValue.order) direction = sortValue.order;
 

src/ui/public/courier/data_source/_root_search_source.js

@@ -11,7 +11,7 @@ define(function (require) {
       return timefilter.get(globalSource.get('index'));
     });
 
-    var appSource; // set in setAppSource()
+    let appSource; // set in setAppSource()
     resetAppSource();
 
     // when the route changes, clear the appSource

src/ui/public/courier/fetch/__tests__/doc.js

@@ -4,12 +4,12 @@ describe('Courier DocFetchRequest class', function () {
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
-  var storage;
-  var source;
-  var defer;
-  var req;
+  let storage;
+  let source;
+  let defer;
+  let req;
 
-  var setVersion;
+  let setVersion;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, Promise, $injector) {

src/ui/public/courier/fetch/_call_client.js

@@ -19,7 +19,7 @@ define(function (require) {
       if (!execCount) return Promise.resolve([]);
 
       // resolved by respond()
-      var esPromise;
+      let esPromise;
       var defer = Promise.defer();
 
       // for each respond with either the response or ABORTED

src/ui/public/courier/saved_object/saved_object.js

@@ -146,7 +146,7 @@ define(function (require) {
         if (!self.searchSource) return;
 
         // if we have a searchSource, set its state based on the searchSourceJSON field
-        var state;
+        let state;
         try {
           state = JSON.parse(searchSourceJson);
         } catch (e) {

src/ui/public/debounce/__tests__/debounce.js

@@ -3,9 +3,9 @@ var sinon = require('auto-release-sinon');
 var expect = require('expect.js');
 var ngMock = require('ngMock');
 
-var debounce;
-var $timeout;
-var $timeoutSpy;
+let debounce;
+let $timeout;
+let $timeoutSpy;
 
 function init() {
   ngMock.module('kibana');
@@ -19,7 +19,7 @@ function init() {
 }
 
 describe('debounce service', function () {
-  var spy;
+  let spy;
   beforeEach(function () {
     spy = sinon.spy(function () {});
     init();

src/ui/public/debounce/debounce.js

@@ -7,10 +7,10 @@ define(function (require) {
 
   module.service('debounce', ['$timeout', function ($timeout) {
     return function (func, wait, options) {
-      var timeout;
-      var args;
-      var self;
-      var result;
+      let timeout;
+      let args;
+      let self;
+      let result;
       options = _.defaults(options || {}, {
         leading: false,
         trailing: true

src/ui/public/directives/__tests__/auto_select_if_only_one.js

@@ -5,8 +5,8 @@ var ngMock = require('ngMock');
 require('ui/directives/auto_select_if_only_one');
 
 describe('Auto-select if only one directive', function () {
-  var $compile;
-  var $rootScope;
+  let $compile;
+  let $rootScope;
   var zeroOptions = [];
   var oneOption = [{label: 'foo'}];
   var multiOptions = [{label: 'foo'}, {label: 'bar'}];

src/ui/public/directives/__tests__/confirm-click.js

@@ -7,11 +7,11 @@ var ngMock = require('ngMock');
 require('ui/directives/confirm_click');
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 
 var init = function (text) {
   // Load the application
@@ -47,7 +47,7 @@ describe('confirmClick directive', function () {
 
 
   describe('event handlers', function () {
-    var events;
+    let events;
 
     beforeEach(function () {
       init();
@@ -71,7 +71,7 @@ describe('confirmClick directive', function () {
 
 
   describe('confirmed', function () {
-    var confirmed;
+    let confirmed;
 
     beforeEach(function () {
       init();
@@ -98,7 +98,7 @@ describe('confirmClick directive', function () {
   });
 
   describe('not confirmed', function () {
-    var confirmed;
+    let confirmed;
 
     beforeEach(function () {
       init();

src/ui/public/directives/__tests__/css_truncate.js

@@ -4,11 +4,11 @@ var expect = require('expect.js');
 var ngMock = require('ngMock');
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 
 var init = function (expandable) {
   // Load the application

src/ui/public/directives/__tests__/fixedScroll.js

@@ -8,7 +8,7 @@ describe('FixedScroll directive', function () {
   var sinon = require('auto-release-sinon');
   var Promise = require('bluebird');
 
-  var compile;
+  let compile;
   var trash = [];
 
   beforeEach(ngMock.module('kibana'));
@@ -112,10 +112,10 @@ describe('FixedScroll directive', function () {
       { from: '$scroller', to: '$container' }
     ].forEach(function (names) {
       describe('scroll events ' + JSON.stringify(names), function () {
-        var spy;
-        var els;
-        var $from;
-        var $to;
+        let spy;
+        let els;
+        let $from;
+        let $to;
 
         beforeEach(function () {
           spy = sinon.spy($.fn, 'scrollLeft');

src/ui/public/directives/__tests__/inequality.js

@@ -4,9 +4,9 @@ var ngMock = require('ngMock');
 require('ui/directives/inequality');
 
 describe('greater_than model validator directive', function () {
-  var $compile;
-  var $rootScope;
-  var html;
+  let $compile;
+  let $rootScope;
+  let html;
 
   beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +17,7 @@ describe('greater_than model validator directive', function () {
 
   // no value is the same as 0
   describe('without value', function () {
-    var element;
+    let element;
     beforeEach(function () {
       html = '<input type="text" ng-model="value" greater-than />';
       element = $compile(html)($rootScope);
@@ -44,7 +44,7 @@ describe('greater_than model validator directive', function () {
 
   [0, 1, 10, 42, -12].forEach(function (num) {
     describe('with value ' + num, function () {
-      var element;
+      let element;
       beforeEach(function () {
         html = '<input type="text" ng-model="value" greater-than="' + num + '" />';
         element = $compile(html)($rootScope);

src/ui/public/directives/__tests__/input_focus.js

@@ -5,13 +5,13 @@ var ngMock = require('ngMock');
 require('ui/directives/input_focus');
 
 describe('Input focus directive', function () {
-  var $compile;
-  var $rootScope;
-  var $timeout;
-  var element;
-  var $el;
-  var selectedEl;
-  var selectedText;
+  let $compile;
+  let $rootScope;
+  let $timeout;
+  let element;
+  let $el;
+  let selectedEl;
+  let selectedText;
   var inputValue = 'Input Text Value';
 
   beforeEach(ngMock.module('kibana'));

src/ui/public/directives/__tests__/input_whole_number.js

@@ -4,8 +4,8 @@ var ngMock = require('ngMock');
 require('ui/directives/input_whole_number');
 
 describe('Whole number input directive', function () {
-  var $compile;
-  var $rootScope;
+  let $compile;
+  let $rootScope;
   var html = '<input type="text" ng-model="value" input-whole-number />';
 
   beforeEach(ngMock.module('kibana'));

src/ui/public/directives/__tests__/json_input.js

@@ -5,10 +5,10 @@ var ngMock = require('ngMock');
 require('ui/directives/json_input');
 
 describe('JSON input validation', function () {
-  var $compile;
-  var $rootScope;
+  let $compile;
+  let $rootScope;
   var html = '<input ng-model="value" json-input require-keys=true />';
-  var element;
+  let element;
 
   beforeEach(ngMock.module('kibana'));
 

src/ui/public/directives/__tests__/parse_query.js

@@ -6,18 +6,18 @@ var ngMock = require('ngMock');
 // Load the kibana app dependencies.
 require('ui/parse_query');
 
-var $rootScope;
-var $timeout;
-var $compile;
-var Promise;
-var Private;
-var config;
-var $elemScope;
-var $elem;
+let $rootScope;
+let $timeout;
+let $compile;
+let Promise;
+let Private;
+let config;
+let $elemScope;
+let $elem;
 
 var cycleIndex = 0;
 var markup = '<input ng-model="mockModel" parse-query input-focus type="text">';
-var fromUser;
+let fromUser;
 var toUser = require('ui/parse_query/lib/to_user');
 
 var init = function () {
@@ -101,7 +101,7 @@ describe('parse-query directive', function () {
 
   describe('model presentation formatter', function () {
     it('should present undefined as empty string', function () {
-      var notDefined;
+      let notDefined;
       expect(toUser(notDefined)).to.be('');
     });
 

src/ui/public/directives/__tests__/spinner.js

@@ -5,11 +5,11 @@ var ngMock = require('ngMock');
 
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 
 var init = function () {
   // Load the application

src/ui/public/directives/__tests__/timepicker.js

@@ -12,13 +12,13 @@ require('plugins/kibana/dashboard/index');
 // TODO: This should not be needed, timefilter is only included here, it should move
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 var anchor = '2014-01-01T06:06:06.666Z';
-var clock;
+let clock;
 
 var init = function () {
   // Load the application
@@ -85,7 +85,7 @@ describe('timepicker directive', function () {
   });
 
   describe('refresh interval', function () {
-    var $courier;
+    let $courier;
     beforeEach(function () {
       init();
       ngMock.inject(function (courier, $rootScope) {
@@ -232,7 +232,7 @@ describe('timepicker directive', function () {
     });
 
     it('disables the submit button if the form is invalid', function (done) {
-      var button;
+      let button;
       button = $elem.find('button[disabled]');
       expect(button.length).to.be(0);
 
@@ -359,7 +359,7 @@ describe('timepicker directive', function () {
 
   describe('absolute mode', function () {
 
-    var inputs;
+    let inputs;
 
     beforeEach(function () {
       init();

src/ui/public/directives/__tests__/truncate.js

@@ -5,11 +5,11 @@ var ngMock = require('ngMock');
 
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 
 var init = function (text) {
   // Load the application

src/ui/public/directives/__tests__/typeahead.js

@@ -9,12 +9,12 @@ require('plugins/kibana/discover/index');
 
 var typeaheadHistoryCount = 10;
 var typeaheadName = 'unittest';
-var $parentScope;
-var $typeaheadScope;
-var $elem;
-var $typeaheadInputScope;
-var typeaheadCtrl;
-var PersistedLog;
+let $parentScope;
+let $typeaheadScope;
+let $elem;
+let $typeaheadInputScope;
+let typeaheadCtrl;
+let PersistedLog;
 
 var markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
   '<input type="text" placeholder="Filter..." class="form-control" ng-model="query" kbn-typeahead-input>' +

src/ui/public/directives/__tests__/validate_cidr_mask.js

@@ -5,8 +5,8 @@ var ngMock = require('ngMock');
 require('ui/directives/validate_cidr_mask');
 
 describe('Validate CIDR mask directive', function () {
-  var $compile;
-  var $rootScope;
+  let $compile;
+  let $rootScope;
   var html = '<input type="text" ng-model="value" validate-cidr-mask />';
 
   beforeEach(ngMock.module('kibana'));

src/ui/public/directives/__tests__/validate_date_math.js

@@ -5,8 +5,8 @@ var ngMock = require('ngMock');
 require('ui/directives/validate_date_math');
 
 describe('Validate date math directive', function () {
-  var $compile;
-  var $rootScope;
+  let $compile;
+  let $rootScope;
   var html = '<input type="text" ng-model="value" validate-date-math />';
 
   beforeEach(ngMock.module('kibana'));