github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
[backport] PR #6865 to 4.5
This commit is contained in:
Court Ewing 2016-04-13 16:20:56 -04:00
commit 86ec090a2c
226 changed files with 2868 additions and 2868 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ui/__tests__/ui_exports.js
View file

@ -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']);

26
src/ui/public/Binder/__tests__/Binder.js
View file

@ -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();

40
src/ui/public/IndexedArray/__tests__/IndexedArray.js
View file

@ -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);

16
src/ui/public/IndexedArray/__tests__/inflector.js
View file

@ -1,15 +1,15 @@
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');
@ -17,7 +17,7 @@ describe('IndexedArray Inflector', function () {
});
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');
@ -25,19 +25,19 @@ describe('IndexedArray Inflector', function () {
});
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');
});
});

96
src/ui/public/Vis/__tests__/_AggConfig.js
View file

@ -1,7 +1,7 @@
describe('AggConfig', function () {
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let Vis;
let AggType;
@ -20,7 +20,7 @@ describe('AggConfig', function () {
describe('#toDsl', function () {
it('calls #write()', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -30,15 +30,15 @@ describe('AggConfig', function () {
]
});
var aggConfig = vis.aggs.byTypeName.date_histogram[0];
var stub = sinon.stub(aggConfig, 'write').returns({ params: {} });
let aggConfig = vis.aggs.byTypeName.date_histogram[0];
let stub = sinon.stub(aggConfig, 'write').returns({ params: {} });
aggConfig.toDsl();
expect(stub.callCount).to.be(1);
});
it('uses the type name as the agg name', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -48,15 +48,15 @@ describe('AggConfig', function () {
]
});
var aggConfig = vis.aggs.byTypeName.date_histogram[0];
let aggConfig = vis.aggs.byTypeName.date_histogram[0];
sinon.stub(aggConfig, 'write').returns({ params: {} });
var dsl = aggConfig.toDsl();
let dsl = aggConfig.toDsl();
expect(dsl).to.have.property('date_histogram');
});
it('uses the params from #write() output as the agg params', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -66,17 +66,17 @@ describe('AggConfig', function () {
]
});
var aggConfig = vis.aggs.byTypeName.date_histogram[0];
var football = {};
let aggConfig = vis.aggs.byTypeName.date_histogram[0];
let football = {};
sinon.stub(aggConfig, 'write').returns({ params: football });
var dsl = aggConfig.toDsl();
let dsl = aggConfig.toDsl();
expect(dsl.date_histogram).to.be(football);
});
it('includes subAggs from #write() output', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -90,14 +90,14 @@ describe('AggConfig', function () {
]
});
var histoConfig = vis.aggs.byTypeName.date_histogram[0];
var avgConfig = vis.aggs.byTypeName.avg[0];
var football = {};
let histoConfig = vis.aggs.byTypeName.date_histogram[0];
let avgConfig = vis.aggs.byTypeName.avg[0];
let football = {};
sinon.stub(histoConfig, 'write').returns({ params: {}, subAggs: [avgConfig] });
sinon.stub(avgConfig, 'write').returns({ params: football });
var dsl = histoConfig.toDsl();
let dsl = histoConfig.toDsl();
// didn't use .eql() because of variable key names, and final check is strict
expect(dsl).to.have.property('aggs');
@ -109,7 +109,7 @@ describe('AggConfig', function () {
describe('::ensureIds', function () {
it('accepts an array of objects and assigns ids to them', function () {
var objs = [
let objs = [
{},
{},
{},
@ -123,7 +123,7 @@ describe('AggConfig', function () {
});
it('assigns ids relative to the other items in the list', function () {
var objs = [
let objs = [
{ id: '100' },
{},
];
@ -133,7 +133,7 @@ describe('AggConfig', function () {
});
it('assigns ids relative to the other items in the list', function () {
var objs = [
let objs = [
{ id: '100' },
{ id: '200' },
{ id: '500' },
@ -150,14 +150,14 @@ describe('AggConfig', function () {
it('uses ::nextId to get the starting value', function () {
sinon.stub(AggConfig, 'nextId').returns(534);
var objs = AggConfig.ensureIds([{}]);
let objs = AggConfig.ensureIds([{}]);
expect(objs[0]).to.have.property('id', '534');
});
it('only calls ::nextId once', function () {
var start = 420;
let start = 420;
sinon.stub(AggConfig, 'nextId').returns(start);
var objs = AggConfig.ensureIds([{}, {}, {}, {}, {}, {}, {}]);
let objs = AggConfig.ensureIds([{}, {}, {}, {}, {}, {}, {}]);
expect(AggConfig.nextId).to.have.property('callCount', 1);
objs.forEach(function (obj, i) {
@ -168,12 +168,12 @@ describe('AggConfig', function () {
describe('::nextId', function () {
it('accepts a list of objects and picks the next id', function () {
var next = AggConfig.nextId([ {id: 100}, {id: 500} ]);
let next = AggConfig.nextId([ {id: 100}, {id: 500} ]);
expect(next).to.be(501);
});
it('handles an empty list', function () {
var next = AggConfig.nextId([]);
let next = AggConfig.nextId([]);
expect(next).to.be(1);
});
@ -186,7 +186,7 @@ describe('AggConfig', function () {
describe('#toJSON', function () {
it('includes the aggs id, params, type and schema', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -196,13 +196,13 @@ describe('AggConfig', function () {
]
});
var aggConfig = vis.aggs.byTypeName.date_histogram[0];
let aggConfig = vis.aggs.byTypeName.date_histogram[0];
expect(aggConfig.id).to.be('1');
expect(aggConfig.params).to.be.an('object');
expect(aggConfig.type).to.be.an(AggType).and.have.property('name', 'date_histogram');
expect(aggConfig.schema).to.be.an('object').and.have.property('name', 'segment');
var state = aggConfig.toJSON();
let state = aggConfig.toJSON();
expect(state).to.have.property('id', '1');
expect(state.params).to.be.an('object');
expect(state).to.have.property('type', 'date_histogram');
@ -212,37 +212,37 @@ describe('AggConfig', function () {
describe('#makeLabel', function () {
it('uses the custom label if it is defined', function () {
var vis = new Vis(indexPattern, {});
var aggConfig = vis.aggs[0];
let vis = new Vis(indexPattern, {});
let aggConfig = vis.aggs[0];
aggConfig.params.customLabel = 'Custom label';
var label = aggConfig.makeLabel();
let label = aggConfig.makeLabel();
expect(label).to.be(aggConfig.params.customLabel);
});
it('default label should be "Count"', function () {
var vis = new Vis(indexPattern, {});
var aggConfig = vis.aggs[0];
var label = aggConfig.makeLabel();
let vis = new Vis(indexPattern, {});
let aggConfig = vis.aggs[0];
let label = aggConfig.makeLabel();
expect(label).to.be('Count');
});
it('default label should be "Percentage of Count" when Vis is in percentage mode', function () {
var vis = new Vis(indexPattern, {});
var aggConfig = vis.aggs[0];
let vis = new Vis(indexPattern, {});
let aggConfig = vis.aggs[0];
aggConfig.vis.params.mode = 'percentage';
var label = aggConfig.makeLabel();
let label = aggConfig.makeLabel();
expect(label).to.be('Percentage of Count');
});
it('empty label if the Vis type is not defined', function () {
var vis = new Vis(indexPattern, {});
var aggConfig = vis.aggs[0];
let vis = new Vis(indexPattern, {});
let aggConfig = vis.aggs[0];
aggConfig.type = undefined;
var label = aggConfig.makeLabel();
let label = aggConfig.makeLabel();
expect(label).to.be('');
});
});
describe('#fieldFormatter', function () {
it('returns the fields format unless the agg type has a custom getFormat handler', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -268,7 +268,7 @@ describe('AggConfig', function () {
});
it('returns the string format if the field does not have a format', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -279,13 +279,13 @@ describe('AggConfig', function () {
]
});
var agg = vis.aggs[0];
let agg = vis.aggs[0];
agg.params.field = { type: 'date', format: null };
expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
});
it('returns the string format if their is no field', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -296,13 +296,13 @@ describe('AggConfig', function () {
]
});
var agg = vis.aggs[0];
let agg = vis.aggs[0];
delete agg.params.field;
expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
});
it('returns the html converter if "html" is passed in', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -313,7 +313,7 @@ describe('AggConfig', function () {
]
});
var field = indexPattern.fields.byName.ssl;
let field = indexPattern.fields.byName.ssl;
expect(vis.aggs[0].fieldFormatter('html')).to.be(field.format.getConverterFor('html'));
});
});

48
src/ui/public/Vis/__tests__/_AggConfigResult.js
View file

@ -1,8 +1,8 @@
describe('AggConfigResult', function () {
var _ = require('lodash');
var AggConfigResult = require('ui/Vis/AggConfigResult');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let AggConfigResult = require('ui/Vis/AggConfigResult');
let expect = require('expect.js');
let ngMock = require('ngMock');
let AggConfig;
let indexPattern;
@ -17,12 +17,12 @@ describe('AggConfigResult', function () {
describe('initialization', function () {
it('should set the type to bucket for bucket based results', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
});
var aggConfig = vis.aggs.byTypeName.terms[0];
var results = new AggConfigResult(aggConfig, null, 10, 'apache');
let aggConfig = vis.aggs.byTypeName.terms[0];
let results = new AggConfigResult(aggConfig, null, 10, 'apache');
expect(results).to.have.property('aggConfig', aggConfig);
expect(results).to.have.property('$parent', null);
expect(results).to.have.property('type', 'bucket');
@ -31,12 +31,12 @@ describe('AggConfigResult', function () {
});
it('should set the type to metric for metric based results', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [ { type: 'avg', schema: 'metric', params: { field: 'bytes' } } ]
});
var aggConfig = vis.aggs.byTypeName.avg[0];
var results = new AggConfigResult(aggConfig, null, 1024);
let aggConfig = vis.aggs.byTypeName.avg[0];
let results = new AggConfigResult(aggConfig, null, 1024);
expect(results).to.have.property('aggConfig', aggConfig);
expect(results).to.have.property('$parent', null);
expect(results).to.have.property('type', 'metric');
@ -50,18 +50,18 @@ describe('AggConfigResult', function () {
describe('getPath()', function () {
it('should return the parent and itself (in an array) for the path', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'segment', params: { field: '_type' } },
{ type: 'terms', schema: 'segment', params: { field: 'extension' } }
]
});
var parentAggConfig = vis.aggs.byTypeName.terms[0];
var aggConfig = vis.aggs.byTypeName.terms[1];
var parentResult = new AggConfigResult(parentAggConfig, null, 20, 'apache');
var result = new AggConfigResult(aggConfig, parentResult, 15, 'php');
var path = result.getPath();
let parentAggConfig = vis.aggs.byTypeName.terms[0];
let aggConfig = vis.aggs.byTypeName.terms[1];
let parentResult = new AggConfigResult(parentAggConfig, null, 20, 'apache');
let result = new AggConfigResult(aggConfig, parentResult, 15, 'php');
let path = result.getPath();
expect(path).to.be.an(Array);
expect(path).to.have.length(2);
expect(path[0]).to.be(parentResult);
@ -69,15 +69,15 @@ describe('AggConfigResult', function () {
});
it('should return itself (in an array) for the path', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'segment', params: { field: 'extension' } }
]
});
var aggConfig = vis.aggs.byTypeName.terms[0];
var result = new AggConfigResult(aggConfig, null, 15, 'php');
var path = result.getPath();
let aggConfig = vis.aggs.byTypeName.terms[0];
let result = new AggConfigResult(aggConfig, null, 15, 'php');
let path = result.getPath();
expect(path).to.be.an(Array);
expect(path).to.have.length(1);
expect(path[0]).to.be(result);
@ -87,15 +87,15 @@ describe('AggConfigResult', function () {
describe('createFilter', function () {
it('should return a filter object that represents the result', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'segment', params: { field: 'extension' } }
]
});
var aggConfig = vis.aggs.byTypeName.terms[0];
var result = new AggConfigResult(aggConfig, null, 15, 'php');
var filter = result.createFilter();
let aggConfig = vis.aggs.byTypeName.terms[0];
let result = new AggConfigResult(aggConfig, null, 15, 'php');
let filter = result.createFilter();
expect(filter).to.have.property('query');
expect(filter.query).to.have.property('match');
expect(filter.query.match).to.have.property('extension');

90
src/ui/public/Vis/__tests__/_AggConfigs.js
View file

@ -1,8 +1,8 @@
describe('AggConfigs', function () {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let Vis;
let IndexedArray;
@ -15,9 +15,9 @@ describe('AggConfigs', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
// replace the AggConfig module with a spy
var RealAggConfigPM = require('ui/Vis/AggConfig');
let RealAggConfigPM = require('ui/Vis/AggConfig');
AggConfig = Private(RealAggConfigPM);
var spy = sinon.spy(AggConfig);
let spy = sinon.spy(AggConfig);
Object.defineProperty(spy, 'aggTypes', {
get: function () { return AggConfig.aggTypes; },
set: function (val) { AggConfig.aggTypes = val; }
@ -35,28 +35,28 @@ describe('AggConfigs', function () {
}));
it('extends IndexedArray', function () {
var ac = new AggConfigs();
let ac = new AggConfigs();
expect(ac).to.be.a(IndexedArray);
});
describe('constructor', function () {
it('handles passing just a vis', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: []
});
var ac = new AggConfigs(vis);
let ac = new AggConfigs(vis);
expect(ac).to.have.length(1);
});
it('converts configStates into AggConfig objects if they are not already', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: []
});
var ac = new AggConfigs(vis, [
let ac = new AggConfigs(vis, [
{
type: 'date_histogram',
schema: 'segment'
@ -72,12 +72,12 @@ describe('AggConfigs', function () {
});
it('attemps to ensure that all states have an id', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: []
});
var states = [
let states = [
{
type: 'date_histogram',
schema: 'segment'
@ -88,8 +88,8 @@ describe('AggConfigs', function () {
}
];
var spy = sinon.spy(SpiedAggConfig, 'ensureIds');
var ac = new AggConfigs(vis, states);
let spy = sinon.spy(SpiedAggConfig, 'ensureIds');
let ac = new AggConfigs(vis, states);
expect(spy.callCount).to.be(1);
expect(spy.firstCall.args[0]).to.be(states);
});
@ -130,17 +130,17 @@ describe('AggConfigs', function () {
});
it('should only set the number of defaults defined by the max', function () {
var ac = new AggConfigs(vis);
let ac = new AggConfigs(vis);
expect(ac.bySchemaName.metric).to.have.length(2);
});
it('should set the defaults defined in the schema when none exist', function () {
var ac = new AggConfigs(vis);
let ac = new AggConfigs(vis);
expect(ac).to.have.length(3);
});
it('should NOT set the defaults defined in the schema when some exist', function () {
var ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
let ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
expect(ac).to.have.length(3);
expect(ac.bySchemaName.segment[0].type.name).to.equal('date_histogram');
});
@ -149,7 +149,7 @@ describe('AggConfigs', function () {
describe('#getRequestAggs', function () {
it('performs a stable sort, but moves metrics to the bottom', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'avg', schema: 'metric' },
@ -162,8 +162,8 @@ describe('AggConfigs', function () {
]
});
var sorted = vis.aggs.getRequestAggs();
var aggs = _.indexBy(vis.aggs, function (agg) {
let sorted = vis.aggs.getRequestAggs();
let aggs = _.indexBy(vis.aggs, function (agg) {
return agg.type.name;
});
@ -180,7 +180,7 @@ describe('AggConfigs', function () {
describe('#getResponseAggs', function () {
it('returns all request aggs for basic aggs', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'split' },
@ -189,8 +189,8 @@ describe('AggConfigs', function () {
]
});
var sorted = vis.aggs.getResponseAggs();
var aggs = _.indexBy(vis.aggs, function (agg) {
let sorted = vis.aggs.getResponseAggs();
let aggs = _.indexBy(vis.aggs, function (agg) {
return agg.type.name;
});
@ -201,7 +201,7 @@ describe('AggConfigs', function () {
});
it('expands aggs that have multiple responses', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'split' },
@ -210,8 +210,8 @@ describe('AggConfigs', function () {
]
});
var sorted = vis.aggs.getResponseAggs();
var aggs = _.indexBy(vis.aggs, function (agg) {
let sorted = vis.aggs.getResponseAggs();
let aggs = _.indexBy(vis.aggs, function (agg) {
return agg.type.name;
});
@ -226,14 +226,14 @@ describe('AggConfigs', function () {
describe('#toDsl', function () {
it('uses the sorted aggs', function () {
var vis = new Vis(indexPattern, { type: 'histogram' });
let vis = new Vis(indexPattern, { type: 'histogram' });
sinon.spy(vis.aggs, 'getRequestAggs');
vis.aggs.toDsl();
expect(vis.aggs.getRequestAggs).to.have.property('callCount', 1);
});
it('calls aggConfig#toDsl() on each aggConfig and compiles the nested output', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'date_histogram', schema: 'segment' },
@ -241,8 +241,8 @@ describe('AggConfigs', function () {
]
});
var aggInfos = vis.aggs.map(function (aggConfig) {
var football = {};
let aggInfos = vis.aggs.map(function (aggConfig) {
let football = {};
sinon.stub(aggConfig, 'toDsl', function () {
return football;
@ -255,7 +255,7 @@ describe('AggConfigs', function () {
});
(function recurse(lvl) {
var info = aggInfos.shift();
let info = aggInfos.shift();
expect(lvl).to.have.property(info.id);
expect(lvl[info.id]).to.be(info.football);
@ -269,7 +269,7 @@ describe('AggConfigs', function () {
});
it('skips aggs that don\'t have a dsl representation', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@ -277,9 +277,9 @@ describe('AggConfigs', function () {
]
});
var dsl = vis.aggs.toDsl();
var histo = vis.aggs.byTypeName.date_histogram[0];
var count = vis.aggs.byTypeName.count[0];
let dsl = vis.aggs.toDsl();
let histo = vis.aggs.byTypeName.date_histogram[0];
let count = vis.aggs.byTypeName.count[0];
expect(dsl).to.have.property(histo.id);
expect(dsl[histo.id]).to.be.an('object');
@ -288,7 +288,7 @@ describe('AggConfigs', function () {
});
it('writes multiple metric aggregations at the same level', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@ -299,10 +299,10 @@ describe('AggConfigs', function () {
]
});
var dsl = vis.aggs.toDsl();
let dsl = vis.aggs.toDsl();
var histo = vis.aggs.byTypeName.date_histogram[0];
var metrics = vis.aggs.bySchemaGroup.metrics;
let histo = vis.aggs.byTypeName.date_histogram[0];
let metrics = vis.aggs.bySchemaGroup.metrics;
expect(dsl).to.have.property(histo.id);
expect(dsl[histo.id]).to.be.an('object');
@ -315,7 +315,7 @@ describe('AggConfigs', function () {
});
it('writes multiple metric aggregations at every level if the vis is hierarchical', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'segment', params: { field: 'ip', orderBy: 1 } },
@ -328,12 +328,12 @@ describe('AggConfigs', function () {
});
vis.isHierarchical = _.constant(true);
var topLevelDsl = vis.aggs.toDsl();
var buckets = vis.aggs.bySchemaGroup.buckets;
var metrics = vis.aggs.bySchemaGroup.metrics;
let topLevelDsl = vis.aggs.toDsl();
let buckets = vis.aggs.bySchemaGroup.buckets;
let metrics = vis.aggs.bySchemaGroup.metrics;
(function checkLevel(dsl) {
var bucket = buckets.shift();
let bucket = buckets.shift();
expect(dsl).to.have.property(bucket.id);
expect(dsl[bucket.id]).to.be.an('object');

4
src/ui/public/Vis/__tests__/_Renderbot.js
View file

@ -1,7 +1,7 @@
describe('renderbot', function () {
let Renderbot;
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
function init() {
ngMock.module('kibana');

18
src/ui/public/Vis/__tests__/_Vis.js
View file

@ -1,15 +1,15 @@
describe('Vis Class', function () {
var _ = require('lodash');
var ngMock = require('ngMock');
var expect = require('expect.js');
let _ = require('lodash');
let ngMock = require('ngMock');
let expect = require('expect.js');
let indexPattern;
let Vis;
let visTypes;
let vis;
var stateFixture = {
let stateFixture = {
type: 'pie',
aggs: [
{ type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@ -31,7 +31,7 @@ describe('Vis Class', function () {
vis = new Vis(indexPattern, stateFixture);
});
var verifyVis = function (vis) {
let verifyVis = function (vis) {
expect(vis).to.have.property('aggs');
expect(vis.aggs).to.have.length(3);
@ -55,7 +55,7 @@ describe('Vis Class', function () {
describe('getState()', function () {
it('should get a state that represents the... er... state', function () {
var state = vis.getState();
let state = vis.getState();
expect(state).to.have.property('type', 'pie');
expect(state).to.have.property('params');
@ -72,14 +72,14 @@ describe('Vis Class', function () {
describe('clone()', function () {
it('should make clone of itself', function () {
var clone = vis.clone();
let clone = vis.clone();
verifyVis(clone);
});
});
describe('setState()', function () {
it('should set the state to defualts', function () {
var vis = new Vis(indexPattern);
let vis = new Vis(indexPattern);
expect(vis).to.have.property('type');
expect(vis.type).to.eql(visTypes.byName.histogram);
expect(vis).to.have.property('aggs');
@ -99,7 +99,7 @@ describe('Vis Class', function () {
expect(vis.isHierarchical()).to.be(true);
});
it('should return false for non-hierarchical vis (like histogram)', function () {
var vis = new Vis(indexPattern);
let vis = new Vis(indexPattern);
expect(vis.isHierarchical()).to.be(false);
});
});

38
src/ui/public/agg_response/geo_json/__tests__/geo_json.js
View file

@ -1,7 +1,7 @@
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('GeoJson Agg Response Converter', function () {
let vis;
@ -12,8 +12,8 @@ describe('GeoJson Agg Response Converter', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
var Vis = Private(require('ui/Vis'));
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
let Vis = Private(require('ui/Vis'));
let indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
esResponse = Private(require('fixtures/agg_resp/geohash_grid'));
tabify = Private(require('ui/agg_response/tabify/tabify'));
@ -55,8 +55,8 @@ describe('GeoJson Agg Response Converter', function () {
describe('with table ' + JSON.stringify(tableOpts), function () {
it('outputs a chart', function () {
var table = makeTable();
var chart = makeSingleChart(table);
let table = makeTable();
let chart = makeSingleChart(table);
expect(chart).to.only.have.keys(
'title',
'tooltipFormatter',
@ -73,9 +73,9 @@ describe('GeoJson Agg Response Converter', function () {
});
it('outputs geohash points as features in a feature collection', function () {
var table = makeTable();
var chart = makeSingleChart(table);
var geoJson = chart.geoJson;
let table = makeTable();
let chart = makeSingleChart(table);
let geoJson = chart.geoJson;
expect(geoJson.type).to.be('FeatureCollection');
expect(geoJson.features).to.be.an('array');
@ -83,8 +83,8 @@ describe('GeoJson Agg Response Converter', function () {
});
it('exports a bunch of properties about the geo hash grid', function () {
var geoJson = makeGeoJson();
var props = geoJson.properties;
let geoJson = makeGeoJson();
let props = geoJson.properties;
// props
expect(props).to.be.an('object');
@ -117,7 +117,7 @@ describe('GeoJson Agg Response Converter', function () {
it('should be geoJson format', function () {
table.rows.forEach(function (row, i) {
var feature = chart.geoJson.features[i];
let feature = chart.geoJson.features[i];
expect(feature).to.have.property('geometry');
expect(feature.geometry).to.be.an('object');
expect(feature).to.have.property('properties');
@ -127,7 +127,7 @@ describe('GeoJson Agg Response Converter', function () {
it('should have valid geometry data', function () {
table.rows.forEach(function (row, i) {
var geometry = chart.geoJson.features[i].geometry;
let geometry = chart.geoJson.features[i].geometry;
expect(geometry.type).to.be('Point');
expect(geometry).to.have.property('coordinates');
expect(geometry.coordinates).to.be.an('array');
@ -139,8 +139,8 @@ describe('GeoJson Agg Response Converter', function () {
it('should have value properties data', function () {
table.rows.forEach(function (row, i) {
var props = chart.geoJson.features[i].properties;
var keys = ['value', 'geohash', 'aggConfigResult', 'rectangle', 'center'];
let props = chart.geoJson.features[i].properties;
let keys = ['value', 'geohash', 'aggConfigResult', 'rectangle', 'center'];
expect(props).to.be.an('object');
expect(props).to.only.have.keys(keys);
expect(props.geohash).to.be.a('string');
@ -150,15 +150,15 @@ describe('GeoJson Agg Response Converter', function () {
it('should use latLng in properties and lngLat in geometry', function () {
table.rows.forEach(function (row, i) {
var geometry = chart.geoJson.features[i].geometry;
var props = chart.geoJson.features[i].properties;
let geometry = chart.geoJson.features[i].geometry;
let props = chart.geoJson.features[i].properties;
expect(props.center).to.eql(geometry.coordinates.slice(0).reverse());
});
});
it('should handle both AggConfig and non-AggConfig results', function () {
table.rows.forEach(function (row, i) {
var props = chart.geoJson.features[i].properties;
let props = chart.geoJson.features[i].properties;
if (tableOpts.asAggConfigResults) {
expect(props.aggConfigResult).to.be(row[metricColI]);
expect(props.value).to.be(row[metricColI].value);

4
src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js
View file

@ -1,6 +1,6 @@
var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
var expect = require('expect.js');
let arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
let expect = require('expect.js');
describe('buildHierarchicalData()', function () {
describe('arrayToLinkedList', function () {

38
src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
View file

@ -1,9 +1,9 @@
var _ = require('lodash');
var fixtures = require('fixtures/fake_hierarchical_data');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let fixtures = require('fixtures/fake_hierarchical_data');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let Vis;
let Notifier;
@ -31,7 +31,7 @@ describe('buildHierarchicalData', function () {
let results;
beforeEach(function () {
var id = 1;
let id = 1;
vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
@ -44,7 +44,7 @@ describe('buildHierarchicalData', function () {
});
it('should set the slices with one child to a consistent label', function () {
var checkLabel = 'Count';
let checkLabel = 'Count';
expect(results).to.have.property('slices');
expect(results.slices).to.have.property('children');
expect(results.slices.children).to.have.length(1);
@ -63,8 +63,8 @@ describe('buildHierarchicalData', function () {
describe('rows and columns', function () {
it('should set the rows', function () {
var id = 1;
var vis = new Vis(indexPattern, {
let id = 1;
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@ -75,13 +75,13 @@ describe('buildHierarchicalData', function () {
});
// We need to set the aggs to a known value.
_.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
var results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
let results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
expect(results).to.have.property('rows');
});
it('should set the columns', function () {
var id = 1;
var vis = new Vis(indexPattern, {
let id = 1;
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@ -92,7 +92,7 @@ describe('buildHierarchicalData', function () {
});
// We need to set the aggs to a known value.
_.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
var results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
let results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
expect(results).to.have.property('columns');
});
@ -103,7 +103,7 @@ describe('buildHierarchicalData', function () {
let results;
beforeEach(function () {
var id = 1;
let id = 1;
vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
@ -145,7 +145,7 @@ describe('buildHierarchicalData', function () {
let results;
beforeEach(function () {
var id = 1;
let id = 1;
vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
@ -177,7 +177,7 @@ describe('buildHierarchicalData', function () {
let results;
beforeEach(function () {
var id = 1;
let id = 1;
vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
@ -218,7 +218,7 @@ describe('buildHierarchicalData', function () {
let results;
beforeEach(function () {
var id = 1;
let id = 1;
vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
@ -254,7 +254,7 @@ describe('buildHierarchicalData', function () {
let results;
beforeEach(function () {
var id = 1;
let id = 1;
vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
@ -277,7 +277,7 @@ describe('buildHierarchicalData', function () {
});
it('should set the hits attribute for the results', function () {
var errCall = Notifier.prototype.error.getCall(0);
let errCall = Notifier.prototype.error.getCall(0);
expect(errCall).to.be.ok();
expect(errCall.args[0]).to.contain('not supported');

8
src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
View file

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

18
src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
View file

@ -1,10 +1,10 @@
var _ = require('lodash');
var fixtures = require('fixtures/fake_hierarchical_data');
var createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let fixtures = require('fixtures/fake_hierarchical_data');
let createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
let arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
let expect = require('expect.js');
let ngMock = require('ngMock');
let AggConfigs;
let Vis;
@ -24,7 +24,7 @@ describe('buildHierarchicalData()', function () {
}));
beforeEach(function () {
var id = 1;
let id = 1;
vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
@ -34,7 +34,7 @@ describe('buildHierarchicalData()', function () {
{ type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
]
});
var buckets = arrayToLinkedList(vis.aggs.bySchemaGroup.buckets);
let buckets = arrayToLinkedList(vis.aggs.bySchemaGroup.buckets);
// We need to set the aggs to a known value.
_.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
results = createRawData(vis, fixtures.threeTermBuckets);
@ -45,7 +45,7 @@ describe('buildHierarchicalData()', function () {
expect(results.columns).to.have.length(6);
_.each(results.columns, function (column) {
expect(column).to.have.property('aggConfig');
var agg = column.aggConfig;
let agg = column.aggConfig;
expect(column).to.have.property('categoryName', agg.schema.name);
expect(column).to.have.property('id', agg.id);
expect(column).to.have.property('aggType', agg.type);

14
src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
View file

@ -1,20 +1,20 @@
var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
var expect = require('expect.js');
let extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
let expect = require('expect.js');
describe('buildHierarchicalData()', function () {
describe('extractBuckets()', function () {
it('should normalize a bucket object into an array', function () {
var bucket = {
let bucket = {
buckets: {
foo: { doc_count: 1 },
bar: { doc_count: 2 }
}
};
var buckets = extractBuckets(bucket);
let buckets = extractBuckets(bucket);
expect(buckets).to.be.an(Array);
expect(buckets).to.have.length(2);
expect(buckets[0]).to.have.property('key', 'foo');
@ -24,19 +24,19 @@ describe('buildHierarchicalData()', function () {
});
it('should return an empty array for undefined buckets', function () {
var buckets = extractBuckets();
let buckets = extractBuckets();
expect(buckets).to.be.an(Array);
expect(buckets).to.have.length(0);
});
it('should return the bucket array', function () {
var bucket = {
let bucket = {
buckets: [
{ key: 'foo', doc_count: 1 },
{ key: 'bar', doc_count: 2 }
]
};
var buckets = extractBuckets(bucket);
let buckets = extractBuckets(bucket);
expect(buckets).to.be.an(Array);
expect(buckets).to.be(bucket.buckets);
});

14
src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
View file

@ -1,9 +1,9 @@
describe('buildHierarchicalData()', function () {
describe('transformAggregation()', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let transform;
let fixture;
@ -41,17 +41,17 @@ describe('buildHierarchicalData()', function () {
});
it('relies on metricAgg#getValue() for the size of the children', function () {
var aggData = {
let aggData = {
buckets: [
{ key: 'foo' },
{ key: 'bar' }
]
};
var football = {};
let football = {};
fixture.metric.getValue = _.constant(football);
var children = transform(fixture.agg, fixture.metric, aggData);
let children = transform(fixture.agg, fixture.metric, aggData);
expect(children).to.be.an(Array);
expect(children).to.have.length(2);
expect(children[0]).to.have.property('size', football);
@ -59,7 +59,7 @@ describe('buildHierarchicalData()', function () {
});
it('should create two levels of metrics', function () {
var children = transform(fixture.agg, fixture.metric, fixture.aggData);
let children = transform(fixture.agg, fixture.metric, fixture.aggData);
fixture.metric.getValue = function (b) { return b.doc_count; };
expect(children).to.be.an(Array);

26
src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
View file

@ -1,6 +1,6 @@
describe('addToSiri', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
let addToSiri;
beforeEach(ngMock.module('kibana'));
@ -9,9 +9,9 @@ describe('addToSiri', function () {
}));
it('creates a new series the first time it sees an id', function () {
var series = new Map();
var point = {};
var id = 'id';
let series = new Map();
let point = {};
let id = 'id';
addToSiri(series, point, id);
expect(series.has(id)).to.be(true);
@ -22,13 +22,13 @@ describe('addToSiri', function () {
});
it('adds points to existing series if id has been seen', function () {
var series = new Map();
var id = 'id';
let series = new Map();
let id = 'id';
var point = {};
let point = {};
addToSiri(series, point, id);
var point2 = {};
let point2 = {};
addToSiri(series, point2, id);
expect(series.has(id)).to.be(true);
@ -40,10 +40,10 @@ describe('addToSiri', function () {
});
it('allows overriding the series label', function () {
var series = new Map();
var id = 'id';
var label = 'label';
var point = {};
let series = new Map();
let id = 'id';
let label = 'label';
let point = {};
addToSiri(series, point, id, label);
expect(series.has(id)).to.be(true);

8
src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
View file

@ -5,8 +5,8 @@ describe('makeFakeXAspect', function () {
let AggType;
let AggConfig;
let indexPattern;
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
@ -18,8 +18,8 @@ describe('makeFakeXAspect', function () {
}));
it('creates an object that looks like an aspect', function () {
var vis = new Vis(indexPattern, { type: 'histogram' });
var aspect = makeFakeXAspect(vis);
let vis = new Vis(indexPattern, { type: 'histogram' });
let aspect = makeFakeXAspect(vis);
expect(aspect)
.to.have.property('i', -1)

20
src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
View file

@ -1,8 +1,8 @@
describe('getAspects', function () {
var _ = require('lodash');
var moment = require('moment');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let moment = require('moment');
let expect = require('expect.js');
let ngMock = require('ngMock');
let Vis;
let Table;
@ -22,7 +22,7 @@ describe('getAspects', function () {
let vis;
let table;
var date = _.memoize(function (n) {
let date = _.memoize(function (n) {
return moment().startOf('day').add(n, 'hour').valueOf();
});
@ -45,7 +45,7 @@ describe('getAspects', function () {
function init(group, x, y) {
// map args to indicies that should be removed
var filter = filterByIndex([
let filter = filterByIndex([
x > 0,
x > 1,
group > 0,
@ -87,7 +87,7 @@ describe('getAspects', function () {
].map(filter)
};
var aggs = vis.aggs.splice(0, vis.aggs.length);
let aggs = vis.aggs.splice(0, vis.aggs.length);
filter(aggs).forEach(function (filter) {
vis.aggs.push(filter);
});
@ -96,7 +96,7 @@ describe('getAspects', function () {
it('produces an aspect object for each of the aspect types found in the columns', function () {
init(1, 1, 1);
var aspects = getAspects(vis, table);
let aspects = getAspects(vis, table);
validate(aspects.x, 0);
validate(aspects.series, 1);
validate(aspects.y, 2);
@ -105,7 +105,7 @@ describe('getAspects', function () {
it('uses arrays only when there are more than one aspect of a specific type', function () {
init(0, 1, 2);
var aspects = getAspects(vis, table);
let aspects = getAspects(vis, table);
validate(aspects.x, 0);
expect(aspects.series == null).to.be(true);
@ -134,7 +134,7 @@ describe('getAspects', function () {
it('creates a fake x aspect if the column does not exist', function () {
init(0, 0, 1);
var aspects = getAspects(vis, table);
let aspects = getAspects(vis, table);
expect(aspects.x)
.to.be.an('object')

32
src/ui/public/agg_response/point_series/__tests__/_get_point.js
View file

@ -1,13 +1,13 @@
describe('getPoint', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let getPoint;
var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
var identFormatted = { fieldFormatter: _.constant(_.identity) };
let truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
let identFormatted = { fieldFormatter: _.constant(_.identity) };
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
@ -28,9 +28,9 @@ describe('getPoint', function () {
});
it('properly unwraps and scales values', function () {
var row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
var zAspect = { i: 2 };
var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect, zAspect);
let row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
let zAspect = { i: 2 };
let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect, zAspect);
expect(point)
.to.have.property('x', 1)
@ -41,8 +41,8 @@ describe('getPoint', function () {
});
it('ignores points with a y value of NaN', function () {
var row = [ { value: 1 }, { value: 'NaN' }];
var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
let row = [ { value: 1 }, { value: 'NaN' }];
let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
expect(point).to.be(void 0);
});
});
@ -61,8 +61,8 @@ describe('getPoint', function () {
});
it('properly unwraps and scales values', function () {
var seriesAspect = { i: 1, agg: identFormatted };
var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
let seriesAspect = { i: 1, agg: identFormatted };
let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
expect(point)
.to.have.property('x', 1)
@ -72,8 +72,8 @@ describe('getPoint', function () {
});
it('properly formats series values', function () {
var seriesAspect = { i: 1, agg: truthFormatted };
var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
let seriesAspect = { i: 1, agg: truthFormatted };
let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
expect(point)
.to.have.property('x', 1)
@ -83,8 +83,8 @@ describe('getPoint', function () {
});
it ('adds the aggConfig to the points', function () {
var seriesAspect = { i: 1, agg: truthFormatted};
var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
let seriesAspect = { i: 1, agg: truthFormatted};
let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
expect(point).to.have.property('aggConfig', truthFormatted);
});

42
src/ui/public/agg_response/point_series/__tests__/_get_series.js
View file

@ -1,10 +1,10 @@
describe('getSeries', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let getSeries;
var agg = { fieldFormatter: _.constant(_.identity) };
let agg = { fieldFormatter: _.constant(_.identity) };
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
@ -18,7 +18,7 @@ describe('getSeries', function () {
}
it('produces a single series with points for each row', function () {
var rows = [
let rows = [
[1, 2, 3],
[1, 2, 3],
[1, 2, 3],
@ -26,7 +26,7 @@ describe('getSeries', function () {
[1, 2, 3]
].map(wrapRows);
var chart = {
let chart = {
aspects: {
x: { i: 0 },
y: { i: 1 },
@ -34,13 +34,13 @@ describe('getSeries', function () {
}
};
var series = getSeries(rows, chart);
let series = getSeries(rows, chart);
expect(series)
.to.be.an('array')
.and.to.have.length(1);
var siri = series[0];
let siri = series[0];
expect(siri)
.to.be.an('object')
.and.have.property('label', '')
@ -59,7 +59,7 @@ describe('getSeries', function () {
});
it('produces multiple series if there are multiple y aspects', function () {
var rows = [
let rows = [
[1, 2, 3],
[1, 2, 3],
[1, 2, 3],
@ -67,7 +67,7 @@ describe('getSeries', function () {
[1, 2, 3]
].map(wrapRows);
var chart = {
let chart = {
aspects: {
x: { i: 0 },
y: [
@ -77,7 +77,7 @@ describe('getSeries', function () {
}
};
var series = getSeries(rows, chart);
let series = getSeries(rows, chart);
expect(series)
.to.be.an('array')
@ -102,7 +102,7 @@ describe('getSeries', function () {
});
it('produces multiple series if there is a series aspect', function () {
var rows = [
let rows = [
['0', 3],
['1', 3],
['1', 'NaN'],
@ -113,7 +113,7 @@ describe('getSeries', function () {
['1', 3]
].map(wrapRows);
var chart = {
let chart = {
aspects: {
x: { i: -1 },
series: { i: 0, agg: agg },
@ -121,7 +121,7 @@ describe('getSeries', function () {
}
};
var series = getSeries(rows, chart);
let series = getSeries(rows, chart);
expect(series)
.to.be.an('array')
@ -146,7 +146,7 @@ describe('getSeries', function () {
});
it('produces multiple series if there is a series aspect and multipl y aspects', function () {
var rows = [
let rows = [
['0', 3, 4],
['1', 3, 4],
['0', 3, 4],
@ -155,7 +155,7 @@ describe('getSeries', function () {
['1', 3, 4]
].map(wrapRows);
var chart = {
let chart = {
aspects: {
x: { i: -1 },
series: { i: 0, agg: agg },
@ -166,7 +166,7 @@ describe('getSeries', function () {
}
};
var series = getSeries(rows, chart);
let series = getSeries(rows, chart);
expect(series)
.to.be.an('array')
@ -196,7 +196,7 @@ describe('getSeries', function () {
});
it('produces a series list in the same order as its corresponding metric column', function () {
var rows = [
let rows = [
['0', 3, 4],
['1', 3, 4],
['0', 3, 4],
@ -205,7 +205,7 @@ describe('getSeries', function () {
['1', 3, 4]
].map(wrapRows);
var chart = {
let chart = {
aspects: {
x: { i: -1 },
series: { i: 0, agg: agg },
@ -216,7 +216,7 @@ describe('getSeries', function () {
}
};
var series = getSeries(rows, chart);
let series = getSeries(rows, chart);
expect(series[0]).to.have.property('label', '0: 0');
expect(series[1]).to.have.property('label', '0: 1');
expect(series[2]).to.have.property('label', '1: 0');
@ -229,7 +229,7 @@ describe('getSeries', function () {
y.i = i;
});
var series2 = getSeries(rows, chart);
let series2 = getSeries(rows, chart);
expect(series2[0]).to.have.property('label', '0: 1');
expect(series2[1]).to.have.property('label', '0: 0');
expect(series2[2]).to.have.property('label', '1: 1');

14
src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
View file

@ -1,7 +1,7 @@
describe('initXAxis', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let initXAxis;
@ -10,7 +10,7 @@ describe('initXAxis', function () {
initXAxis = Private(require('ui/agg_response/point_series/_init_x_axis'));
}));
var baseChart = {
let baseChart = {
aspects: {
x: {
agg: {
@ -26,7 +26,7 @@ describe('initXAxis', function () {
};
it('sets the xAxisFormatter if the agg is not ordered', function () {
var chart = _.cloneDeep(baseChart);
let chart = _.cloneDeep(baseChart);
initXAxis(chart);
expect(chart)
.to.have.property('xAxisLabel', 'label')
@ -34,7 +34,7 @@ describe('initXAxis', function () {
});
it('makes the chart ordered if the agg is ordered', function () {
var chart = _.cloneDeep(baseChart);
let chart = _.cloneDeep(baseChart);
chart.aspects.x.agg.type.ordered = true;
initXAxis(chart);
@ -49,7 +49,7 @@ describe('initXAxis', function () {
});
it('reads the interval param from the x agg', function () {
var chart = _.cloneDeep(baseChart);
let chart = _.cloneDeep(baseChart);
chart.aspects.x.agg.type.ordered = true;
chart.aspects.x.agg.write = _.constant({ params: { interval: 10 } });

18
src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
View file

@ -1,7 +1,7 @@
describe('initYAxis', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let initYAxis;
@ -18,7 +18,7 @@ describe('initYAxis', function () {
};
}
var baseChart = {
let baseChart = {
aspects: {
y: [
{ agg: agg(), col: { title: 'y1' } },
@ -32,17 +32,17 @@ describe('initYAxis', function () {
};
describe('with a single y aspect', function () {
var singleYBaseChart = _.cloneDeep(baseChart);
let singleYBaseChart = _.cloneDeep(baseChart);
singleYBaseChart.aspects.y = singleYBaseChart.aspects.y[0];
it('sets the yAxisFormatter the the field formats convert fn', function () {
var chart = _.cloneDeep(singleYBaseChart);
let chart = _.cloneDeep(singleYBaseChart);
initYAxis(chart);
expect(chart).to.have.property('yAxisFormatter', chart.aspects.y.agg.fieldFormatter());
});
it('sets the yAxisLabel', function () {
var chart = _.cloneDeep(singleYBaseChart);
let chart = _.cloneDeep(singleYBaseChart);
initYAxis(chart);
expect(chart).to.have.property('yAxisLabel', 'y1');
});
@ -50,7 +50,7 @@ describe('initYAxis', function () {
describe('with mutliple y aspects', function () {
it('sets the yAxisFormatter the the field formats convert fn for the first y aspect', function () {
var chart = _.cloneDeep(baseChart);
let chart = _.cloneDeep(baseChart);
initYAxis(chart);
expect(chart).to.have.property('yAxisFormatter');
@ -60,7 +60,7 @@ describe('initYAxis', function () {
});
it('does not set the yAxisLabel, it does not make sense to put multiple labels on the same axis', function () {
var chart = _.cloneDeep(baseChart);
let chart = _.cloneDeep(baseChart);
initYAxis(chart);
expect(chart).to.have.property('yAxisLabel', '');
});

94
src/ui/public/agg_response/point_series/__tests__/_main.js
View file

@ -1,11 +1,11 @@
describe('pointSeriesChartDataFromTable', function () {
this.slow(1000);
var _ = require('lodash');
var moment = require('moment');
var AggConfigResult = require('ui/Vis/AggConfigResult');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let moment = require('moment');
let AggConfigResult = require('ui/Vis/AggConfigResult');
let expect = require('expect.js');
let ngMock = require('ngMock');
let pointSeriesChartDataFromTable;
let indexPattern;
@ -21,20 +21,20 @@ describe('pointSeriesChartDataFromTable', function () {
}));
it('handles a table with just a count', function () {
var vis = new Vis(indexPattern, { type: 'histogram' });
var agg = vis.aggs[0];
var result = new AggConfigResult(vis.aggs[0], void 0, 100, 100);
let vis = new Vis(indexPattern, { type: 'histogram' });
let agg = vis.aggs[0];
let result = new AggConfigResult(vis.aggs[0], void 0, 100, 100);
var table = new Table();
let table = new Table();
table.columns = [ { aggConfig: agg } ];
table.rows.push([ result ]);
var chartData = pointSeriesChartDataFromTable(vis, table);
let chartData = pointSeriesChartDataFromTable(vis, table);
expect(chartData).to.be.an('object');
expect(chartData.series).to.be.an('array');
expect(chartData.series).to.have.length(1);
var series = chartData.series[0];
let series = chartData.series[0];
expect(series.values).to.have.length(1);
expect(series.values[0])
.to.have.property('x', '_all')
@ -43,7 +43,7 @@ describe('pointSeriesChartDataFromTable', function () {
});
it('handles a table with x and y column', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'count', schema: 'metric' },
@ -51,32 +51,32 @@ describe('pointSeriesChartDataFromTable', function () {
]
});
var y = {
let y = {
agg: vis.aggs[0],
col: { aggConfig: vis.aggs[0] },
at: function (i) { return 100 * i; }
};
var x = {
let x = {
agg: vis.aggs[1],
col: { aggConfig: vis.aggs[1] },
at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
};
var rowCount = 3;
var table = new Table();
let rowCount = 3;
let table = new Table();
table.columns = [ x.col, y.col ];
_.times(rowCount, function (i) {
var date = new AggConfigResult(x.agg, void 0, x.at(i));
let date = new AggConfigResult(x.agg, void 0, x.at(i));
table.rows.push([date, new AggConfigResult(y.agg, date, y.at(i))]);
});
var chartData = pointSeriesChartDataFromTable(vis, table);
let chartData = pointSeriesChartDataFromTable(vis, table);
expect(chartData).to.be.an('object');
expect(chartData.series).to.be.an('array');
expect(chartData.series).to.have.length(1);
var series = chartData.series[0];
let series = chartData.series[0];
expect(series.values).to.have.length(rowCount);
series.values.forEach(function (point, i) {
expect(point)
@ -96,7 +96,7 @@ describe('pointSeriesChartDataFromTable', function () {
});
it('handles a table with an x and two y aspects', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@ -105,40 +105,40 @@ describe('pointSeriesChartDataFromTable', function () {
]
});
var avg = {
let avg = {
agg: vis.aggs[0],
col: { title: 'average', aggConfig: vis.aggs[0] },
at: function (i) { return 75.444 * (i + 1); }
};
var date = {
let date = {
agg: vis.aggs[1],
col: { title: 'date', aggConfig: vis.aggs[1] },
at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
};
var max = {
let max = {
agg: vis.aggs[2],
col: { title: 'maximum', aggConfig: vis.aggs[2] },
at: function (i) { return 100 * (i + 1); }
};
var rowCount = 3;
var table = new Table();
let rowCount = 3;
let table = new Table();
table.columns = [ date.col, avg.col, max.col ];
_.times(rowCount, function (i) {
var dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
var avgResult = new AggConfigResult(avg.agg, dateResult, avg.at(i));
var maxResult = new AggConfigResult(max.agg, dateResult, max.at(i));
let dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
let avgResult = new AggConfigResult(avg.agg, dateResult, avg.at(i));
let maxResult = new AggConfigResult(max.agg, dateResult, max.at(i));
table.rows.push([dateResult, avgResult, maxResult]);
});
var chartData = pointSeriesChartDataFromTable(vis, table);
let chartData = pointSeriesChartDataFromTable(vis, table);
expect(chartData).to.be.an('object');
expect(chartData.series).to.be.an('array');
expect(chartData.series).to.have.length(2);
chartData.series.forEach(function (siri, i) {
var metric = i === 0 ? avg : max;
let metric = i === 0 ? avg : max;
expect(siri).to.have.property('label', metric.col.label);
expect(siri.values).to.have.length(rowCount);
@ -166,7 +166,7 @@ describe('pointSeriesChartDataFromTable', function () {
});
it('handles a table with an x, a series, and two y aspects', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'group', params: { field: 'extension' } },
@ -176,53 +176,53 @@ describe('pointSeriesChartDataFromTable', function () {
]
});
var extensions = ['php', 'jpg', 'gif', 'css'];
var term = {
let extensions = ['php', 'jpg', 'gif', 'css'];
let term = {
agg: vis.aggs[0],
col: { title: 'extensions', aggConfig: vis.aggs[0] },
at: function (i) { return extensions[i % extensions.length]; }
};
var avg = {
let avg = {
agg: vis.aggs[1],
col: { title: 'average', aggConfig: vis.aggs[1] },
at: function (i) { return 75.444 * (i + 1); }
};
var date = {
let date = {
agg: vis.aggs[2],
col: { title: 'date', aggConfig: vis.aggs[2] },
at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
};
var max = {
let max = {
agg: vis.aggs[3],
col: { title: 'maximum', aggConfig: vis.aggs[3] },
at: function (i) { return 100 * (i + 1); }
};
var metricCount = 2;
var rowsPerSegment = 2;
var rowCount = extensions.length * rowsPerSegment;
var table = new Table();
let metricCount = 2;
let rowsPerSegment = 2;
let rowCount = extensions.length * rowsPerSegment;
let table = new Table();
table.columns = [ date.col, term.col, avg.col, max.col ];
_.times(rowCount, function (i) {
var dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
var termResult = new AggConfigResult(term.agg, dateResult, term.at(i));
var avgResult = new AggConfigResult(avg.agg, termResult, avg.at(i));
var maxResult = new AggConfigResult(max.agg, termResult, max.at(i));
let dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
let termResult = new AggConfigResult(term.agg, dateResult, term.at(i));
let avgResult = new AggConfigResult(avg.agg, termResult, avg.at(i));
let maxResult = new AggConfigResult(max.agg, termResult, max.at(i));
table.rows.push([dateResult, termResult, avgResult, maxResult]);
});
var chartData = pointSeriesChartDataFromTable(vis, table);
let chartData = pointSeriesChartDataFromTable(vis, table);
expect(chartData).to.be.an('object');
expect(chartData.series).to.be.an('array');
// one series for each extension, and then one for each metric inside
expect(chartData.series).to.have.length(extensions.length * metricCount);
chartData.series.forEach(function (siri, i) {
// figure out the metric used to create this series
var metricAgg = siri.values[0].aggConfigResult.aggConfig;
var metric = avg.agg === metricAgg ? avg : max;
let metricAgg = siri.values[0].aggConfigResult.aggConfig;
let metric = avg.agg === metricAgg ? avg : max;
expect(siri.values).to.have.length(rowsPerSegment);
siri.values.forEach(function (point) {

28
src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
View file

@ -1,11 +1,11 @@
describe('orderedDateAxis', function () {
var moment = require('moment');
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let moment = require('moment');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
var baseArgs = {
let baseArgs = {
vis: {
indexPattern: {
timeFieldName: '@timestamp'
@ -36,7 +36,7 @@ describe('orderedDateAxis', function () {
describe('xAxisFormatter', function () {
it('sets the xAxisFormatter', function () {
var args = _.cloneDeep(baseArgs);
let args = _.cloneDeep(baseArgs);
orderedDateAxis(args.vis, args.chart);
expect(args.chart).to.have.property('xAxisFormatter');
@ -44,10 +44,10 @@ describe('orderedDateAxis', function () {
});
it('formats values using moment, and returns strings', function () {
var args = _.cloneDeep(baseArgs);
let args = _.cloneDeep(baseArgs);
orderedDateAxis(args.vis, args.chart);
var val = '2014-08-06T12:34:01';
let val = '2014-08-06T12:34:01';
expect(args.chart.xAxisFormatter(val))
.to.be(moment(val).format('hh:mm:ss'));
});
@ -55,7 +55,7 @@ describe('orderedDateAxis', function () {
describe('ordered object', function () {
it('sets date: true', function () {
var args = _.cloneDeep(baseArgs);
let args = _.cloneDeep(baseArgs);
orderedDateAxis(args.vis, args.chart);
expect(args.chart)
@ -66,21 +66,21 @@ describe('orderedDateAxis', function () {
});
it('relies on agg.buckets for the interval', function () {
var args = _.cloneDeep(baseArgs);
var spy = sinon.spy(args.chart.aspects.x.agg.buckets, 'getInterval');
let args = _.cloneDeep(baseArgs);
let spy = sinon.spy(args.chart.aspects.x.agg.buckets, 'getInterval');
orderedDateAxis(args.vis, args.chart);
expect(spy).to.have.property('callCount', 1);
});
it('sets the min/max when the buckets are bounded', function () {
var args = _.cloneDeep(baseArgs);
let args = _.cloneDeep(baseArgs);
orderedDateAxis(args.vis, args.chart);
expect(moment.isMoment(args.chart.ordered.min)).to.be(true);
expect(moment.isMoment(args.chart.ordered.max)).to.be(true);
});
it('does not set the min/max when the buckets are unbounded', function () {
var args = _.cloneDeep(baseArgs);
let args = _.cloneDeep(baseArgs);
args.chart.aspects.x.agg.buckets.getBounds = _.constant();
orderedDateAxis(args.vis, args.chart);
expect(args.chart.ordered).to.not.have.property('min');

22
src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
View file

@ -1,8 +1,8 @@
describe('tooltipFormatter', function () {
var _ = require('lodash');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let $ = require('jquery');
let expect = require('expect.js');
let ngMock = require('ngMock');
let tooltipFormatter;
@ -22,7 +22,7 @@ describe('tooltipFormatter', function () {
return $row.eq(i).text().trim();
}
var baseEvent = {
let baseEvent = {
datum: {
aggConfigResult: {
aggConfig: agg('inner'),
@ -41,20 +41,20 @@ describe('tooltipFormatter', function () {
};
it('returns html based on the mouse event', function () {
var event = _.cloneDeep(baseEvent);
var $el = $(tooltipFormatter(event));
var $rows = $el.find('tr');
let event = _.cloneDeep(baseEvent);
let $el = $(tooltipFormatter(event));
let $rows = $el.find('tr');
expect($rows.size()).to.be(3);
var $row1 = $rows.eq(0).find('td');
let $row1 = $rows.eq(0).find('td');
expect(cell($row1, 0)).to.be('inner');
expect(cell($row1, 1)).to.be('(3)');
var $row2 = $rows.eq(1).find('td');
let $row2 = $rows.eq(1).find('td');
expect(cell($row2, 0)).to.be('middle');
expect(cell($row2, 1)).to.be('(2)');
var $row3 = $rows.eq(2).find('td');
let $row3 = $rows.eq(2).find('td');
expect(cell($row3, 0)).to.be('top');
expect(cell($row3, 1)).to.be('(1)');
});

22
src/ui/public/agg_response/tabify/__tests__/_buckets.js
View file

@ -1,7 +1,7 @@
describe('Buckets wrapper', function () {
let Buckets;
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
@ -11,13 +11,13 @@ describe('Buckets wrapper', function () {
function test(aggResp, count, keys) {
it('reads the length', function () {
var buckets = new Buckets(aggResp);
let buckets = new Buckets(aggResp);
expect(buckets).to.have.length(count);
});
it('itterates properly, passing in the key', function () {
var buckets = new Buckets(aggResp);
var keysSent = [];
let buckets = new Buckets(aggResp);
let keysSent = [];
buckets.forEach(function (bucket, key) {
keysSent.push(key);
});
@ -28,7 +28,7 @@ describe('Buckets wrapper', function () {
}
describe('with object style buckets', function () {
var aggResp = {
let aggResp = {
buckets: {
'0-100': {},
'100-200': {},
@ -36,14 +36,14 @@ describe('Buckets wrapper', function () {
}
};
var count = 3;
var keys = ['0-100', '100-200', '200-300'];
let count = 3;
let keys = ['0-100', '100-200', '200-300'];
test(aggResp, count, keys);
});
describe('with array style buckets', function () {
var aggResp = {
let aggResp = {
buckets: [
{ key: '0-100', value: {} },
{ key: '100-200', value: {} },
@ -51,8 +51,8 @@ describe('Buckets wrapper', function () {
]
};
var count = 3;
var keys = ['0-100', '100-200', '200-300'];
let count = 3;
let keys = ['0-100', '100-200', '200-300'];
test(aggResp, count, keys);
});

28
src/ui/public/agg_response/tabify/__tests__/_get_columns.js
View file

@ -2,8 +2,8 @@ describe('get columns', function () {
let getColumns;
let Vis;
let indexPattern;
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
@ -13,11 +13,11 @@ describe('get columns', function () {
}));
it('should inject a count metric if no aggs exist', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'pie'
});
while (vis.aggs.length) vis.aggs.pop();
var columns = getColumns(vis);
let columns = getColumns(vis);
expect(columns).to.have.length(1);
expect(columns[0]).to.have.property('aggConfig');
@ -25,14 +25,14 @@ describe('get columns', function () {
});
it('should inject a count metric if only buckets exist', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } }
]
});
var columns = getColumns(vis);
let columns = getColumns(vis);
expect(columns).to.have.length(2);
expect(columns[1]).to.have.property('aggConfig');
@ -40,7 +40,7 @@ describe('get columns', function () {
});
it('should inject the metric after each bucket if the vis is hierarchical', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@ -50,7 +50,7 @@ describe('get columns', function () {
]
});
var columns = getColumns(vis);
let columns = getColumns(vis);
expect(columns).to.have.length(8);
columns.forEach(function (column, i) {
@ -60,7 +60,7 @@ describe('get columns', function () {
});
it('should inject the multiple metrics after each bucket if the vis is hierarchical', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@ -72,7 +72,7 @@ describe('get columns', function () {
]
});
var columns = getColumns(vis);
let columns = getColumns(vis);
function checkColumns(column, i) {
expect(column).to.have.property('aggConfig');
@ -90,14 +90,14 @@ describe('get columns', function () {
}
expect(columns).to.have.length(12);
for (var i = 0; i < columns.length; i += 3) {
var counts = { buckets: 0, metrics: 0 };
for (let i = 0; i < columns.length; i += 3) {
let counts = { buckets: 0, metrics: 0 };
columns.slice(i, i + 3).forEach(checkColumns);
}
});
it('should put all metrics at the end of the columns if the vis is not hierarchical', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@ -109,7 +109,7 @@ describe('get columns', function () {
]
});
var columns = getColumns(vis);
let columns = getColumns(vis);
expect(columns).to.have.length(6);
// sum should be last

22
src/ui/public/agg_response/tabify/__tests__/_integration.js
View file

@ -1,8 +1,8 @@
describe('tabifyAggResponse Integration', function () {
var _ = require('lodash');
var fixtures = require('fixtures/fake_hierarchical_data');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let fixtures = require('fixtures/fake_hierarchical_data');
let expect = require('expect.js');
let ngMock = require('ngMock');
let Vis;
let Buckets;
@ -23,13 +23,13 @@ describe('tabifyAggResponse Integration', function () {
}
it('transforms a simple response properly', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: []
});
normalizeIds(vis);
var resp = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
let resp = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
expect(resp).to.not.have.property('tables');
expect(resp).to.have.property('rows').and.property('columns');
@ -78,7 +78,7 @@ describe('tabifyAggResponse Integration', function () {
function expectRootGroup(rootTableGroup, expectInnerTables) {
expect(rootTableGroup).to.have.property('tables');
var tables = rootTableGroup.tables;
let tables = rootTableGroup.tables;
expect(tables).to.be.an('array').and.have.length(3);
expectExtensionSplit(tables[0], 'png', expectInnerTables);
expectExtensionSplit(tables[1], 'css', expectInnerTables);
@ -152,7 +152,7 @@ describe('tabifyAggResponse Integration', function () {
// only complete rows, and only put the metrics at the end.
vis.isHierarchical = _.constant(false);
var tabbed = tabifyAggResponse(vis, esResp);
let tabbed = tabifyAggResponse(vis, esResp);
expectRootGroup(tabbed, function expectTable(table, splitKey) {
expectColumns(table, [src, os, avg]);
@ -178,7 +178,7 @@ describe('tabifyAggResponse Integration', function () {
// the existing bucket and it's metric
vis.isHierarchical = _.constant(true);
var tabbed = tabifyAggResponse(vis, esResp, {
let tabbed = tabifyAggResponse(vis, esResp, {
partialRows: true
});
@ -212,7 +212,7 @@ describe('tabifyAggResponse Integration', function () {
// the end
vis.isHierarchical = _.constant(true);
var tabbed = tabifyAggResponse(vis, esResp, {
let tabbed = tabifyAggResponse(vis, esResp, {
partialRows: true,
minimalColumns: true
});
@ -244,7 +244,7 @@ describe('tabifyAggResponse Integration', function () {
// create metric columns after each bucket
vis.isHierarchical = _.constant(false);
var tabbed = tabifyAggResponse(vis, esResp, {
let tabbed = tabifyAggResponse(vis, esResp, {
minimalColumns: false
});

138
src/ui/public/agg_response/tabify/__tests__/_response_writer.js
View file

@ -1,8 +1,8 @@
describe('ResponseWriter class', function () {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let Vis;
let Table;
@ -36,15 +36,15 @@ describe('ResponseWriter class', function () {
defineSetup(true);
it('gets the columns for the vis', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var writer = new ResponseWriter(vis);
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let writer = new ResponseWriter(vis);
expect(getColumns).to.have.property('callCount', 1);
expect(getColumns.firstCall.args[0]).to.be(vis);
});
it('collects the aggConfigs from each column in aggStack', function () {
var aggs = [
let aggs = [
{ type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
{ type: 'terms', schema: 'segment', params: { field: 'extension' } },
{ type: 'avg', schema: 'metric', params: { field: '@timestamp' } }
@ -54,12 +54,12 @@ describe('ResponseWriter class', function () {
return { aggConfig: agg };
}));
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: aggs
});
var writer = new ResponseWriter(vis);
let writer = new ResponseWriter(vis);
expect(writer.aggStack).to.be.an('array');
expect(writer.aggStack).to.have.length(aggs.length);
writer.aggStack.forEach(function (agg, i) {
@ -68,40 +68,40 @@ describe('ResponseWriter class', function () {
});
it('sets canSplit=true by default', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var writer = new ResponseWriter(vis);
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let writer = new ResponseWriter(vis);
expect(writer).to.have.property('canSplit', true);
});
it('sets canSplit=false when config says to', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var writer = new ResponseWriter(vis, { canSplit: false });
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let writer = new ResponseWriter(vis, { canSplit: false });
expect(writer).to.have.property('canSplit', false);
});
describe('sets partialRows', function () {
it('to the value of the config if set', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var partial = Boolean(Math.round(Math.random()));
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let partial = Boolean(Math.round(Math.random()));
var writer = new ResponseWriter(vis, { partialRows: partial });
let writer = new ResponseWriter(vis, { partialRows: partial });
expect(writer).to.have.property('partialRows', partial);
});
it('to the value of vis.isHierarchical if no config', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var hierarchical = Boolean(Math.round(Math.random()));
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let hierarchical = Boolean(Math.round(Math.random()));
sinon.stub(vis, 'isHierarchical').returns(hierarchical);
var writer = new ResponseWriter(vis, {});
let writer = new ResponseWriter(vis, {});
expect(writer).to.have.property('partialRows', hierarchical);
});
});
it('starts off with a root TableGroup', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var writer = new ResponseWriter(vis);
let writer = new ResponseWriter(vis);
expect(writer.root).to.be.a(TableGroup);
expect(writer.splitStack).to.be.an('array');
expect(writer.splitStack).to.have.length(1);
@ -114,29 +114,29 @@ describe('ResponseWriter class', function () {
describe('#response()', function () {
it('returns the root TableGroup if splitting', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var writer = new ResponseWriter(vis);
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let writer = new ResponseWriter(vis);
expect(writer.response()).to.be(writer.root);
});
it('returns the first table if not splitting', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var writer = new ResponseWriter(vis, { canSplit: false });
var table = writer._table();
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let writer = new ResponseWriter(vis, { canSplit: false });
let table = writer._table();
expect(writer.response()).to.be(table);
});
it('adds columns to all of the tables', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', params: { field: '_type' }, schema: 'split' },
{ type: 'count', schema: 'metric' }
]
});
var buckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
var writer = new ResponseWriter(vis);
var tables = [];
let buckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
let writer = new ResponseWriter(vis);
let tables = [];
writer.split(vis.aggs[0], buckets, function () {
writer.cell(vis.aggs[1], 100, function () {
@ -148,11 +148,11 @@ describe('ResponseWriter class', function () {
expect(table.columns == null).to.be(true);
});
var resp = writer.response();
let resp = writer.response();
expect(resp).to.be.a(TableGroup);
expect(resp.tables).to.have.length(2);
var nginx = resp.tables.shift();
let nginx = resp.tables.shift();
expect(nginx).to.have.property('aggConfig', vis.aggs[0]);
expect(nginx).to.have.property('key', 'nginx');
expect(nginx.tables).to.have.length(1);
@ -160,7 +160,7 @@ describe('ResponseWriter class', function () {
expect(_.contains(tables, table)).to.be(true);
});
var apache = resp.tables.shift();
let apache = resp.tables.shift();
expect(apache).to.have.property('aggConfig', vis.aggs[0]);
expect(apache).to.have.property('key', 'apache');
expect(apache.tables).to.have.length(1);
@ -178,16 +178,16 @@ describe('ResponseWriter class', function () {
describe('#split()', function () {
it('with break if the user has specified that splitting is to be disabled', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'split', params: { field: '_type' } },
{ type: 'count', schema: 'metric' }
]
});
var agg = vis.aggs.bySchemaName.split[0];
var buckets = new Buckets({ buckets: [ { key: 'apache' } ]});
var writer = new ResponseWriter(vis, { canSplit: false });
let agg = vis.aggs.bySchemaName.split[0];
let buckets = new Buckets({ buckets: [ { key: 'apache' } ]});
let writer = new ResponseWriter(vis, { canSplit: false });
expect(function () {
writer.split(agg, buckets, _.noop);
@ -195,7 +195,7 @@ describe('ResponseWriter class', function () {
});
it('forks the acrStack and rewrites the parents', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', params: { field: 'extension' }, schema: 'segment' },
@ -205,10 +205,10 @@ describe('ResponseWriter class', function () {
]
});
var writer = new ResponseWriter(vis, { asAggConfigResults: true });
var extensions = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
var types = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
var os = new Buckets({ buckets: [ { key: 'window' }, { key: 'osx' } ] });
let writer = new ResponseWriter(vis, { asAggConfigResults: true });
let extensions = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
let types = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
let os = new Buckets({ buckets: [ { key: 'window' }, { key: 'osx' } ] });
extensions.forEach(function (b, extension) {
writer.cell(vis.aggs[0], extension, function () {
@ -224,11 +224,11 @@ describe('ResponseWriter class', function () {
});
});
var tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
let tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
expect(tables.length).to.be(types.length);
// collect the far left acr from each table
var leftAcrs = _.pluck(tables, 'rows[0][0]');
let leftAcrs = _.pluck(tables, 'rows[0][0]');
leftAcrs.forEach(function (acr, i, acrs) {
expect(acr.aggConfig).to.be(vis.aggs[0]);
@ -237,7 +237,7 @@ describe('ResponseWriter class', function () {
// for all but the last acr, compare to the next
if (i + 1 >= acrs.length) return;
var acr2 = leftAcrs[i + 1];
let acr2 = leftAcrs[i + 1];
expect(acr.key).to.be(acr2.key);
expect(acr.value).to.be(acr2.value);
@ -252,8 +252,8 @@ describe('ResponseWriter class', function () {
describe('#cell()', function () {
it('logs a cell in the ResponseWriters row buffer, calls the block arg, then removes the value from the buffer',
function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var writer = new ResponseWriter(vis);
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let writer = new ResponseWriter(vis);
expect(writer.rowBuffer).to.have.length(0);
writer.cell({}, 500, function () {
@ -266,10 +266,10 @@ describe('ResponseWriter class', function () {
describe('#row()', function () {
it('writes the ResponseWriters internal rowBuffer into a table', function () {
var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
var writer = new ResponseWriter(vis);
let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
let writer = new ResponseWriter(vis);
var table = writer._table();
let table = writer._table();
writer.cell({}, 1, function () {
writer.cell({}, 2, function () {
writer.cell({}, 3, function () {
@ -283,7 +283,7 @@ describe('ResponseWriter class', function () {
});
it('always writes to the table group at the top of the split stack', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'split', params: { field: '_type' } },
@ -292,20 +292,20 @@ describe('ResponseWriter class', function () {
{ type: 'count', schema: 'metric' }
]
});
var splits = vis.aggs.bySchemaName.split;
let splits = vis.aggs.bySchemaName.split;
var type = splits[0];
var typeBuckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
let type = splits[0];
let typeBuckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
var ext = splits[1];
var extBuckets = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
let ext = splits[1];
let extBuckets = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
var os = splits[2];
var osBuckets = new Buckets({ buckets: [ { key: 'windows' }, { key: 'mac' } ] });
let os = splits[2];
let osBuckets = new Buckets({ buckets: [ { key: 'windows' }, { key: 'mac' } ] });
var count = vis.aggs[3];
let count = vis.aggs[3];
var writer = new ResponseWriter(vis);
let writer = new ResponseWriter(vis);
writer.split(type, typeBuckets, function () {
writer.split(ext, extBuckets, function () {
writer.split(os, osBuckets, function (bucket, key) {
@ -316,9 +316,9 @@ describe('ResponseWriter class', function () {
});
});
var resp = writer.response();
var sum = 0;
var tables = 0;
let resp = writer.response();
let sum = 0;
let tables = 0;
(function recurse(t) {
if (t.tables) {
// table group
@ -341,7 +341,7 @@ describe('ResponseWriter class', function () {
});
it('writes partial rows for hierarchical vis', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'terms', schema: 'segment', params: { field: '_type' }},
@ -349,8 +349,8 @@ describe('ResponseWriter class', function () {
]
});
var writer = new ResponseWriter(vis);
var table = writer._table();
let writer = new ResponseWriter(vis);
let table = writer._table();
writer.cell(vis.aggs[0], 'apache', function () {
writer.row();
});
@ -360,7 +360,7 @@ describe('ResponseWriter class', function () {
});
it('skips partial rows for non-hierarchical vis', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{ type: 'terms', schema: 'segment', params: { field: '_type' }},
@ -368,8 +368,8 @@ describe('ResponseWriter class', function () {
]
});
var writer = new ResponseWriter(vis);
var table = writer._table();
let writer = new ResponseWriter(vis);
let table = writer._table();
writer.cell(vis.aggs[0], 'apache', function () {
writer.row();
});

32
src/ui/public/agg_response/tabify/__tests__/_table.js
View file

@ -1,7 +1,7 @@
describe('Table class', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let Table;
@ -11,16 +11,16 @@ describe('Table class', function () {
}));
it('exposes rows array, but not the columns', function () {
var table = new Table();
let table = new Table();
expect(table.rows).to.be.an('array');
expect(table.columns == null).to.be.ok();
});
describe('#aggConfig', function () {
it('accepts a column from the table and returns its agg config', function () {
var table = new Table();
var football = {};
var column = {
let table = new Table();
let football = {};
let column = {
aggConfig: football
};
@ -29,7 +29,7 @@ describe('Table class', function () {
it('throws a TypeError if the column is malformed', function () {
expect(function () {
var notAColumn = {};
let notAColumn = {};
(new Table()).aggConfig(notAColumn);
}).to.throwException(TypeError);
});
@ -37,12 +37,12 @@ describe('Table class', function () {
describe('#title', function () {
it('returns nothing if the table is not part of a table group', function () {
var table = new Table();
let table = new Table();
expect(table.title()).to.be('');
});
it('returns the title of the TableGroup if the table is part of one', function () {
var table = new Table();
let table = new Table();
table.$parent = {
title: 'TableGroup Title',
tables: [table]
@ -54,9 +54,9 @@ describe('Table class', function () {
describe('#field', function () {
it('calls the columns aggConfig#field() method', function () {
var table = new Table();
var football = {};
var column = {
let table = new Table();
let football = {};
let column = {
aggConfig: {
field: _.constant(football)
}
@ -68,9 +68,9 @@ describe('Table class', function () {
describe('#fieldFormatter', function () {
it('calls the columns aggConfig#fieldFormatter() method', function () {
var table = new Table();
var football = {};
var column = {
let table = new Table();
let football = {};
let column = {
aggConfig: {
fieldFormatter: _.constant(football)
}

6
src/ui/public/agg_response/tabify/__tests__/_table_group.js
View file

@ -1,7 +1,7 @@
describe('Table Group class', function () {
let TableGroup;
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
@ -9,7 +9,7 @@ describe('Table Group class', function () {
}));
it('exposes tables array and empty aggConfig, key and title', function () {
var tableGroup = new TableGroup();
let tableGroup = new TableGroup();
expect(tableGroup.tables).to.be.an('array');
expect(tableGroup.aggConfig).to.be(null);
expect(tableGroup.key).to.be(null);

28
src/ui/public/agg_table/__tests__/_group.js
View file

@ -1,9 +1,9 @@
describe('AggTableGroup Directive', function () {
var _ = require('lodash');
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
var fixtures = require('fixtures/fake_hierarchical_data');
let _ = require('lodash');
let $ = require('jquery');
let ngMock = require('ngMock');
let expect = require('expect.js');
let fixtures = require('fixtures/fake_hierarchical_data');
let $rootScope;
let $compile;
@ -31,9 +31,9 @@ describe('AggTableGroup Directive', function () {
it('renders a simple split response properly', function () {
var vis = new Vis(indexPattern, 'table');
let vis = new Vis(indexPattern, 'table');
$scope.group = tabifyAggResponse(vis, fixtures.metricOnly);
var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
$compile($el)($scope);
$scope.$digest();
@ -43,7 +43,7 @@ describe('AggTableGroup Directive', function () {
});
it('renders nothing if the table list is empty', function () {
var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
$scope.group = {
tables: []
@ -52,12 +52,12 @@ describe('AggTableGroup Directive', function () {
$compile($el)($scope);
$scope.$digest();
var $subTables = $el.find('kbn-agg-table');
let $subTables = $el.find('kbn-agg-table');
expect($subTables.size()).to.be(0);
});
it('renders a complex response properly', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@ -70,15 +70,15 @@ describe('AggTableGroup Directive', function () {
agg.id = 'agg_' + (i + 1);
});
var group = $scope.group = tabifyAggResponse(vis, fixtures.threeTermBuckets);
var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
let group = $scope.group = tabifyAggResponse(vis, fixtures.threeTermBuckets);
let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
$compile($el)($scope);
$scope.$digest();
var $subTables = $el.find('kbn-agg-table');
let $subTables = $el.find('kbn-agg-table');
expect($subTables.size()).to.be(3);
var $subTableHeaders = $el.find('.agg-table-group-header');
let $subTableHeaders = $el.find('.agg-table-group-header');
expect($subTableHeaders.size()).to.be(3);
$subTableHeaders.each(function (i) {

54
src/ui/public/agg_table/__tests__/_table.js
View file

@ -1,10 +1,10 @@
describe('AggTable Directive', function () {
var _ = require('lodash');
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
var fixtures = require('fixtures/fake_hierarchical_data');
var sinon = require('auto-release-sinon');
let _ = require('lodash');
let $ = require('jquery');
let ngMock = require('ngMock');
let expect = require('expect.js');
let fixtures = require('fixtures/fake_hierarchical_data');
let sinon = require('auto-release-sinon');
let $rootScope;
let $compile;
@ -32,10 +32,10 @@ describe('AggTable Directive', function () {
it('renders a simple response properly', function () {
var vis = new Vis(indexPattern, 'table');
let vis = new Vis(indexPattern, 'table');
$scope.table = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
var $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
let $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
$scope.$digest();
expect($el.find('tbody').size()).to.be(1);
@ -45,14 +45,14 @@ describe('AggTable Directive', function () {
it('renders nothing if the table is empty', function () {
$scope.table = null;
var $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
let $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
$scope.$digest();
expect($el.find('tbody').size()).to.be(0);
});
it('renders a complex response properly', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@ -66,27 +66,27 @@ describe('AggTable Directive', function () {
});
$scope.table = tabifyAggResponse(vis, fixtures.threeTermBuckets, { canSplit: false });
var $el = $('<kbn-agg-table table="table"></kbn-agg-table>');
let $el = $('<kbn-agg-table table="table"></kbn-agg-table>');
$compile($el)($scope);
$scope.$digest();
expect($el.find('tbody').size()).to.be(1);
var $rows = $el.find('tbody tr');
let $rows = $el.find('tbody tr');
expect($rows.size()).to.be.greaterThan(0);
function validBytes(str) {
expect(str).to.match(/^\d+$/);
var bytesAsNum = _.parseInt(str);
let bytesAsNum = _.parseInt(str);
expect(bytesAsNum === 0 || bytesAsNum > 1000).to.be.ok();
}
$rows.each(function (i) {
// 6 cells in every row
var $cells = $(this).find('td');
let $cells = $(this).find('td');
expect($cells.size()).to.be(6);
var txts = $cells.map(function () {
let txts = $cells.map(function () {
return $(this).text().trim();
});
@ -106,11 +106,11 @@ describe('AggTable Directive', function () {
describe('aggTable.toCsv()', function () {
it('escapes and formats the rows and columns properly', function () {
var $el = $compile('<kbn-agg-table table="table">')($scope);
let $el = $compile('<kbn-agg-table table="table">')($scope);
$scope.$digest();
var $tableScope = $el.isolateScope();
var aggTable = $tableScope.aggTable;
let $tableScope = $el.isolateScope();
let aggTable = $tableScope.aggTable;
$tableScope.table = {
columns: [
@ -147,13 +147,13 @@ describe('AggTable Directive', function () {
});
it('calls _saveAs properly', function () {
var $el = $compile('<kbn-agg-table table="table">')($scope);
let $el = $compile('<kbn-agg-table table="table">')($scope);
$scope.$digest();
var $tableScope = $el.isolateScope();
var aggTable = $tableScope.aggTable;
let $tableScope = $el.isolateScope();
let aggTable = $tableScope.aggTable;
var saveAs = sinon.stub(aggTable, '_saveAs');
let saveAs = sinon.stub(aggTable, '_saveAs');
$tableScope.table = {
columns: [
{ title: 'one' },
@ -169,7 +169,7 @@ describe('AggTable Directive', function () {
aggTable.exportAsCsv();
expect(saveAs.callCount).to.be(1);
var call = saveAs.getCall(0);
let call = saveAs.getCall(0);
expect(call.args[0]).to.be.a(FakeBlob);
expect(call.args[0].slices).to.eql([
'one,two,"with double-quotes("")"' + '\r\n' +
@ -182,12 +182,12 @@ describe('AggTable Directive', function () {
});
it('should use the export-title attribute', function () {
var expected = 'export file name';
var $el = $compile(`<kbn-agg-table table="table" export-title="exportTitle">`)($scope);
let expected = 'export file name';
let $el = $compile(`<kbn-agg-table table="table" export-title="exportTitle">`)($scope);
$scope.$digest();
var $tableScope = $el.isolateScope();
var aggTable = $tableScope.aggTable;
let $tableScope = $el.isolateScope();
let aggTable = $tableScope.aggTable;
$tableScope.table = {
columns: [],
rows: []

22
src/ui/public/agg_types/__tests__/AggParamWriter.js
View file

@ -1,9 +1,9 @@
module.exports = function AggParamWriterHelper(Private) {
var _ = require('lodash');
var Vis = Private(require('ui/Vis'));
var aggTypes = Private(require('ui/agg_types/index'));
var visTypes = Private(require('ui/registry/vis_types'));
var stubbedLogstashIndexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
let _ = require('lodash');
let Vis = Private(require('ui/Vis'));
let aggTypes = Private(require('ui/agg_types/index'));
let visTypes = Private(require('ui/registry/vis_types'));
let stubbedLogstashIndexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
/**
* Helper object for writing aggParams. Specify an aggType and it will find a vis & schema, and
@ -13,8 +13,8 @@ module.exports = function AggParamWriterHelper(Private) {
* - Verify that the interval parameter of the histogram visualization casts its input to a number
* ```js
* it('casts to a number', function () {
* var writer = new AggParamWriter({ aggType: 'histogram' });
* var output = writer.write({ interval : '100/10' });
* let writer = new AggParamWriter({ aggType: 'histogram' });
* let output = writer.write({ interval : '100/10' });
* expect(output.params.interval).to.be.a('number');
* expect(output.params.interval).to.be(100);
* });
@ -25,7 +25,7 @@ module.exports = function AggParamWriterHelper(Private) {
* @param {string} opts.aggType - the name of the aggType we want to test. ('histogram', 'filter', etc.)
*/
function AggParamWriter(opts) {
var self = this;
let self = this;
self.aggType = opts.aggType;
if (_.isString(self.aggType)) {
@ -43,7 +43,7 @@ module.exports = function AggParamWriterHelper(Private) {
// find a suitable vis type and schema
_.find(visTypes, function (visType) {
var schema = _.find(visType.schemas.all, function (schema) {
let schema = _.find(visType.schemas.all, function (schema) {
// type, type, type, type, type... :(
return schema.group === self.aggType.type;
});
@ -65,7 +65,7 @@ module.exports = function AggParamWriterHelper(Private) {
}
AggParamWriter.prototype.write = function (paramValues) {
var self = this;
let self = this;
paramValues = _.clone(paramValues);
if (self.aggType.params.byName.field && !paramValues.field) {
@ -86,7 +86,7 @@ module.exports = function AggParamWriterHelper(Private) {
}]
});
var aggConfig = _.find(self.vis.aggs, function (aggConfig) {
let aggConfig = _.find(self.vis.aggs, function (aggConfig) {
return aggConfig.type === self.aggType;
});

26
src/ui/public/agg_types/__tests__/AggParams.js
View file

@ -1,7 +1,7 @@
describe('AggParams class', function () {
var _ = require('lodash');
var ngMock = require('ngMock');
var expect = require('expect.js');
let _ = require('lodash');
let ngMock = require('ngMock');
let expect = require('expect.js');
let AggParams;
let BaseAggParam;
@ -23,11 +23,11 @@ describe('AggParams class', function () {
describe('constructor args', function () {
it('accepts an array of param defs', function () {
var params = [
let params = [
{ name: 'one' },
{ name: 'two' }
];
var aggParams = new AggParams(params);
let aggParams = new AggParams(params);
expect(aggParams).to.have.length(params.length);
expect(aggParams).to.be.an(Array);
@ -37,43 +37,43 @@ describe('AggParams class', function () {
describe('AggParam creation', function () {
it('Uses the FieldAggParam class for params with the name "field"', function () {
var params = [
let params = [
{ name: 'field' }
];
var aggParams = new AggParams(params);
let aggParams = new AggParams(params);
expect(aggParams).to.have.length(params.length);
expect(aggParams[0]).to.be.a(FieldAggParam);
});
it('Uses the OptionedAggParam class for params of type "optioned"', function () {
var params = [
let params = [
{
name: 'interval',
type: 'optioned'
}
];
var aggParams = new AggParams(params);
let aggParams = new AggParams(params);
expect(aggParams).to.have.length(params.length);
expect(aggParams[0]).to.be.a(OptionedAggParam);
});
it('Uses the RegexAggParam class for params of type "regex"', function () {
var params = [
let params = [
{
name: 'exclude',
type: 'regex'
}
];
var aggParams = new AggParams(params);
let aggParams = new AggParams(params);
expect(aggParams).to.have.length(params.length);
expect(aggParams[0]).to.be.a(RegexAggParam);
});
it('Always converts the params to a BaseAggParam', function () {
var params = [
let params = [
{
name: 'height',
editor: '<blink>high</blink>'
@ -87,7 +87,7 @@ describe('AggParams class', function () {
editor: '<blink>small</blink>'
}
];
var aggParams = new AggParams(params);
let aggParams = new AggParams(params);
expect(BaseAggParam).to.have.property('callCount', params.length);
expect(FieldAggParam).to.have.property('callCount', 0);

46
src/ui/public/agg_types/__tests__/AggType.js
View file

@ -1,8 +1,8 @@
describe('AggType Class', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var sinon = require('auto-release-sinon');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let sinon = require('auto-release-sinon');
let AggType;
let AggParams;
let AggConfig;
@ -14,7 +14,7 @@ describe('AggType Class', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
var AggParamsPM = require('ui/agg_types/AggParams');
let AggParamsPM = require('ui/agg_types/AggParams');
AggParams = sinon.spy(Private(AggParamsPM));
Private.stub(AggParamsPM, AggParams);
@ -34,7 +34,7 @@ describe('AggType Class', function () {
});
describe('application of config properties', function () {
var copiedConfigProps = [
let copiedConfigProps = [
'name',
'title',
'makeLabel',
@ -43,11 +43,11 @@ describe('AggType Class', function () {
describe('"' + copiedConfigProps.join('", "') + '"', function () {
it('assigns the config value to itself', function () {
var config = _.transform(copiedConfigProps, function (config, prop) {
let config = _.transform(copiedConfigProps, function (config, prop) {
config[prop] = {};
}, {});
var aggType = new AggType(config);
let aggType = new AggType(config);
copiedConfigProps.forEach(function (prop) {
expect(aggType[prop]).to.be(config[prop]);
@ -57,9 +57,9 @@ describe('AggType Class', function () {
describe('makeLabel', function () {
it('makes a function when the makeLabel config is not specified', function () {
var someGetter = function () {};
let someGetter = function () {};
var aggType = new AggType({
let aggType = new AggType({
makeLabel: someGetter
});
@ -76,9 +76,9 @@ describe('AggType Class', function () {
describe('getFormat', function () {
it('returns the formatter for the aggConfig', function () {
var aggType = new AggType({});
let aggType = new AggType({});
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -88,7 +88,7 @@ describe('AggType Class', function () {
]
});
var aggConfig = vis.aggs.byTypeName.date_histogram[0];
let aggConfig = vis.aggs.byTypeName.date_histogram[0];
expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('date'));
@ -107,9 +107,9 @@ describe('AggType Class', function () {
});
it('can be overridden via config', function () {
var someGetter = function () {};
let someGetter = function () {};
var aggType = new AggType({
let aggType = new AggType({
getFormat: someGetter
});
@ -123,7 +123,7 @@ describe('AggType Class', function () {
});
it('defaults to AggParams object with JSON param', function () {
var aggType = new AggType({
let aggType = new AggType({
name: 'smart agg'
});
@ -134,7 +134,7 @@ describe('AggType Class', function () {
});
it('can disable customLabel', function () {
var aggType = new AggType({
let aggType = new AggType({
name: 'smart agg',
customLabels: false
});
@ -144,13 +144,13 @@ describe('AggType Class', function () {
});
it('passes the params arg directly to the AggParams constructor', function () {
var params = [
let params = [
{name: 'one'},
{name: 'two'}
];
var paramLength = params.length + 2; // json and custom label are always appended
let paramLength = params.length + 2; // json and custom label are always appended
var aggType = new AggType({
let aggType = new AggType({
name: 'bucketeer',
params: params
});
@ -164,8 +164,8 @@ describe('AggType Class', function () {
describe('getResponseAggs', function () {
it('copies the value', function () {
var football = {};
var aggType = new AggType({
let football = {};
let aggType = new AggType({
getResponseAggs: football
});
@ -173,7 +173,7 @@ describe('AggType Class', function () {
});
it('defaults to _.noop', function () {
var aggType = new AggType({});
let aggType = new AggType({});
expect(aggType.getResponseAggs).to.be(_.noop);
});

64
src/ui/public/agg_types/__tests__/bucketCountBetween.js
View file

@ -1,7 +1,7 @@
describe('bucketCountBetween util', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let indexPattern;
let Vis;
let visTypes;
@ -26,7 +26,7 @@ describe('bucketCountBetween util', function () {
}));
it('returns a positive number when a is before b', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -40,14 +40,14 @@ describe('bucketCountBetween util', function () {
]
});
var a = vis.aggs.byTypeName.date_histogram[0];
var b = vis.aggs.byTypeName.terms[0];
var count = bucketCountBetween(a, b);
let a = vis.aggs.byTypeName.date_histogram[0];
let b = vis.aggs.byTypeName.terms[0];
let count = bucketCountBetween(a, b);
expect(isNegative(count)).to.be(false);
});
it('returns a negative number when a is after b', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -61,14 +61,14 @@ describe('bucketCountBetween util', function () {
]
});
var a = vis.aggs.byTypeName.terms[0];
var b = vis.aggs.byTypeName.date_histogram[0];
var count = bucketCountBetween(a, b);
let a = vis.aggs.byTypeName.terms[0];
let b = vis.aggs.byTypeName.date_histogram[0];
let count = bucketCountBetween(a, b);
expect(isNegative(count)).to.be(true);
});
it('returns 0 when there are no buckets between a and b', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -82,13 +82,13 @@ describe('bucketCountBetween util', function () {
]
});
var a = vis.aggs.byTypeName.date_histogram[0];
var b = vis.aggs.byTypeName.terms[0];
let a = vis.aggs.byTypeName.date_histogram[0];
let b = vis.aggs.byTypeName.terms[0];
expect(bucketCountBetween(a, b)).to.be(0);
});
it('returns null when b is not in the aggs', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -98,8 +98,8 @@ describe('bucketCountBetween util', function () {
]
});
var a = vis.aggs.byTypeName.date_histogram[0];
var b = new AggConfig(vis, {
let a = vis.aggs.byTypeName.date_histogram[0];
let b = new AggConfig(vis, {
type: 'terms',
schema: 'segment'
});
@ -108,7 +108,7 @@ describe('bucketCountBetween util', function () {
});
it('returns null when a is not in the aggs', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -118,27 +118,27 @@ describe('bucketCountBetween util', function () {
]
});
var a = new AggConfig(vis, {
let a = new AggConfig(vis, {
type: 'terms',
schema: 'segment'
});
var b = vis.aggs.byTypeName.date_histogram[0];
let b = vis.aggs.byTypeName.date_histogram[0];
expect(bucketCountBetween(a, b)).to.be(null);
});
it('returns null when a and b are not in the aggs', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: []
});
var a = new AggConfig(vis, {
let a = new AggConfig(vis, {
type: 'terms',
schema: 'segment'
});
var b = new AggConfig(vis, {
let b = new AggConfig(vis, {
type: 'date_histogram',
schema: 'segment'
});
@ -148,14 +148,14 @@ describe('bucketCountBetween util', function () {
function countTest(pre, post) {
return function () {
var schemas = visTypes.byName.histogram.schemas.buckets;
let schemas = visTypes.byName.histogram.schemas.buckets;
// slow for this test is actually somewhere around 1/2 a sec
this.slow(500);
function randBucketAggForVis(vis) {
var schema = _.sample(schemas);
var aggType = _.sample(aggTypes.byType.buckets);
let schema = _.sample(schemas);
let aggType = _.sample(aggTypes.byType.buckets);
return new AggConfig(vis, {
schema: schema,
@ -164,20 +164,20 @@ describe('bucketCountBetween util', function () {
}
_.times(50, function (n) {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: []
});
var randBucketAgg = _.partial(randBucketAggForVis, vis);
let randBucketAgg = _.partial(randBucketAggForVis, vis);
var a = randBucketAgg();
var b = randBucketAgg();
let a = randBucketAgg();
let b = randBucketAgg();
// create n aggs between a and b
var aggs = [];
let aggs = [];
aggs.fill = function (n) {
for (var i = 0; i < n; i++) {
for (let i = 0; i < n; i++) {
aggs.push(randBucketAgg());
}
};

26
src/ui/public/agg_types/__tests__/buckets/_histogram.js
View file

@ -1,7 +1,7 @@
describe('Histogram Agg', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('ordered', function () {
let histogram;
@ -26,7 +26,7 @@ describe('Histogram Agg', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
var AggParamWriter = Private(require('../AggParamWriter'));
let AggParamWriter = Private(require('../AggParamWriter'));
paramWriter = new AggParamWriter({ aggType: 'histogram' });
}));
@ -34,25 +34,25 @@ describe('Histogram Agg', function () {
// reads aggConfig.params.interval, writes to dsl.interval
it('accepts a number', function () {
var output = paramWriter.write({ interval: 100 });
let output = paramWriter.write({ interval: 100 });
expect(output.params).to.have.property('interval', 100);
});
it('accepts a string', function () {
var output = paramWriter.write({ interval: '10' });
let output = paramWriter.write({ interval: '10' });
expect(output.params).to.have.property('interval', 10);
});
it('fails on non-numeric values', function () {
// template validation prevents this from users, not devs
var output = paramWriter.write({ interval: [] });
let output = paramWriter.write({ interval: [] });
expect(isNaN(output.params.interval)).to.be.ok();
});
});
describe('min_doc_count', function () {
it('casts true values to 0', function () {
var output = paramWriter.write({ min_doc_count: true });
let output = paramWriter.write({ min_doc_count: true });
expect(output.params).to.have.property('min_doc_count', 0);
output = paramWriter.write({ min_doc_count: 'yes' });
@ -66,7 +66,7 @@ describe('Histogram Agg', function () {
});
it('writes nothing for false values', function () {
var output = paramWriter.write({ min_doc_count: '' });
let output = paramWriter.write({ min_doc_count: '' });
expect(output.params).to.not.have.property('min_doc_count');
output = paramWriter.write({ min_doc_count: null });
@ -79,7 +79,7 @@ describe('Histogram Agg', function () {
describe('extended_bounds', function () {
it('writes when only eb.min is set', function () {
var output = paramWriter.write({
let output = paramWriter.write({
extended_bounds: { min: 0 }
});
expect(output.params.extended_bounds).to.have.property('min', 0);
@ -87,7 +87,7 @@ describe('Histogram Agg', function () {
});
it('writes when only eb.max is set', function () {
var output = paramWriter.write({
let output = paramWriter.write({
extended_bounds: { max: 0 }
});
expect(output.params.extended_bounds).to.have.property('min', undefined);
@ -95,7 +95,7 @@ describe('Histogram Agg', function () {
});
it('writes when both eb.min and eb.max are set', function () {
var output = paramWriter.write({
let output = paramWriter.write({
extended_bounds: { min: 99, max: 100 }
});
expect(output.params.extended_bounds).to.have.property('min', 99);
@ -103,7 +103,7 @@ describe('Histogram Agg', function () {
});
it('does not write when nothing is set', function () {
var output = paramWriter.write({
let output = paramWriter.write({
extended_bounds: {}
});
expect(output.params).to.not.have.property('extended_bounds');

20
src/ui/public/agg_types/__tests__/buckets/_range.js
View file

@ -1,11 +1,11 @@
describe('Range Agg', function () {
var _ = require('lodash');
var ngMock = require('ngMock');
var expect = require('expect.js');
var values = require('lodash').values;
let _ = require('lodash');
let ngMock = require('ngMock');
let expect = require('expect.js');
let values = require('lodash').values;
var resp = require('fixtures/agg_resp/range');
var buckets = values(resp.aggregations[1].buckets);
let resp = require('fixtures/agg_resp/range');
let buckets = values(resp.aggregations[1].buckets);
let range;
let Vis;
@ -17,7 +17,7 @@ describe('Range Agg', function () {
Vis = Private(require('ui/Vis'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
var BytesFormat = Private(require('ui/registry/field_formats')).byId.bytes;
let BytesFormat = Private(require('ui/registry/field_formats')).byId.bytes;
indexPattern.fieldFormatMap.bytes = new BytesFormat({
pattern: '0,0.[000] b'
@ -28,7 +28,7 @@ describe('Range Agg', function () {
describe('formating', function () {
it('formats bucket keys properly', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -45,8 +45,8 @@ describe('Range Agg', function () {
]
});
var agg = vis.aggs.byTypeName.range[0];
var format = function (val) {
let agg = vis.aggs.byTypeName.range[0];
let format = function (val) {
return agg.fieldFormatter()(agg.getKey(val));
};
expect(format(buckets[0])).to.be('-∞ to 1 KB');

28
src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
View file

@ -1,11 +1,11 @@
describe('AggConfig Filters', function () {
describe('date_histogram', function () {
var _ = require('lodash');
var moment = require('moment');
var sinon = require('auto-release-sinon');
var aggResp = require('fixtures/agg_resp/date_histogram');
var ngMock = require('ngMock');
var expect = require('expect.js');
let _ = require('lodash');
let moment = require('moment');
let sinon = require('auto-release-sinon');
let aggResp = require('fixtures/agg_resp/date_histogram');
let ngMock = require('ngMock');
let expect = require('expect.js');
let vis;
let agg;
@ -20,10 +20,10 @@ describe('AggConfig Filters', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
var Vis = Private(require('ui/Vis'));
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
var TimeBuckets = Private(require('ui/time_buckets'));
let Vis = Private(require('ui/Vis'));
let indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
let createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
let TimeBuckets = Private(require('ui/time_buckets'));
intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
init = function (interval, duration) {
@ -46,7 +46,7 @@ describe('AggConfig Filters', function () {
bucketKey = _.sample(aggResp.aggregations['1'].buckets).key;
bucketStart = moment(bucketKey);
var timePad = moment.duration(duration / 2);
let timePad = moment.duration(duration / 2);
agg.buckets.setBounds({
min: bucketStart.clone().subtract(timePad),
max: bucketStart.clone().add(timePad),
@ -63,7 +63,7 @@ describe('AggConfig Filters', function () {
expect(filter).to.have.property('range');
expect(filter.range).to.have.property(field.name);
var fieldParams = filter.range[field.name];
let fieldParams = filter.range[field.name];
expect(fieldParams).to.have.property('gte');
expect(fieldParams.gte).to.be.a('number');
@ -90,8 +90,8 @@ describe('AggConfig Filters', function () {
init(option.val, duration);
var interval = agg.buckets.getInterval();
var params = filter.range[field.name];
let interval = agg.buckets.getInterval();
let params = filter.range[field.name];
expect(params.gte).to.be(+bucketStart);
expect(params.lte).to.be(+bucketStart.clone().add(interval).subtract(1, 'ms'));

12
src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
View file

@ -1,7 +1,7 @@
var moment = require('moment');
var expect = require('expect.js');
var ngMock = require('ngMock');
let moment = require('moment');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('AggConfig Filters', function () {
describe('Date range', function () {
@ -19,7 +19,7 @@ describe('AggConfig Filters', function () {
}));
it('should return a range filter for date_range agg', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -34,8 +34,8 @@ describe('AggConfig Filters', function () {
]
});
var aggConfig = vis.aggs.byTypeName.date_range[0];
var filter = createFilter(aggConfig, 'February 1st, 2015 to February 7th, 2015');
let aggConfig = vis.aggs.byTypeName.date_range[0];
let filter = createFilter(aggConfig, 'February 1st, 2015 to February 7th, 2015');
expect(filter).to.have.property('range');
expect(filter).to.have.property('meta');
expect(filter.meta).to.have.property('index', indexPattern.id);

12
src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
View file

@ -1,7 +1,7 @@
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('AggConfig Filters', function () {
describe('filters', function () {
@ -19,7 +19,7 @@ describe('AggConfig Filters', function () {
}));
it('should return a filters filter', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -35,8 +35,8 @@ describe('AggConfig Filters', function () {
]
});
var aggConfig = vis.aggs.byTypeName.filters[0];
var filter = createFilter(aggConfig, '_type:nginx');
let aggConfig = vis.aggs.byTypeName.filters[0];
let filter = createFilter(aggConfig, '_type:nginx');
expect(_.omit(filter, 'meta')).to.eql(aggConfig.params.filters[1].input);
expect(filter.meta).to.have.property('index', indexPattern.id);

12
src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
View file

@ -1,7 +1,7 @@
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('AggConfig Filters', function () {
describe('histogram', function () {
@ -19,7 +19,7 @@ describe('AggConfig Filters', function () {
}));
it('should return an range filter for histogram', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -30,8 +30,8 @@ describe('AggConfig Filters', function () {
]
});
var aggConfig = vis.aggs.byTypeName.histogram[0];
var filter = createFilter(aggConfig, 2048);
let aggConfig = vis.aggs.byTypeName.histogram[0];
let filter = createFilter(aggConfig, 2048);
expect(filter).to.have.property('meta');
expect(filter.meta).to.have.property('index', indexPattern.id);
expect(filter).to.have.property('range');

16
src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
View file

@ -1,6 +1,6 @@
describe('AggConfig Filters', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('IP range', function () {
let AggConfig;
@ -17,7 +17,7 @@ describe('AggConfig Filters', function () {
}));
it('should return a range filter for ip_range agg', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -36,8 +36,8 @@ describe('AggConfig Filters', function () {
]
});
var aggConfig = vis.aggs.byTypeName.ip_range[0];
var filter = createFilter(aggConfig, '0.0.0.0-1.1.1.1');
let aggConfig = vis.aggs.byTypeName.ip_range[0];
let filter = createFilter(aggConfig, '0.0.0.0-1.1.1.1');
expect(filter).to.have.property('range');
expect(filter).to.have.property('meta');
expect(filter.meta).to.have.property('index', indexPattern.id);
@ -47,7 +47,7 @@ describe('AggConfig Filters', function () {
});
it('should return a range filter for ip_range agg using a CIDR mask', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -66,8 +66,8 @@ describe('AggConfig Filters', function () {
]
});
var aggConfig = vis.aggs.byTypeName.ip_range[0];
var filter = createFilter(aggConfig, '67.129.65.201/27');
let aggConfig = vis.aggs.byTypeName.ip_range[0];
let filter = createFilter(aggConfig, '67.129.65.201/27');
expect(filter).to.have.property('range');
expect(filter).to.have.property('meta');
expect(filter.meta).to.have.property('index', indexPattern.id);

10
src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
View file

@ -1,6 +1,6 @@
describe('AggConfig Filters', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('range', function () {
let AggConfig;
@ -17,7 +17,7 @@ describe('AggConfig Filters', function () {
}));
it('should return a range filter for range agg', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [
{
@ -33,8 +33,8 @@ describe('AggConfig Filters', function () {
]
});
var aggConfig = vis.aggs.byTypeName.range[0];
var filter = createFilter(aggConfig, { gte: 1024, lt: 2048.0 });
let aggConfig = vis.aggs.byTypeName.range[0];
let filter = createFilter(aggConfig, { gte: 1024, lt: 2048.0 });
expect(filter).to.have.property('range');
expect(filter).to.have.property('meta');
expect(filter.meta).to.have.property('index', indexPattern.id);

10
src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
View file

@ -1,6 +1,6 @@
describe('AggConfig Filters', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('terms', function () {
let AggConfig;
@ -17,12 +17,12 @@ describe('AggConfig Filters', function () {
}));
it('should return a match filter for terms', function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
});
var aggConfig = vis.aggs.byTypeName.terms[0];
var filter = createFilter(aggConfig, 'apache');
let aggConfig = vis.aggs.byTypeName.terms[0];
let filter = createFilter(aggConfig, 'apache');
expect(filter).to.have.property('query');
expect(filter.query).to.have.property('match');
expect(filter.query.match).to.have.property('_type');

22
src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
View file

@ -1,8 +1,8 @@
describe('editor', function () {
var _ = require('lodash');
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
let _ = require('lodash');
let $ = require('jquery');
let ngMock = require('ngMock');
let expect = require('expect.js');
let indexPattern;
let vis;
@ -14,7 +14,7 @@ describe('editor', function () {
beforeEach(ngMock.inject(function (Private, $injector, $compile) {
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
var Vis = Private(require('ui/Vis'));
let Vis = Private(require('ui/Vis'));
/**
* Render the AggParams editor for the date histogram aggregation
@ -35,8 +35,8 @@ describe('editor', function () {
]
});
var $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
var $parentScope = $injector.get('$rootScope').$new();
let $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
let $parentScope = $injector.get('$rootScope').$new();
agg = $parentScope.agg = vis.aggs.bySchemaName.segment[0];
$parentScope.groupName = 'buckets';
@ -45,10 +45,10 @@ describe('editor', function () {
$scope = $el.scope();
$scope.$digest();
var $inputs = $('vis-agg-param-editor', $el);
let $inputs = $('vis-agg-param-editor', $el);
return _.transform($inputs.toArray(), function (inputs, e) {
var $el = $(e);
var $scope = $el.scope();
let $el = $(e);
let $scope = $el.scope();
inputs[$scope.aggParam.name] = {
$el: $el,
@ -104,7 +104,7 @@ describe('editor', function () {
expect(params.interval.modelValue().val).to.be('auto');
expect(params.field.modelValue().name).to.be(indexPattern.timeFieldName);
var field = _.find(indexPattern.fields, function (f) {
let field = _.find(indexPattern.fields, function (f) {
return f.type === 'date' && f.name !== indexPattern.timeFieldName;
});

50
src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
View file

@ -1,8 +1,8 @@
describe('params', function () {
var _ = require('lodash');
var moment = require('moment');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let moment = require('moment');
let expect = require('expect.js');
let ngMock = require('ngMock');
let paramWriter;
let writeInterval;
@ -14,9 +14,9 @@ describe('params', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
var AggParamWriter = Private(require('../../AggParamWriter'));
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
var timefilter = $injector.get('timefilter');
let AggParamWriter = Private(require('../../AggParamWriter'));
let indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
let timefilter = $injector.get('timefilter');
timeField = indexPattern.timeFieldName;
aggTypes = Private(require('ui/agg_types/index'));
@ -27,7 +27,7 @@ describe('params', function () {
return paramWriter.write({ interval: interval, field: timeField });
};
var now = moment();
let now = moment();
setTimeBounds = function (n, units) {
timefilter.enabled = true;
timefilter.getBounds = _.constant({
@ -39,24 +39,24 @@ describe('params', function () {
describe('interval', function () {
it('accepts a valid interval', function () {
var output = writeInterval('d');
let output = writeInterval('d');
expect(output.params).to.have.property('interval', '1d');
});
it('ignores invalid intervals', function () {
var output = writeInterval('foo');
let output = writeInterval('foo');
expect(output.params).to.have.property('interval', '0ms');
});
it('automatically picks an interval', function () {
setTimeBounds(15, 'm');
var output = writeInterval('auto');
let output = writeInterval('auto');
expect(output.params.interval).to.be('30s');
});
it('scales up the interval if it will make too many buckets', function () {
setTimeBounds(30, 'm');
var output = writeInterval('s');
let output = writeInterval('s');
expect(output.params.interval).to.be('10s');
expect(output.metricScaleText).to.be('second');
expect(output.metricScale).to.be(0.1);
@ -64,30 +64,30 @@ describe('params', function () {
it('does not scale down the interval', function () {
setTimeBounds(1, 'm');
var output = writeInterval('h');
let output = writeInterval('h');
expect(output.params.interval).to.be('1h');
expect(output.metricScaleText).to.be(undefined);
expect(output.metricScale).to.be(undefined);
});
describe('only scales when all metrics are sum or count', function () {
var tests = [
let tests = [
[ false, 'avg', 'count', 'sum' ],
[ true, 'count', 'sum' ],
[ false, 'count', 'cardinality' ]
];
tests.forEach(function (test) {
var should = test.shift();
var typeNames = test.slice();
let should = test.shift();
let typeNames = test.slice();
it(typeNames.join(', ') + ' should ' + (should ? '' : 'not') + ' scale', function () {
setTimeBounds(1, 'y');
var vis = paramWriter.vis;
let vis = paramWriter.vis;
vis.aggs.splice(0);
var histoConfig = new AggConfig(vis, {
let histoConfig = new AggConfig(vis, {
type: aggTypes.byName.date_histogram,
schema: 'segment',
params: { interval: 's', field: timeField }
@ -102,7 +102,7 @@ describe('params', function () {
}));
});
var output = histoConfig.write();
let output = histoConfig.write();
expect(_.has(output, 'metricScale')).to.be(should);
});
});
@ -111,9 +111,9 @@ describe('params', function () {
describe('extended_bounds', function () {
it('should write a long value if a moment passed in', function () {
var then = moment(0);
var now = moment(500);
var output = paramWriter.write({
let then = moment(0);
let now = moment(500);
let output = paramWriter.write({
extended_bounds: {
min: then,
max: now
@ -129,9 +129,9 @@ describe('params', function () {
});
it('should write a long if a long is passed', function () {
var then = 0;
var now = 500;
var output = paramWriter.write({
let then = 0;
let now = 500;
let output = paramWriter.write({
extended_bounds: {
min: then,
max: now

24
src/ui/public/agg_types/__tests__/controls/number_list.js
View file

@ -1,9 +1,9 @@
describe('NumberList directive', function () {
var $ = require('jquery');
var _ = require('lodash');
var expect = require('expect.js');
var simulateKeys = require('testUtils/simulateKeys');
var ngMock = require('ngMock');
let $ = require('jquery');
let _ = require('lodash');
let expect = require('expect.js');
let simulateKeys = require('testUtils/simulateKeys');
let ngMock = require('ngMock');
require('ui/number_list');
@ -13,15 +13,15 @@ describe('NumberList directive', function () {
function onlyValidValues() {
return $el.find('[ng-model]').toArray().map(function (el) {
var ngModel = $(el).controller('ngModel');
let ngModel = $(el).controller('ngModel');
return ngModel.$valid ? ngModel.$modelValue : undefined;
});
}
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector) {
var $compile = $injector.get('$compile');
var $rootScope = $injector.get('$rootScope');
let $compile = $injector.get('$compile');
let $rootScope = $injector.get('$rootScope');
$scope = $rootScope.$new();
$el = $('<kbn-number-list ng-model="vals">');
@ -75,7 +75,7 @@ describe('NumberList directive', function () {
it('shift-up increases by 0.1', function () {
compile([4.8]);
var seq = [
let seq = [
{
type: 'press',
key: 'shift',
@ -111,7 +111,7 @@ describe('NumberList directive', function () {
it('shift-down decreases by 0.1', function () {
compile([5.1]);
var seq = [
let seq = [
{
type: 'press',
key: 'shift',
@ -135,12 +135,12 @@ describe('NumberList directive', function () {
it('maintains valid number', function () {
compile([9, 11, 13]);
var seq = [
let seq = [
'down', // 10 (11 - 1)
'down' // 10 (limited by 9)
];
var getEl = function () { return $el.find('input').eq(1); };
let getEl = function () { return $el.find('input').eq(1); };
return simulateKeys(getEl, seq)
.then(function () {

4
src/ui/public/agg_types/__tests__/index.js
View file

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

16
src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
View file

@ -1,6 +1,6 @@
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('calculateInterval()', function () {
let AggConfig;
@ -17,15 +17,15 @@ describe('calculateInterval()', function () {
calculateInterval = Private(require('ui/agg_types/param_types/_calculate_interval'));
}));
var testInterval = function (option, expected) {
var msg = 'should return ' + JSON.stringify(expected) + ' for ' + option;
let testInterval = function (option, expected) {
let msg = 'should return ' + JSON.stringify(expected) + ' for ' + option;
it(msg, function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'histogram',
aggs: [ { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp', interval: option } } ]
});
var aggConfig = vis.aggs.byTypeName.date_histogram[0];
var interval = calculateInterval(aggConfig);
let aggConfig = vis.aggs.byTypeName.date_histogram[0];
let interval = calculateInterval(aggConfig);
_.each(expected, function (val, key) {
expect(interval).to.have.property(key, val);
});

8
src/ui/public/agg_types/__tests__/param_types/_field.js
View file

@ -1,7 +1,7 @@
describe('Field', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let BaseAggParam;
let FieldAggParam;
@ -15,7 +15,7 @@ describe('Field', function () {
describe('constructor', function () {
it('it is an instance of BaseAggParam', function () {
var aggParam = new FieldAggParam({
let aggParam = new FieldAggParam({
name: 'field'
});

8
src/ui/public/agg_types/__tests__/param_types/_optioned.js
View file

@ -1,7 +1,7 @@
describe('Optioned', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let BaseAggParam;
let OptionedAggParam;
@ -15,7 +15,7 @@ describe('Optioned', function () {
describe('constructor', function () {
it('it is an instance of BaseAggParam', function () {
var aggParam = new OptionedAggParam({
let aggParam = new OptionedAggParam({
name: 'some_param',
type: 'optioned'
});

16
src/ui/public/agg_types/__tests__/param_types/_raw_json.js
View file

@ -1,10 +1,10 @@
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
module.exports = describe('JSON', function () {
var paramName = 'json_test';
let paramName = 'json_test';
let BaseAggParam;
let JsonAggParam;
let aggParam;
@ -13,7 +13,7 @@ module.exports = describe('JSON', function () {
function initAggParam(config) {
config = config || {};
var defaults = {
let defaults = {
name: paramName,
type: 'json'
};
@ -57,7 +57,7 @@ module.exports = describe('JSON', function () {
});
it('should append param when valid JSON', function () {
var jsonData = JSON.stringify({
let jsonData = JSON.stringify({
new_param: 'should exist in output'
});
@ -73,7 +73,7 @@ module.exports = describe('JSON', function () {
});
it('should not overwrite existing params', function () {
var jsonData = JSON.stringify({
let jsonData = JSON.stringify({
new_param: 'should exist in output',
existing: 'should be used'
});
@ -86,7 +86,7 @@ module.exports = describe('JSON', function () {
});
it('should drop nulled params', function () {
var jsonData = JSON.stringify({
let jsonData = JSON.stringify({
new_param: 'should exist in output',
field: null
});

14
src/ui/public/agg_types/__tests__/param_types/_regex.js
View file

@ -1,7 +1,7 @@
describe('Regex', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
let BaseAggParam;
let RegexAggParam;
@ -19,7 +19,7 @@ describe('Regex', function () {
describe('constructor', function () {
it('should be an instance of BaseAggParam', function () {
var aggParam = new RegexAggParam({
let aggParam = new RegexAggParam({
name: 'some_param',
type: 'regex'
});
@ -32,11 +32,11 @@ describe('Regex', function () {
describe('write results', function () {
let aggParam;
let aggConfig;
var output = { params: {} };
var paramName = 'exclude';
let output = { params: {} };
let paramName = 'exclude';
beforeEach(function () {
var vis = new Vis(indexPattern, {
let vis = new Vis(indexPattern, {
type: 'pie',
aggs: [
{ type: 'terms', schema: 'split', params: { field: 'extension' }},

18
src/ui/public/agg_types/__tests__/param_types/_string.js
View file

@ -1,9 +1,9 @@
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let expect = require('expect.js');
let ngMock = require('ngMock');
module.exports = describe('String', function () {
var paramName = 'json_test';
let paramName = 'json_test';
let BaseAggParam;
let StringAggParam;
let aggParam;
@ -12,7 +12,7 @@ module.exports = describe('String', function () {
function initAggParam(config) {
config = config || {};
var defaults = {
let defaults = {
name: paramName,
type: 'string'
};
@ -40,8 +40,8 @@ module.exports = describe('String', function () {
describe('write', function () {
it('should append param by name', function () {
var paramName = 'testing';
var params = {};
let paramName = 'testing';
let params = {};
params[paramName] = 'some input';
initAggParam({ name: paramName });
@ -53,8 +53,8 @@ module.exports = describe('String', function () {
});
it('should not be in output with empty input', function () {
var paramName = 'more_testing';
var params = {};
let paramName = 'more_testing';
let params = {};
params[paramName] = '';
initAggParam({ name: paramName });

10
src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
View file

@ -1,8 +1,8 @@
var _ = require('lodash');
var sinon = require('auto-release-sinon');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
function ParamClassStub(parent, body) {
var stub = sinon.spy(body || function () {
let stub = sinon.spy(body || function () {
stub.Super && stub.Super.call(this);
});
if (parent) _.class(stub).inherits(parent);
@ -14,7 +14,7 @@ function ParamClassStub(parent, body) {
* This method should be passed directly to ngMock.inject();
*
* ```js
* var stubParamClasses = require('./utils/_stub_agg_params');
* let stubParamClasses = require('./utils/_stub_agg_params');
* describe('something', function () {
* beforeEach(ngMock.inject(stubParamClasses));
* })
@ -24,7 +24,7 @@ function ParamClassStub(parent, body) {
* @return {undefined}
*/
module.exports = function stubParamClasses(Private) {
var BaseAggParam = Private.stub(
let BaseAggParam = Private.stub(
require('ui/agg_types/param_types/base'),
new ParamClassStub(null, function (config) {
_.assign(this, config);

18
src/ui/public/bind/__tests__/bind.js
View file

@ -1,7 +1,7 @@
describe('$scope.$bind', function () {
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let $rootScope;
let $scope;
@ -16,7 +16,7 @@ describe('$scope.$bind', function () {
expect($rootScope.$bind).to.be.a('function');
expect($scope).to.have.property('$bind', $rootScope.$bind);
var $isoScope = $scope.$new(true);
let $isoScope = $scope.$new(true);
expect($isoScope).to.have.property('$bind', $rootScope.$bind);
});
@ -33,7 +33,7 @@ describe('$scope.$bind', function () {
});
it('sets up a binding from the child to the parent scope', function () {
var stub = sinon.stub();
let stub = sinon.stub();
$rootScope.val = 'foo';
$scope.$bind('localVal', 'val');
@ -47,8 +47,8 @@ describe('$scope.$bind', function () {
});
it('pulls from the scopes $parent by default', function () {
var $parent = $rootScope.$new();
var $self = $parent.$new();
let $parent = $rootScope.$new();
let $self = $parent.$new();
$parent.val = 'foo';
$self.val = 'bar';
@ -58,8 +58,8 @@ describe('$scope.$bind', function () {
});
it('accepts an alternate scope to read from', function () {
var $parent = $rootScope.$new();
var $self = $parent.$new();
let $parent = $rootScope.$new();
let $self = $parent.$new();
$parent.val = 'foo';
$self.val = 'bar';

4
src/ui/public/chrome/__tests__/nav_controls.js
View file

@ -36,7 +36,7 @@ describe('chrome nav controls', function () {
};
});
var $el = compile();
let $el = compile();
expect($el.find('#testTemplateEl')).to.have.length(1);
});
@ -63,7 +63,7 @@ describe('chrome nav controls', function () {
};
});
var $el = compile();
let $el = compile();
expect(
$el.find('.testControl')
.toArray()

62
src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
View file

@ -1,15 +1,15 @@
var sinon = require('auto-release-sinon');
var ngMock = require('ngMock');
var $ = require('jquery');
var expect = require('expect.js');
var constant = require('lodash').constant;
var set = require('lodash').set;
var cloneDeep = require('lodash').cloneDeep;
var indexBy = require('lodash').indexBy;
let sinon = require('auto-release-sinon');
let ngMock = require('ngMock');
let $ = require('jquery');
let expect = require('expect.js');
let constant = require('lodash').constant;
let set = require('lodash').set;
let cloneDeep = require('lodash').cloneDeep;
let indexBy = require('lodash').indexBy;
require('ui/chrome');
require('../app_switcher');
var DomLocationProvider = require('ui/domLocation');
let DomLocationProvider = require('ui/domLocation');
describe('appSwitcher directive', function () {
let env;
@ -18,7 +18,7 @@ describe('appSwitcher directive', function () {
function setup(href, links) {
return ngMock.inject(function ($window, $rootScope, $compile, Private) {
var domLocation = Private(DomLocationProvider);
let domLocation = Private(DomLocationProvider);
$rootScope.chrome = {
getNavLinks: constant(cloneDeep(links)),
@ -46,14 +46,14 @@ describe('appSwitcher directive', function () {
}
context('when one link is for the active app', function () {
var myLink = {
let myLink = {
active: true,
title: 'myLink',
url: 'http://localhost:555/app/myApp',
lastSubUrl: 'http://localhost:555/app/myApp#/lastSubUrl'
};
var notMyLink = {
let notMyLink = {
active: false,
title: 'notMyLink',
url: 'http://localhost:555/app/notMyApp',
@ -63,27 +63,27 @@ describe('appSwitcher directive', function () {
beforeEach(setup('http://localhost:5555/app/myApp/', [myLink, notMyLink]));
it('links to the inactive apps base url', function () {
var $myLink = env.$el.findTestSubject('appLink').eq(0);
let $myLink = env.$el.findTestSubject('appLink').eq(0);
expect($myLink.prop('href')).to.be(myLink.url);
expect($myLink.prop('href')).to.not.be(myLink.lastSubUrl);
});
it('links to the inactive apps last sub url', function () {
var $notMyLink = env.$el.findTestSubject('appLink').eq(1);
let $notMyLink = env.$el.findTestSubject('appLink').eq(1);
expect($notMyLink.prop('href')).to.be(notMyLink.lastSubUrl);
expect($notMyLink.prop('href')).to.not.be(notMyLink.url);
});
});
context('when none of the links are for the active app', function () {
var myLink = {
let myLink = {
active: false,
title: 'myLink',
url: 'http://localhost:555/app/myApp',
lastSubUrl: 'http://localhost:555/app/myApp#/lastSubUrl'
};
var notMyLink = {
let notMyLink = {
active: false,
title: 'notMyLink',
url: 'http://localhost:555/app/notMyApp',
@ -93,9 +93,9 @@ describe('appSwitcher directive', function () {
beforeEach(setup('http://localhost:5555/app/myApp/', [myLink, notMyLink]));
it('links to the lastSubUrl for each', function () {
var $links = env.$el.findTestSubject('appLink');
var $myLink = $links.eq(0);
var $notMyLink = $links.eq(1);
let $links = env.$el.findTestSubject('appLink');
let $myLink = $links.eq(0);
let $notMyLink = $links.eq(1);
expect($myLink.prop('href')).to.be(myLink.lastSubUrl);
expect($myLink.prop('href')).to.not.be(myLink.url);
@ -106,19 +106,19 @@ describe('appSwitcher directive', function () {
});
context('clicking a link with matching href but missing hash', function () {
var url = 'http://localhost:555/app/myApp?query=1';
let url = 'http://localhost:555/app/myApp?query=1';
beforeEach(setup(url + '#/lastSubUrl', [
{ url: url }
]));
it('just prevents propogation (no reload)', function () {
var event = new $.Event('click');
let event = new $.Event('click');
expect(env.location.reload.callCount).to.be(0);
expect(event.isDefaultPrevented()).to.be(false);
expect(event.isPropagationStopped()).to.be(false);
var $link = env.$el.findTestSubject('appLink');
let $link = env.$el.findTestSubject('appLink');
expect($link.prop('href')).to.be(url);
$link.trigger(event);
@ -129,19 +129,19 @@ describe('appSwitcher directive', function () {
});
context('clicking a link that matches entire url', function () {
var url = 'http://localhost:555/app/myApp#/lastSubUrl';
let url = 'http://localhost:555/app/myApp#/lastSubUrl';
beforeEach(setup(url, [
{ url: url }
]));
it('calls window.location.reload and prevents propogation', function () {
var event = new $.Event('click');
let event = new $.Event('click');
expect(env.location.reload.callCount).to.be(0);
expect(event.isDefaultPrevented()).to.be(false);
expect(event.isPropagationStopped()).to.be(false);
var $link = env.$el.findTestSubject('appLink');
let $link = env.$el.findTestSubject('appLink');
expect($link.prop('href')).to.be(env.currentHref);
$link.trigger(event);
@ -152,21 +152,21 @@ describe('appSwitcher directive', function () {
});
context('clicking a link with matching href but changed hash', function () {
var rootUrl = 'http://localhost:555/app/myApp?query=1';
var url = rootUrl + '#/lastSubUrl2';
let rootUrl = 'http://localhost:555/app/myApp?query=1';
let url = rootUrl + '#/lastSubUrl2';
beforeEach(setup(url + '#/lastSubUrl', [
{ url: url }
]));
it('calls window.location.reload and prevents propogation', function () {
var event = new $.Event('click');
let event = new $.Event('click');
expect(env.location.reload.callCount).to.be(0);
expect(event.isDefaultPrevented()).to.be(false);
expect(event.isPropagationStopped()).to.be(false);
var $link = env.$el.findTestSubject('appLink');
let $link = env.$el.findTestSubject('appLink');
expect($link.prop('href')).to.be(url);
$link.trigger(event);
@ -185,7 +185,7 @@ describe('appSwitcher directive', function () {
]));
it('allows click through', function () {
var event = new $.Event('click');
let event = new $.Event('click');
expect(env.location.reload.callCount).to.be(0);
expect(event.isPropagationStopped()).to.be(false);
@ -206,7 +206,7 @@ describe('appSwitcher directive', function () {
]));
it('allows click through', function () {
var event = new $.Event('click');
let event = new $.Event('click');
expect(env.location.reload.callCount).to.be(0);
expect(event.isPropagationStopped()).to.be(false);

18
src/ui/public/config/__tests__/config.js
View file

@ -2,8 +2,8 @@ describe('config component', function () {
let $scope;
let config;
let defaults;
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector, Private) {
@ -19,8 +19,8 @@ describe('config component', function () {
});
it('reads from the defaults', function () {
var initial = config.get('dateFormat');
var newDefault = initial + '- new';
let initial = config.get('dateFormat');
let newDefault = initial + '- new';
defaults.dateFormat.value = newDefault;
expect(config.get('dateFormat')).to.be(newDefault);
});
@ -30,7 +30,7 @@ describe('config component', function () {
describe('#set', function () {
it('stores a value in the config val set', function () {
var initial = config.get('dateFormat');
let initial = config.get('dateFormat');
config.set('dateFormat', 'notaformat');
expect(config.get('dateFormat')).to.be('notaformat');
});
@ -40,21 +40,21 @@ describe('config component', function () {
describe('#$bind', function () {
it('binds a config key to a $scope property', function () {
var dateFormat = config.get('dateFormat');
let dateFormat = config.get('dateFormat');
config.$bind($scope, 'dateFormat');
expect($scope).to.have.property('dateFormat', dateFormat);
});
it('alows overriding the property name', function () {
var dateFormat = config.get('dateFormat');
let dateFormat = config.get('dateFormat');
config.$bind($scope, 'dateFormat', 'defaultDateFormat');
expect($scope).to.not.have.property('dateFormat');
expect($scope).to.have.property('defaultDateFormat', dateFormat);
});
it('keeps the property up to date', function () {
var dateFormat = config.get('dateFormat');
var newDateFormat = dateFormat + ' NEW NEW NEW!';
let dateFormat = config.get('dateFormat');
let newDateFormat = dateFormat + ' NEW NEW NEW!';
config.$bind($scope, 'dateFormat');
expect($scope).to.have.property('dateFormat', dateFormat);

10
src/ui/public/courier/data_source/__tests__/decorate_query.js
View file

@ -1,10 +1,10 @@
var moment = require('moment');
var expect = require('expect.js');
var ngMock = require('ngMock');
let moment = require('moment');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('Query decorator', function () {
var _ = require('lodash');
let _ = require('lodash');
let config;
let indexPattern;
@ -17,7 +17,7 @@ describe('Query decorator', function () {
function ($provide) {
// Super simple config stub
$provide.service('config', function () {
var keys = {};
let keys = {};
return {
get: function (key) { return keys[key]; },
set: function (key, value) { keys[key] = value; }

34
src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
View file

@ -2,8 +2,8 @@
describe('SearchSource#normalizeSortRequest', function () {
require('ui/private');
var ngMock = require('ngMock');
var expect = require('expect.js');
let ngMock = require('ngMock');
let expect = require('expect.js');
let normalizeSortRequest;
let indexPattern;
@ -23,8 +23,8 @@ describe('SearchSource#normalizeSortRequest', function () {
}));
it('should return an array', function () {
var sortable = { someField: 'desc'};
var result = normalizeSortRequest(sortable, indexPattern);
let sortable = { someField: 'desc'};
let result = normalizeSortRequest(sortable, indexPattern);
expect(result).to.be.an(Array);
expect(result).to.eql(normalizedSort);
// ensure object passed in is not mutated
@ -33,27 +33,27 @@ describe('SearchSource#normalizeSortRequest', function () {
});
it('should make plain string sort into the more verbose format', function () {
var result = normalizeSortRequest([{ someField: 'desc'}], indexPattern);
let result = normalizeSortRequest([{ someField: 'desc'}], indexPattern);
expect(result).to.eql(normalizedSort);
});
it('should append default sort options', function () {
var sortState = [{
let sortState = [{
someField: {
order: 'desc',
unmapped_type: 'boolean'
}
}];
var result = normalizeSortRequest(sortState, indexPattern);
let result = normalizeSortRequest(sortState, indexPattern);
expect(result).to.eql(normalizedSort);
});
it('should enable script based sorting', function () {
var fieldName = 'script string';
var direction = 'desc';
var indexField = indexPattern.fields.byName[fieldName];
let fieldName = 'script string';
let direction = 'desc';
let indexField = indexPattern.fields.byName[fieldName];
var sortState = {};
let sortState = {};
sortState[fieldName] = direction;
normalizedSort = {
_script: {
@ -63,7 +63,7 @@ describe('SearchSource#normalizeSortRequest', function () {
}
};
var result = normalizeSortRequest(sortState, indexPattern);
let result = normalizeSortRequest(sortState, indexPattern);
expect(result).to.eql([normalizedSort]);
sortState[fieldName] = { order: direction };
@ -72,18 +72,18 @@ describe('SearchSource#normalizeSortRequest', function () {
});
it('should use script based sorting only on sortable types', function () {
var fieldName = 'script murmur3';
var direction = 'asc';
var indexField = indexPattern.fields.byName[fieldName];
let fieldName = 'script murmur3';
let direction = 'asc';
let indexField = indexPattern.fields.byName[fieldName];
var sortState = {};
let sortState = {};
sortState[fieldName] = direction;
normalizedSort = {};
normalizedSort[fieldName] = {
order: direction,
unmapped_type: 'boolean'
};
var result = normalizeSortRequest([sortState], indexPattern);
let result = normalizeSortRequest([sortState], indexPattern);
expect(result).to.eql([normalizedSort]);
});

10
src/ui/public/courier/fetch/__tests__/doc.js
View file

@ -1,8 +1,8 @@
describe('Courier DocFetchRequest class', function () {
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let storage;
let source;
@ -13,8 +13,8 @@ describe('Courier DocFetchRequest class', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, Promise, $injector) {
var DocSource = Private(require('ui/courier/data_source/doc_source'));
var DocFetchRequest = Private(require('ui/courier/fetch/request/doc'));
let DocSource = Private(require('ui/courier/data_source/doc_source'));
let DocFetchRequest = Private(require('ui/courier/fetch/request/doc'));
storage =
$injector.get('localStorage').store =

2
src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
View file

@ -28,7 +28,7 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => {
const req = new SegmentedReq(new MockSource());
req._queueCreated = null;
var promise = req._createQueue();
let promise = req._createQueue();
expect(req._queueCreated).to.be(false);
await promise;
expect(req._queueCreated).to.be(true);

22
src/ui/public/debounce/__tests__/debounce.js
View file

@ -1,7 +1,7 @@
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let debounce;
let $timeout;
@ -27,14 +27,14 @@ describe('debounce service', function () {
describe('API', function () {
it('should have a cancel method', function () {
var bouncer = debounce(function () {}, 100);
let bouncer = debounce(function () {}, 100);
expect(bouncer).to.have.property('cancel');
});
});
describe('delayed execution', function () {
it('should delay execution', function () {
var bouncer = debounce(spy, 100);
let bouncer = debounce(spy, 100);
bouncer();
expect(spy.callCount).to.be(0);
$timeout.flush();
@ -42,7 +42,7 @@ describe('debounce service', function () {
});
it('should fire on leading edge', function () {
var bouncer = debounce(spy, 100, { leading: true });
let bouncer = debounce(spy, 100, { leading: true });
bouncer();
expect(spy.callCount).to.be(1);
$timeout.flush();
@ -50,7 +50,7 @@ describe('debounce service', function () {
});
it('should only fire on leading edge', function () {
var bouncer = debounce(spy, 100, { leading: true, trailing: false });
let bouncer = debounce(spy, 100, { leading: true, trailing: false });
bouncer();
expect(spy.callCount).to.be(1);
$timeout.flush();
@ -58,8 +58,8 @@ describe('debounce service', function () {
});
it('should reset delayed execution', function (done) {
var cancelSpy = sinon.spy($timeout, 'cancel');
var bouncer = debounce(spy, 100);
let cancelSpy = sinon.spy($timeout, 'cancel');
let bouncer = debounce(spy, 100);
bouncer();
setTimeout(function () {
bouncer();
@ -74,8 +74,8 @@ describe('debounce service', function () {
describe('cancel', function () {
it('should cancel the $timeout', function () {
var cancelSpy = sinon.spy($timeout, 'cancel');
var bouncer = debounce(spy, 100);
let cancelSpy = sinon.spy($timeout, 'cancel');
let bouncer = debounce(spy, 100);
bouncer();
bouncer.cancel();
expect(cancelSpy.callCount).to.be(1);

16
src/ui/public/directives/__tests__/auto_select_if_only_one.js
View file

@ -1,22 +1,22 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/auto_select_if_only_one');
describe('Auto-select if only one directive', function () {
let $compile;
let $rootScope;
var zeroOptions = [];
var oneOption = [{label: 'foo'}];
var multiOptions = [{label: 'foo'}, {label: 'bar'}];
let zeroOptions = [];
let oneOption = [{label: 'foo'}];
let multiOptions = [{label: 'foo'}, {label: 'bar'}];
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
var html = '<select ng-model="value" ng-options="option.name for option in options" auto-select-if-only-one="options"></select>';
let html = '<select ng-model="value" ng-options="option.name for option in options" auto-select-if-only-one="options"></select>';
$compile(html)($rootScope);
$rootScope.value = null;
}));
@ -41,7 +41,7 @@ describe('Auto-select if only one directive', function () {
it('should still auto select if the collection contains 2 items but is filtered to 1', function () {
$rootScope.options = multiOptions;
var html = '<select ng-model="value" ng-options="option.name for option in options | filter:{label:\'bar\'}" ' +
let html = '<select ng-model="value" ng-options="option.name for option in options | filter:{label:\'bar\'}" ' +
'auto-select-if-only-one="options | filter:{label:\'bar\'}"></select>';
$compile(html)($rootScope);
$rootScope.value = null;

22
src/ui/public/directives/__tests__/config.js
View file

@ -1,14 +1,14 @@
var ngMock = require('ngMock');
var $ = require('jquery');
var assign = require('lodash').assign;
var expect = require('expect.js');
let ngMock = require('ngMock');
let $ = require('jquery');
let assign = require('lodash').assign;
let expect = require('expect.js');
describe('Config Directive', function () {
var build = function () {};
let build = function () {};
beforeEach(ngMock.module('kibana', function ($compileProvider) {
var renderCount = 0;
let renderCount = 0;
$compileProvider.directive('renderCounter', function () {
return {
link: function ($scope, $el) {
@ -21,8 +21,8 @@ describe('Config Directive', function () {
beforeEach(ngMock.inject(function ($compile, $rootScope) {
build = function (attrs, scopeVars) {
var $el = $('<config>').attr(attrs);
var $scope = $rootScope.$new();
let $el = $('<config>').attr(attrs);
let $scope = $rootScope.$new();
assign($scope, scopeVars || {});
$compile($el)($scope);
$scope.$digest();
@ -32,12 +32,12 @@ describe('Config Directive', function () {
}));
it('renders it\'s config template', function () {
var $config = build({ 'config-template': '"<uniqel></uniqel>"' });
let $config = build({ 'config-template': '"<uniqel></uniqel>"' });
expect($config.find('uniqel').size()).to.be(1);
});
it('exposes an object a config object using it\'s name', function () {
var $config = build(
let $config = build(
{
'config-template': '"<uniqel>{{ controller.name }}</uniqel>"',
'config-object': 'controller',
@ -53,7 +53,7 @@ describe('Config Directive', function () {
});
it('only renders the config-template once', function () {
var $config = build({ 'config-template': '"<div render-counter></div>"' });
let $config = build({ 'config-template': '"<div render-counter></div>"' });
expect($config.find('[render-counter]').text()).to.be('1');
});
});

12
src/ui/public/directives/__tests__/confirm-click.js
View file

@ -1,8 +1,8 @@
var angular = require('angular');
var $ = require('jquery');
var sinon = require('sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let $ = require('jquery');
let sinon = require('sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/confirm_click');
require('plugins/kibana/discover/index');
@ -13,7 +13,7 @@ let $scope;
let $elem;
var init = function (text) {
let init = function (text) {
// Load the application
ngMock.module('kibana');

10
src/ui/public/directives/__tests__/css_truncate.js
View file

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

36
src/ui/public/directives/__tests__/fixedScroll.js
View file

@ -1,15 +1,15 @@
require('ui/fixedScroll');
var expect = require('expect.js');
var ngMock = require('ngMock');
let expect = require('expect.js');
let ngMock = require('ngMock');
describe('FixedScroll directive', function () {
var $ = require('jquery');
var sinon = require('auto-release-sinon');
var Promise = require('bluebird');
let $ = require('jquery');
let sinon = require('auto-release-sinon');
let Promise = require('bluebird');
let compile;
var trash = [];
let trash = [];
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($compile, $rootScope) {
@ -19,7 +19,7 @@ describe('FixedScroll directive', function () {
// since the directive works at the sibling level we create a
// parent for everything to happen in
var $parent = $('<div>').css({
let $parent = $('<div>').css({
position: 'fixed',
top: 0,
left: 0,
@ -30,12 +30,12 @@ describe('FixedScroll directive', function () {
$parent.appendTo(document.body);
trash.push($parent);
var $el = $('<div fixed-scroll></div>').css({
let $el = $('<div fixed-scroll></div>').css({
'overflow-x': 'auto',
'width': $parent.width()
}).appendTo($parent);
var $content = $('<div>').css({
let $content = $('<div>').css({
width: $parent.width() * ratioX,
height: $parent.height() * ratioY
}).appendTo($el);
@ -59,7 +59,7 @@ describe('FixedScroll directive', function () {
});
it('does nothing when not needed', function () {
var els = compile(0.5, 1.5);
let els = compile(0.5, 1.5);
expect(els.$scroller).to.have.length(0);
els = compile(1.5, 0.5);
@ -67,26 +67,26 @@ describe('FixedScroll directive', function () {
});
it('attaches a scroller below the element when the content is larger then the container', function () {
var els = compile(1.5);
let els = compile(1.5);
expect(els.$scroller).to.have.length(1);
});
it('copies the width of the container', function () {
var els = compile(1.5);
let els = compile(1.5);
expect(els.$scroller.width()).to.be(els.$container.width());
});
it('mimics the scrollWidth of the element', function () {
var els = compile(1.5);
let els = compile(1.5);
expect(els.$scroller.prop('scrollWidth')).to.be(els.$container.prop('scrollWidth'));
});
describe('scroll event handling / tug of war prevention', function () {
it('listens when needed, unlistens when not needed', function () {
var on = sinon.spy($.fn, 'on');
var off = sinon.spy($.fn, 'off');
let on = sinon.spy($.fn, 'on');
let off = sinon.spy($.fn, 'off');
var els = compile(1.5);
let els = compile(1.5);
expect(on.callCount).to.be(2);
checkThisVals('$.fn.on', on);
@ -130,12 +130,12 @@ describe('FixedScroll directive', function () {
expect(spy.callCount).to.be(2);
// first call should read the scrollLeft from the $container
var firstCall = spy.getCall(0);
let firstCall = spy.getCall(0);
expect(firstCall.thisValue.is($from)).to.be(true);
expect(firstCall.args).to.eql([]);
// second call should be setting the scrollLeft on the $scroller
var secondCall = spy.getCall(1);
let secondCall = spy.getCall(1);
expect(secondCall.thisValue.is($to)).to.be(true);
expect(secondCall.args).to.eql([firstCall.returnValue]);
});

6
src/ui/public/directives/__tests__/inequality.js
View file

@ -1,6 +1,6 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/inequality');
describe('greater_than model validator directive', function () {

10
src/ui/public/directives/__tests__/input_focus.js
View file

@ -1,7 +1,7 @@
var angular = require('angular');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let $ = require('jquery');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/input_focus');
describe('Input focus directive', function () {
@ -12,7 +12,7 @@ describe('Input focus directive', function () {
let $el;
let selectedEl;
let selectedText;
var inputValue = 'Input Text Value';
let inputValue = 'Input Text Value';
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_, _$timeout_) {

12
src/ui/public/directives/__tests__/input_whole_number.js
View file

@ -1,12 +1,12 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/input_whole_number');
describe('Whole number input directive', function () {
let $compile;
let $rootScope;
var html = '<input type="text" ng-model="value" input-whole-number />';
let html = '<input type="text" ng-model="value" input-whole-number />';
beforeEach(ngMock.module('kibana'));
@ -16,7 +16,7 @@ describe('Whole number input directive', function () {
}));
it('should allow whole numbers', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = '123';
$rootScope.$digest();
@ -32,7 +32,7 @@ describe('Whole number input directive', function () {
});
it('should disallow numbers with decimals', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = '123.0';
$rootScope.$digest();

12
src/ui/public/directives/__tests__/json_input.js
View file

@ -1,13 +1,13 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/json_input');
describe('JSON input validation', function () {
let $compile;
let $rootScope;
var html = '<input ng-model="value" json-input require-keys=true />';
let html = '<input ng-model="value" json-input require-keys=true />';
let element;
beforeEach(ngMock.module('kibana'));
@ -28,8 +28,8 @@ describe('JSON input validation', function () {
});
it('should be able to not require keys', function () {
var html = '<input ng-model="value" json-input require-keys=false />';
var element = $compile(html)($rootScope);
let html = '<input ng-model="value" json-input require-keys=false />';
let element = $compile(html)($rootScope);
element.val('{}');
element.trigger('input');

18
src/ui/public/directives/__tests__/parse_query.js
View file

@ -1,7 +1,7 @@
var angular = require('angular');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
// Load the kibana app dependencies.
require('ui/parse_query');
@ -15,12 +15,12 @@ let config;
let $elemScope;
let $elem;
var cycleIndex = 0;
var markup = '<input ng-model="mockModel" parse-query input-focus type="text">';
let cycleIndex = 0;
let markup = '<input ng-model="mockModel" parse-query input-focus type="text">';
let fromUser;
var toUser = require('ui/parse_query/lib/to_user');
let toUser = require('ui/parse_query/lib/to_user');
var init = function () {
let init = function () {
// Load the application
ngMock.module('kibana');
@ -40,7 +40,7 @@ var init = function () {
});
};
var compile = function () {
let compile = function () {
$rootScope.mockModel = 'cycle' + cycleIndex++;
$rootScope.mockQueryInput = undefined;

10
src/ui/public/directives/__tests__/spinner.js
View file

@ -1,7 +1,7 @@
var angular = require('angular');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let $ = require('jquery');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('plugins/kibana/discover/index');
@ -11,7 +11,7 @@ let $scope;
let $elem;
var init = function () {
let init = function () {
// Load the application
ngMock.module('kibana');

34
src/ui/public/directives/__tests__/timepicker.js
View file

@ -1,10 +1,10 @@
var angular = require('angular');
var moment = require('moment');
var expect = require('expect.js');
var _ = require('lodash');
var $ = require('jquery');
var sinon = require('auto-release-sinon');
var ngMock = require('ngMock');
let angular = require('angular');
let moment = require('moment');
let expect = require('expect.js');
let _ = require('lodash');
let $ = require('jquery');
let sinon = require('auto-release-sinon');
let ngMock = require('ngMock');
require('plugins/kibana/visualize/index');
require('plugins/kibana/dashboard/index');
@ -17,10 +17,10 @@ let $parentScope;
let $scope;
let $elem;
var anchor = '2014-01-01T06:06:06.666Z';
let anchor = '2014-01-01T06:06:06.666Z';
let clock;
var init = function () {
let init = function () {
// Load the application
ngMock.module('kibana');
@ -34,7 +34,7 @@ var init = function () {
$parentScope = $rootScope;
// Add some parameters to it
var timefilter = {
let timefilter = {
time : {
from: moment().subtract(15, 'minutes'),
to: moment(),
@ -174,7 +174,7 @@ describe('timepicker directive', function () {
expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be('quick');
// Each of the 3 modes
var modes = ['absolute', 'relative', 'quick'];
let modes = ['absolute', 'relative', 'quick'];
_.each(modes, function (mode) {
$scope.setMode(mode);
$scope.$digest();
@ -215,7 +215,7 @@ describe('timepicker directive', function () {
});
it('has a preview of the "from" input', function (done) {
var preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.preview"]');
let preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.preview"]');
expect(preview.text()).to.be(moment().subtract(15, 'minutes').format($scope.format));
done();
});
@ -226,7 +226,7 @@ describe('timepicker directive', function () {
});
it('has a submit handler', function (done) {
var form = $elem.find('form[ng-submit="applyRelative()"]');
let form = $elem.find('form[ng-submit="applyRelative()"]');
expect(form.length).to.be(1);
done();
});
@ -247,7 +247,7 @@ describe('timepicker directive', function () {
});
it('has a dropdown bound to relative.unit that contains all of the intervals', function (done) {
var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
let select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
expect(select.length).to.be(1);
expect(select.find('option').length).to.be(7);
@ -259,7 +259,7 @@ describe('timepicker directive', function () {
});
it('has a checkbox that is checked when rounding is enabled', function (done) {
var checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.round"]');
let checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.round"]');
expect(checkbox.length).to.be(1);
// Rounding is disabled by default
@ -335,8 +335,8 @@ describe('timepicker directive', function () {
});
it('updates the input fields when the scope variables are changed', function (done) {
var input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
let input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
let select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
$scope.relative.count = 5;
$scope.$digest();

10
src/ui/public/directives/__tests__/truncate.js
View file

@ -1,7 +1,7 @@
var angular = require('angular');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let $ = require('jquery');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('plugins/kibana/discover/index');
@ -11,7 +11,7 @@ let $scope;
let $elem;
var init = function (text) {
let init = function (text) {
// Load the application
ngMock.module('kibana');

34
src/ui/public/directives/__tests__/typeahead.js
View file

@ -1,14 +1,14 @@
var angular = require('angular');
var sinon = require('sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let sinon = require('sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/typeahead');
// TODO: This should not be needed, timefilter is only included here, it should move
require('plugins/kibana/discover/index');
var typeaheadHistoryCount = 10;
var typeaheadName = 'unittest';
let typeaheadHistoryCount = 10;
let typeaheadName = 'unittest';
let $parentScope;
let $typeaheadScope;
let $elem;
@ -16,13 +16,13 @@ let $typeaheadInputScope;
let typeaheadCtrl;
let PersistedLog;
var markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
let markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
'<input type="text" placeholder="Filter..." class="form-control" ng-model="query" kbn-typeahead-input>' +
'<kbn-typeahead-items></kbn-typeahead-items>' +
'</div>';
var typeaheadItems = ['abc', 'def', 'ghi'];
let typeaheadItems = ['abc', 'def', 'ghi'];
var init = function () {
let init = function () {
// Load the application
ngMock.module('kibana');
@ -64,7 +64,7 @@ var init = function () {
describe('typeahead directive', function () {
describe('typeahead requirements', function () {
describe('missing input', function () {
var goodMarkup = markup;
let goodMarkup = markup;
before(function () {
markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
@ -99,9 +99,9 @@ describe('typeahead directive', function () {
});
it('should not save empty entries', function () {
var entries = typeaheadItems.slice(0);
let entries = typeaheadItems.slice(0);
entries.push('', 'jkl');
for (var i = 0; i < entries.length; i++) {
for (let i = 0; i < entries.length; i++) {
$typeaheadScope.inputModel.$setViewValue(entries[i]);
typeaheadCtrl.persistEntry();
}
@ -129,14 +129,14 @@ describe('typeahead directive', function () {
});
it('should order fitlered results', function () {
var entries = ['ac/dc', 'anthrax', 'abba', 'phantogram', 'skrillex'];
var allEntries = typeaheadItems.concat(entries);
var startMatches = allEntries.filter(function (item) {
let entries = ['ac/dc', 'anthrax', 'abba', 'phantogram', 'skrillex'];
let allEntries = typeaheadItems.concat(entries);
let startMatches = allEntries.filter(function (item) {
return /^a/.test(item);
});
typeaheadCtrl.history.add.returns(allEntries);
for (var i = 0; i < entries.length; i++) {
for (let i = 0; i < entries.length; i++) {
$typeaheadScope.inputModel.$setViewValue(entries[i]);
typeaheadCtrl.persistEntry();
}
@ -144,7 +144,7 @@ describe('typeahead directive', function () {
typeaheadCtrl.filterItemsByQuery('a');
expect($typeaheadScope.filteredItems).to.contain('phantogram');
var nonStarterIndex = $typeaheadScope.filteredItems.indexOf('phantogram');
let nonStarterIndex = $typeaheadScope.filteredItems.indexOf('phantogram');
startMatches.forEach(function (item) {
expect($typeaheadScope.filteredItems).to.contain(item);

14
src/ui/public/directives/__tests__/validate_cidr_mask.js
View file

@ -1,13 +1,13 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/validate_cidr_mask');
describe('Validate CIDR mask directive', function () {
let $compile;
let $rootScope;
var html = '<input type="text" ng-model="value" validate-cidr-mask />';
let html = '<input type="text" ng-model="value" validate-cidr-mask />';
beforeEach(ngMock.module('kibana'));
@ -17,7 +17,7 @@ describe('Validate CIDR mask directive', function () {
}));
it('should allow empty input', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = '';
$rootScope.$digest();
@ -33,7 +33,7 @@ describe('Validate CIDR mask directive', function () {
});
it('should allow valid CIDR masks', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = '0.0.0.0/1';
$rootScope.$digest();
@ -53,7 +53,7 @@ describe('Validate CIDR mask directive', function () {
});
it('should disallow invalid CIDR masks', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = 'hello, world';
$rootScope.$digest();

14
src/ui/public/directives/__tests__/validate_date_math.js
View file

@ -1,13 +1,13 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/validate_date_math');
describe('Validate date math directive', function () {
let $compile;
let $rootScope;
var html = '<input type="text" ng-model="value" validate-date-math />';
let html = '<input type="text" ng-model="value" validate-date-math />';
beforeEach(ngMock.module('kibana'));
@ -17,7 +17,7 @@ describe('Validate date math directive', function () {
}));
it('should allow valid date math', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = 'now';
$rootScope.$digest();
@ -41,7 +41,7 @@ describe('Validate date math directive', function () {
});
it('should disallow invalid date math', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = 'hello, world';
$rootScope.$digest();
@ -61,7 +61,7 @@ describe('Validate date math directive', function () {
});
it('should allow empty values', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = '';
$rootScope.$digest();

18
src/ui/public/directives/__tests__/validate_index_name.js
View file

@ -1,6 +1,6 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
// Load the kibana app dependencies.
require('ui/directives/validate_index_name');
@ -8,7 +8,7 @@ require('ui/directives/validate_index_name');
describe('Validate index name directive', function () {
let $compile;
let $rootScope;
var html = '<input type="text" ng-model="indexName" validate-index-name />';
let html = '<input type="text" ng-model="indexName" validate-index-name />';
beforeEach(ngMock.module('kibana'));
@ -19,12 +19,12 @@ describe('Validate index name directive', function () {
function checkPattern(input) {
$rootScope.indexName = input;
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.$digest();
return element;
}
var badPatterns = [
let badPatterns = [
null,
undefined,
'',
@ -41,7 +41,7 @@ describe('Validate index name directive', function () {
'foo,bar',
];
var goodPatterns = [
let goodPatterns = [
'...',
'foo',
'foo.bar',
@ -53,7 +53,7 @@ describe('Validate index name directive', function () {
badPatterns.forEach(function (pattern) {
it('should not accept index pattern: ' + pattern, function () {
var element = checkPattern(pattern);
let element = checkPattern(pattern);
expect(element.hasClass('ng-invalid')).to.be(true);
expect(element.hasClass('ng-valid')).to.not.be(true);
});
@ -61,7 +61,7 @@ describe('Validate index name directive', function () {
goodPatterns.forEach(function (pattern) {
it('should accept index pattern: ' + pattern, function () {
var element = checkPattern(pattern);
let element = checkPattern(pattern);
expect(element.hasClass('ng-invalid')).to.not.be(true);
expect(element.hasClass('ng-valid')).to.be(true);
});

14
src/ui/public/directives/__tests__/validate_ip.js
View file

@ -1,13 +1,13 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/directives/validate_ip');
describe('Validate IP directive', function () {
let $compile;
let $rootScope;
var html = '<input type="text" ng-model="value" validate-ip />';
let html = '<input type="text" ng-model="value" validate-ip />';
beforeEach(ngMock.module('kibana'));
@ -17,7 +17,7 @@ describe('Validate IP directive', function () {
}));
it('should allow empty input', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = '';
$rootScope.$digest();
@ -33,7 +33,7 @@ describe('Validate IP directive', function () {
});
it('should allow valid IP addresses', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = '0.0.0.0';
$rootScope.$digest();
@ -53,7 +53,7 @@ describe('Validate IP directive', function () {
});
it('should disallow invalid IP addresses', function () {
var element = $compile(html)($rootScope);
let element = $compile(html)($rootScope);
$rootScope.value = 'hello, world';
$rootScope.$digest();

18
src/ui/public/directives/__tests__/validate_json.js
View file

@ -1,6 +1,6 @@
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let ngMock = require('ngMock');
// Load the kibana app dependencies.
require('ui/directives/validate_json');
@ -8,23 +8,23 @@ require('ui/directives/validate_json');
let $parentScope;
let $elemScope;
let $elem;
var mockScope = '';
let mockScope = '';
var input = {
let input = {
valid: '{ "test": "json input" }',
invalid: 'strings are not json'
};
var markup = {
let markup = {
textarea: '<textarea ng-model="mockModel" validate-json></textarea>',
input: '<input type="text" ng-model="mockModel" validate-json>'
};
var init = function (type) {
let init = function (type) {
// Load the application
ngMock.module('kibana');
type = type || 'input';
var elMarkup = markup[type];
let elMarkup = markup[type];
// Create the scope
ngMock.inject(function ($injector, $rootScope, $compile) {
@ -39,7 +39,7 @@ var init = function (type) {
};
describe('validate-json directive', function () {
var checkValid = function (inputVal, className) {
let checkValid = function (inputVal, className) {
$parentScope.mockModel = inputVal;
$elem.scope().$digest();
expect($elem.hasClass(className)).to.be(true);

18
src/ui/public/doc_table/__tests__/doc_table.js
View file

@ -1,10 +1,10 @@
var angular = require('angular');
var expect = require('expect.js');
var $ = require('jquery');
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var searchResponse = require('fixtures/search_response');
var ngMock = require('ngMock');
let angular = require('angular');
let expect = require('expect.js');
let $ = require('jquery');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let searchResponse = require('fixtures/search_response');
let ngMock = require('ngMock');
// Load the kibana app dependencies.
require('ui/private');
@ -22,7 +22,7 @@ let $timeout;
let searchSource;
var init = function ($elem, props) {
let init = function ($elem, props) {
ngMock.inject(function ($rootScope, $compile, _$timeout_) {
$timeout = _$timeout_;
$parentScope = $rootScope;
@ -40,7 +40,7 @@ var init = function ($elem, props) {
});
};
var destroy = function () {
let destroy = function () {
$scope.$destroy();
$parentScope.$destroy();
};

8
src/ui/public/doc_table/__tests__/lib/get_sort.js
View file

@ -1,7 +1,7 @@
var getSort = require('ui/doc_table/lib/get_sort');
var defaultSort = {time: 'desc'};
var expect = require('expect.js');
var ngMock = require('ngMock');
let getSort = require('ui/doc_table/lib/get_sort');
let defaultSort = {time: 'desc'};
let expect = require('expect.js');
let ngMock = require('ngMock');
let indexPattern;
describe('docTable', function () {

62
src/ui/public/doc_table/__tests__/lib/rows_headers.js
View file

@ -1,10 +1,10 @@
var angular = require('angular');
var $ = require('jquery');
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
var getFakeRow = require('fixtures/fake_row');
let angular = require('angular');
let $ = require('jquery');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let getFakeRow = require('fixtures/fake_row');
describe('Doc Table', function () {
require('plugins/kibana/discover/index');
@ -27,7 +27,7 @@ describe('Doc Table', function () {
}));
// Sets up the directive, take an element, and a list of properties to attach to the parent scope.
var init = function ($elem, props) {
let init = function ($elem, props) {
ngMock.inject(function ($compile) {
_.assign($parentScope, props);
$compile($elem)($parentScope);
@ -36,17 +36,17 @@ describe('Doc Table', function () {
});
};
var destroy = function () {
let destroy = function () {
$scope.$destroy();
$parentScope.$destroy();
};
// For testing column removing/adding for the header and the rows
//
var columnTests = function (elemType, parentElem) {
let columnTests = function (elemType, parentElem) {
it('should create a time column if the timefield is defined', function (done) {
var childElems = parentElem.find(elemType);
let childElems = parentElem.find(elemType);
expect(childElems.length).to.be(2);
done();
});
@ -78,7 +78,7 @@ describe('Doc Table', function () {
delete parentElem.scope().indexPattern.timeFieldName;
parentElem.scope().$digest();
var childElems = parentElem.find(elemType);
let childElems = parentElem.find(elemType);
expect(childElems.length).to.be(1);
done();
});
@ -88,7 +88,7 @@ describe('Doc Table', function () {
describe('kbnTableHeader', function () {
var $elem = angular.element(
let $elem = angular.element(
'<thead kbn-table-header columns="columns" index-pattern="indexPattern" sort="sort"></thead>'
);
@ -119,7 +119,7 @@ describe('Doc Table', function () {
});
it('should sort asc by default, then by desc if already sorting', function (done) {
var fields = ['bytes', '@timestamp'];
let fields = ['bytes', '@timestamp'];
// Should not be sorted at first
expect($scope.sorting).to.eql(undefined);
@ -200,7 +200,7 @@ describe('Doc Table', function () {
});
describe('kbnTableRow', function () {
var $elem = angular.element(
let $elem = angular.element(
'<tr kbn-table-row="row" ' +
'columns="columns" ' +
'sorting="sorting"' +
@ -269,7 +269,7 @@ describe('Doc Table', function () {
describe('kbnTableRow meta', function () {
var $elem = angular.element(
let $elem = angular.element(
'<tr kbn-table-row="row" ' +
'columns="columns" ' +
'sorting="sorting"' +
@ -280,7 +280,7 @@ describe('Doc Table', function () {
let $details;
beforeEach(function () {
var row = getFakeRow(0, mapping);
let row = getFakeRow(0, mapping);
mapping._id = {indexed: true, type: 'string'};
row._source._id = 'foo';
@ -353,7 +353,7 @@ describe('Doc Table', function () {
$root.columns.push('bytes');
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(4);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);
@ -366,7 +366,7 @@ describe('Doc Table', function () {
$root.columns.push('request_body');
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(5);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);
@ -384,7 +384,7 @@ describe('Doc Table', function () {
];
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(6);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);
@ -399,7 +399,7 @@ describe('Doc Table', function () {
_.pull($root.columns, '_source');
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(2);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);
@ -410,14 +410,14 @@ describe('Doc Table', function () {
$root.columns.push('@timestamp');
$root.$apply();
var $mid = $row.find('td');
let $mid = $row.find('td');
expect($mid).to.have.length(4);
$root.columns.pop();
$root.columns.pop();
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(2);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);
@ -428,7 +428,7 @@ describe('Doc Table', function () {
$root.columns.push('@timestamp', 'bytes');
$root.$apply();
var $mid = $row.find('td');
let $mid = $row.find('td');
expect($mid).to.have.length(5);
$root.columns[0] = false; // _source
@ -436,7 +436,7 @@ describe('Doc Table', function () {
$root.columns = $root.columns.filter(Boolean);
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(3);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);
@ -450,7 +450,7 @@ describe('Doc Table', function () {
$root.columns.push('request_body');
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(4);
expect($after.eq(2).text().trim()).to.match(/^bytes_formatted/);
expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
@ -460,13 +460,13 @@ describe('Doc Table', function () {
$root.columns.push('bytes');
$root.$apply();
var $mid = $row.find('td');
let $mid = $row.find('td');
expect($mid).to.have.length(4);
$root.columns.reverse();
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(4);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);
@ -478,13 +478,13 @@ describe('Doc Table', function () {
$root.columns.push('bytes', 'response', '@timestamp');
$root.$apply();
var $mid = $row.find('td');
let $mid = $row.find('td');
expect($mid).to.have.length(6);
$root.columns.reverse();
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(6);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);
@ -498,7 +498,7 @@ describe('Doc Table', function () {
$root.columns.push('bytes', 'bytes', 'bytes');
$root.$apply();
var $after = $row.find('td');
let $after = $row.find('td');
expect($after).to.have.length(6);
expect($after[0]).to.be($before[0]);
expect($after[1]).to.be($before[1]);

14
src/ui/public/doc_title/__tests__/doc_title.js
View file

@ -1,11 +1,11 @@
describe('docTitle Service', function () {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let initialDocTitle;
var MAIN_TITLE = 'Kibana 4';
let MAIN_TITLE = 'Kibana 4';
let docTitle;
let $rootScope;
@ -35,9 +35,9 @@ describe('docTitle Service', function () {
describe('setup', function () {
it('resets the title when a route change begins', function () {
var spy = $rootScope.$on;
let spy = $rootScope.$on;
var found = spy.args.some(function (args) {
let found = spy.args.some(function (args) {
return args[0] === '$routeChangeStart' && args[1] === docTitle.reset;
});

36
src/ui/public/doc_viewer/__tests__/doc_viewer.js
View file

@ -1,10 +1,10 @@
var angular = require('angular');
var $ = require('jquery');
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
var hit = {
let angular = require('angular');
let $ = require('jquery');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let hit = {
'_index': 'logstash-2014.09.09',
'_type': 'apache',
'_id': '61',
@ -35,7 +35,7 @@ let indexPattern;
let flattened;
var init = function ($elem, props) {
let init = function ($elem, props) {
ngMock.inject(function ($rootScope, $compile) {
$parentScope = $rootScope;
_.assign($parentScope, props);
@ -45,7 +45,7 @@ var init = function ($elem, props) {
});
};
var destroy = function () {
let destroy = function () {
$scope.$destroy();
$parentScope.$destroy();
};
@ -73,7 +73,7 @@ describe('docViewer', function () {
describe('Table mode', function () {
it('should have a row for each field', function () {
var rows = $elem.find('tr');
let rows = $elem.find('tr');
expect($elem.find('tr').length).to.be(_.keys(flattened).length);
});
@ -85,7 +85,7 @@ describe('docViewer', function () {
it('should have the a value for each field', function () {
_.each(_.keys(flattened), function (field) {
var cellValue = $elem.find('td[title="' + field + '"]').siblings().find('.doc-viewer-value').text();
let cellValue = $elem.find('td[title="' + field + '"]').siblings().find('.doc-viewer-value').text();
// This sucks, but testing the filter chain is too hairy ATM
expect(cellValue.length).to.be.greaterThan(0);
@ -95,7 +95,7 @@ describe('docViewer', function () {
describe('filtering', function () {
it('should apply a filter when clicking filterable fields', function () {
var cell = $elem.find('td[title="bytes"]').next();
let cell = $elem.find('td[title="bytes"]').next();
cell.find('.fa-search-plus').first().click();
expect($scope.filter.calledOnce).to.be(true);
@ -104,7 +104,7 @@ describe('docViewer', function () {
});
it('should NOT apply a filter when clicking non-filterable fields', function () {
var cell = $elem.find('td[title="area"]').next();
let cell = $elem.find('td[title="area"]').next();
cell.find('.fa-search-plus').first().click();
expect($scope.filter.calledOnce).to.be(false);
@ -115,21 +115,21 @@ describe('docViewer', function () {
describe('warnings', function () {
it('displays a warning about field name starting with underscore', function () {
var cells = $elem.find('td[title="_underscore"]').siblings();
let cells = $elem.find('td[title="_underscore"]').siblings();
expect(cells.find('.doc-viewer-underscore').length).to.be(1);
expect(cells.find('.doc-viewer-no-mapping').length).to.be(0);
expect(cells.find('.doc-viewer-object-array').length).to.be(0);
});
it('displays a warning about missing mappings', function () {
var cells = $elem.find('td[title="noMapping"]').siblings();
let cells = $elem.find('td[title="noMapping"]').siblings();
expect(cells.find('.doc-viewer-underscore').length).to.be(0);
expect(cells.find('.doc-viewer-no-mapping').length).to.be(1);
expect(cells.find('.doc-viewer-object-array').length).to.be(0);
});
it('displays a warning about objects in arrays', function () {
var cells = $elem.find('td[title="objectArray"]').siblings();
let cells = $elem.find('td[title="objectArray"]').siblings();
expect(cells.find('.doc-viewer-underscore').length).to.be(0);
expect(cells.find('.doc-viewer-no-mapping').length).to.be(0);
expect(cells.find('.doc-viewer-object-array').length).to.be(1);
@ -152,8 +152,8 @@ describe('docViewer', function () {
});
it('should contain the same code as hitJson', function () {
var editor = window.ace.edit($elem.find('div[id="json-ace"]')[0]);
var code = editor.getSession().getValue();
let editor = window.ace.edit($elem.find('div[id="json-ace"]')[0]);
let code = editor.getSession().getValue();
expect(code).to.equal($scope.hitJson);
});
});

24
src/ui/public/factories/__tests__/base_object.js
View file

@ -1,8 +1,8 @@
var angular = require('angular');
var _ = require('lodash');
var sinon = require('sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let _ = require('lodash');
let sinon = require('sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/private');
describe('Base Object', function () {
@ -16,31 +16,31 @@ describe('Base Object', function () {
}));
it('should take an inital set of values', function () {
var baseObject = new BaseObject({ message: 'test' });
let baseObject = new BaseObject({ message: 'test' });
expect(baseObject).to.have.property('message', 'test');
});
it('should serialize _attributes to RISON', function () {
var baseObject = new BaseObject();
let baseObject = new BaseObject();
baseObject.message = 'Testing... 1234';
var rison = baseObject.toRISON();
let rison = baseObject.toRISON();
expect(rison).to.equal('(message:\'Testing... 1234\')');
});
it('should not serialize $$attributes to RISON', function () {
var baseObject = new BaseObject();
let baseObject = new BaseObject();
baseObject.$$attributes = { foo: 'bar' };
baseObject.message = 'Testing... 1234';
var rison = baseObject.toRISON();
let rison = baseObject.toRISON();
expect(rison).to.equal('(message:\'Testing... 1234\')');
});
it('should serialize _attributes for JSON', function () {
var baseObject = new BaseObject();
let baseObject = new BaseObject();
baseObject.message = 'Testing... 1234';
baseObject._private = 'foo';
baseObject.$private = 'stuff';
var json = JSON.stringify(baseObject);
let json = JSON.stringify(baseObject);
expect(json).to.equal('{"message":"Testing... 1234"}');
});

66
src/ui/public/factories/__tests__/events.js
View file

@ -1,9 +1,9 @@
var angular = require('angular');
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
let angular = require('angular');
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
require('ui/private');
describe('Events', function () {
@ -23,8 +23,8 @@ describe('Events', function () {
}));
it('should handle on events', function () {
var obj = new Events();
var prom = obj.on('test', function (message) {
let obj = new Events();
let prom = obj.on('test', function (message) {
expect(message).to.equal('Hello World');
});
@ -38,9 +38,9 @@ describe('Events', function () {
function MyEventedObject() {
MyEventedObject.Super.call(this);
}
var obj = new MyEventedObject();
let obj = new MyEventedObject();
var prom = obj.on('test', function (message) {
let prom = obj.on('test', function (message) {
expect(message).to.equal('Hello World');
});
@ -50,7 +50,7 @@ describe('Events', function () {
});
it('should clear events when off is called', function () {
var obj = new Events();
let obj = new Events();
obj.on('test', _.noop);
expect(obj._listeners).to.have.property('test');
expect(obj._listeners.test).to.have.length(1);
@ -59,9 +59,9 @@ describe('Events', function () {
});
it('should clear a specific handler when off is called for an event', function () {
var obj = new Events();
var handler1 = sinon.stub();
var handler2 = sinon.stub();
let obj = new Events();
let handler1 = sinon.stub();
let handler2 = sinon.stub();
obj.on('test', handler1);
obj.on('test', handler2);
expect(obj._listeners).to.have.property('test');
@ -75,8 +75,8 @@ describe('Events', function () {
});
it('should clear a all handlers when off is called for an event', function () {
var obj = new Events();
var handler1 = sinon.stub();
let obj = new Events();
let handler1 = sinon.stub();
obj.on('test', handler1);
expect(obj._listeners).to.have.property('test');
obj.off('test');
@ -89,11 +89,11 @@ describe('Events', function () {
});
it('should handle mulitple identical emits in the same tick', function () {
var obj = new Events();
var handler1 = sinon.stub();
let obj = new Events();
let handler1 = sinon.stub();
obj.on('test', handler1);
var emits = [
let emits = [
obj.emit('test', 'one'),
obj.emit('test', 'two'),
obj.emit('test', 'three')
@ -110,9 +110,9 @@ describe('Events', function () {
});
it('should handle emits from the handler', function () {
var obj = new Events();
var secondEmit = Promise.defer();
var handler1 = sinon.spy(function () {
let obj = new Events();
let secondEmit = Promise.defer();
let handler1 = sinon.spy(function () {
if (handler1.calledTwice) {
return;
}
@ -132,12 +132,12 @@ describe('Events', function () {
});
it('should only emit to handlers registered before emit is called', function () {
var obj = new Events();
var handler1 = sinon.stub();
var handler2 = sinon.stub();
let obj = new Events();
let handler1 = sinon.stub();
let handler2 = sinon.stub();
obj.on('test', handler1);
var emits = [
let emits = [
obj.emit('test', 'one'),
obj.emit('test', 'two'),
obj.emit('test', 'three')
@ -149,7 +149,7 @@ describe('Events', function () {
obj.on('test', handler2);
var emits2 = [
let emits2 = [
obj.emit('test', 'four'),
obj.emit('test', 'five'),
obj.emit('test', 'six')
@ -164,9 +164,9 @@ describe('Events', function () {
});
it('should pass multiple arguments from the emitter', function () {
var obj = new Events();
var handler = sinon.stub();
var payload = [
let obj = new Events();
let handler = sinon.stub();
let payload = [
'one',
{ hello: 'tests' },
null
@ -182,8 +182,8 @@ describe('Events', function () {
});
it('should preserve the scope of the handler', function () {
var obj = new Events();
var expected = 'some value';
let obj = new Events();
let expected = 'some value';
let testValue;
function handler(arg1, arg2) {
@ -199,9 +199,9 @@ describe('Events', function () {
});
it('should always emit in the same order', function () {
var handler = sinon.stub();
let handler = sinon.stub();
var obj = new Events();
let obj = new Events();
obj.on('block', _.partial(handler, 'block'));
obj.on('last', _.partial(handler, 'last'));

6
src/ui/public/fancy_forms/__tests__/fancy_forms.js
View file

@ -1,6 +1,6 @@
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
let $ = require('jquery');
let ngMock = require('ngMock');
let expect = require('expect.js');
describe('fancy forms', function () {
let $el;

14
src/ui/public/field_editor/__tests__/field_editor.js
View file

@ -1,7 +1,7 @@
describe('FieldEditor directive', function () {
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
let $ = require('jquery');
let ngMock = require('ngMock');
let expect = require('expect.js');
let Field;
let StringFormat;
@ -38,7 +38,7 @@ describe('FieldEditor directive', function () {
it('exposes $scope.editor, a controller for the editor', function () {
compile();
var editor = $scope.editor;
let editor = $scope.editor;
expect(editor).to.be.an('object');
});
});
@ -78,8 +78,8 @@ describe('FieldEditor directive', function () {
});
it('reflects changes to the index patterns field', function () {
var a = {};
var b = {};
let a = {};
let b = {};
actual.script = a;
expect(field.script).to.be(a);
@ -89,7 +89,7 @@ describe('FieldEditor directive', function () {
});
it('is fully mutable, unlike the index patterns field', function () {
var origName = actual.name;
let origName = actual.name;
actual.name = 'john';
expect(actual.name).to.not.be('john');
expect(actual.name).to.be(origName);

24
src/ui/public/filter_bar/__tests__/_addFilters.js
View file

@ -1,10 +1,10 @@
describe('add filters', function () {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
var MockState = require('fixtures/mock_state');
var storeNames = {
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let MockState = require('fixtures/mock_state');
let storeNames = {
app: 'appState',
global: 'globalState'
};
@ -87,7 +87,7 @@ describe('add filters', function () {
});
it('should fire the update and fetch events', function () {
var emitSpy = sinon.spy(queryFilter, 'emit');
let emitSpy = sinon.spy(queryFilter, 'emit');
// set up the watchers, add new filters, and crank the digest loop
$rootScope.$digest();
@ -108,7 +108,7 @@ describe('add filters', function () {
describe('filter reconciliation', function () {
it('should de-dupe appState filters being added', function () {
var newFilter = _.cloneDeep(filters[1]);
let newFilter = _.cloneDeep(filters[1]);
appState.filters = filters;
$rootScope.$digest();
expect(appState.filters.length).to.be(3);
@ -119,7 +119,7 @@ describe('add filters', function () {
});
it('should de-dupe globalState filters being added', function () {
var newFilter = _.cloneDeep(filters[1]);
let newFilter = _.cloneDeep(filters[1]);
globalState.filters = filters;
$rootScope.$digest();
expect(globalState.filters.length).to.be(3);
@ -130,16 +130,16 @@ describe('add filters', function () {
});
it('should mutate global filters on appState filter changes', function () {
var idx = 1;
let idx = 1;
globalState.filters = filters;
$rootScope.$digest();
var appFilter = _.cloneDeep(filters[idx]);
let appFilter = _.cloneDeep(filters[idx]);
appFilter.meta.negate = true;
queryFilter.addFilters(appFilter);
$rootScope.$digest();
var res = queryFilter.getFilters();
let res = queryFilter.getFilters();
expect(res).to.have.length(3);
_.each(res, function (filter, i) {
expect(filter.$state.store).to.be('globalState');

38
src/ui/public/filter_bar/__tests__/_getFilters.js
View file

@ -1,9 +1,9 @@
describe('get filters', function () {
var _ = require('lodash');
var ngMock = require('ngMock');
var expect = require('expect.js');
var MockState = require('fixtures/mock_state');
var storeNames = {
let _ = require('lodash');
let ngMock = require('ngMock');
let expect = require('expect.js');
let MockState = require('fixtures/mock_state');
let storeNames = {
app: 'appState',
global: 'globalState'
};
@ -49,12 +49,12 @@ describe('get filters', function () {
globalState.filters = [filters[1]];
// global filters should be listed first
var res = queryFilter.getFilters();
let res = queryFilter.getFilters();
expect(res[0]).to.eql(filters[1]);
expect(res[1]).to.eql(filters[0]);
// should return updated version of filters
var newFilter = { query: { match: { '_type': { query: 'nginx', type: 'phrase' } } } };
let newFilter = { query: { match: { '_type': { query: 'nginx', type: 'phrase' } } } };
appState.filters.push(newFilter);
res = queryFilter.getFilters();
@ -65,13 +65,13 @@ describe('get filters', function () {
appState.filters = [filters[0]];
globalState.filters = [filters[1]];
var res = queryFilter.getFilters();
let res = queryFilter.getFilters();
expect(res[0].$state.store).to.be(storeNames.global);
expect(res[1].$state.store).to.be(storeNames.app);
});
it('should return non-null filters from specific states', function () {
var states = [
let states = [
[ globalState, queryFilter.getGlobalFilters ],
[ appState, queryFilter.getAppFilters ],
];
@ -80,14 +80,14 @@ describe('get filters', function () {
state[0].filters = filters.slice(0);
expect(state[0].filters).to.contain(null);
var res = state[1]();
let res = state[1]();
expect(res.length).to.be(state[0].filters.length);
expect(state[0].filters).to.not.contain(null);
});
});
it('should replace the state, not save it', function () {
var states = [
let states = [
[ globalState, queryFilter.getGlobalFilters ],
[ appState, queryFilter.getAppFilters ],
];
@ -101,7 +101,7 @@ describe('get filters', function () {
expect(state[0].replace.called).to.be(false);
state[0].filters = filters.slice(0);
var res = state[1]();
let res = state[1]();
expect(state[0].save.called).to.be(false);
expect(state[0].replace.called).to.be(true);
});
@ -130,11 +130,11 @@ describe('get filters', function () {
it('should skip appState filters that match globalState filters', function () {
globalState.filters = filters;
var appFilter = _.cloneDeep(filters[1]);
let appFilter = _.cloneDeep(filters[1]);
appState.filters.push(appFilter);
// global filters should be listed first
var res = queryFilter.getFilters();
let res = queryFilter.getFilters();
expect(res).to.have.length(3);
_.each(res, function (filter) {
expect(filter.$state.store).to.be('globalState');
@ -143,12 +143,12 @@ describe('get filters', function () {
it('should append conflicting appState filters', function () {
globalState.filters = filters;
var appFilter = _.cloneDeep(filters[1]);
let appFilter = _.cloneDeep(filters[1]);
appFilter.meta.negate = true;
appState.filters.push(appFilter);
// global filters should be listed first
var res = queryFilter.getFilters();
let res = queryFilter.getFilters();
expect(res).to.have.length(4);
expect(res.filter(function (filter) {
return filter.$state.store === storeNames.global;
@ -161,17 +161,17 @@ describe('get filters', function () {
it('should not affect disabled filters', function () {
// test adding to globalState
globalState.filters = _.map(filters, function (filter) {
var f = _.cloneDeep(filter);
let f = _.cloneDeep(filter);
f.meta.disabled = true;
return f;
});
_.each(filters, function (filter) { globalState.filters.push(filter); });
var res = queryFilter.getFilters();
let res = queryFilter.getFilters();
expect(res).to.have.length(6);
// test adding to appState
globalState.filters = _.map(filters, function (filter) {
var f = _.cloneDeep(filter);
let f = _.cloneDeep(filter);
f.meta.disabled = true;
return f;
});

14
src/ui/public/filter_bar/__tests__/_invertFilters.js
View file

@ -1,10 +1,10 @@
describe('invert filters', function () {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
var MockState = require('fixtures/mock_state');
var storeNames = {
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let MockState = require('fixtures/mock_state');
let storeNames = {
app: 'appState',
global: 'globalState'
};
@ -75,7 +75,7 @@ describe('invert filters', function () {
});
it('should fire the update and fetch events', function () {
var emitSpy = sinon.spy(queryFilter, 'emit');
let emitSpy = sinon.spy(queryFilter, 'emit');
appState.filters = filters;
// set up the watchers

24
src/ui/public/filter_bar/__tests__/_pinFilters.js
View file

@ -1,10 +1,10 @@
describe('pin filters', function () {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
var MockState = require('fixtures/mock_state');
var storeNames = {
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let MockState = require('fixtures/mock_state');
let storeNames = {
app: 'appState',
global: 'globalState'
};
@ -86,7 +86,7 @@ describe('pin filters', function () {
});
it('should move filter from appState to globalState', function () {
var filter = appState.filters[1];
let filter = appState.filters[1];
queryFilter.pinFilter(filter);
expect(globalState.filters).to.contain(filter);
@ -95,7 +95,7 @@ describe('pin filters', function () {
});
it('should move filter from globalState to appState', function () {
var filter = globalState.filters[1];
let filter = globalState.filters[1];
queryFilter.pinFilter(filter);
expect(appState.filters).to.contain(filter);
@ -105,8 +105,8 @@ describe('pin filters', function () {
it('should only fire the update event', function () {
var emitSpy = sinon.spy(queryFilter, 'emit');
var filter = appState.filters[1];
let emitSpy = sinon.spy(queryFilter, 'emit');
let filter = appState.filters[1];
$rootScope.$digest();
queryFilter.pinFilter(filter);
@ -130,8 +130,8 @@ describe('pin filters', function () {
});
it('should swap the filters in both states', function () {
var appSample = _.sample(appState.filters);
var globalSample = _.sample(globalState.filters);
let appSample = _.sample(appState.filters);
let globalSample = _.sample(globalState.filters);
queryFilter.pinAll();
expect(globalState.filters).to.have.length(5);

16
src/ui/public/filter_bar/__tests__/_removeFilters.js
View file

@ -1,10 +1,10 @@
describe('remove filters', function () {
var _ = require('lodash');
var sinon = require('auto-release-sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
var MockState = require('fixtures/mock_state');
var storeNames = {
let _ = require('lodash');
let sinon = require('auto-release-sinon');
let expect = require('expect.js');
let ngMock = require('ngMock');
let MockState = require('fixtures/mock_state');
let storeNames = {
app: 'appState',
global: 'globalState'
};
@ -68,7 +68,7 @@ describe('remove filters', function () {
});
it('should fire the update and fetch events', function () {
var emitSpy = sinon.spy(queryFilter, 'emit');
let emitSpy = sinon.spy(queryFilter, 'emit');
appState.filters = filters;
$rootScope.$digest();
@ -115,7 +115,7 @@ describe('remove filters', function () {
appState.filters.push(filters[2]);
$rootScope.$digest();
var missedFilter = _.cloneDeep(filters[0]);
let missedFilter = _.cloneDeep(filters[0]);
missedFilter.meta = {
negate: !filters[0].meta.negate
};

Some files were not shown because too many files have changed in this diff Show more