[aggConfig/tests] use new fieldFormats registry

This commit is contained in:
Spencer Alger 2015-04-03 09:56:11 -07:00
parent ed02f00c47
commit 60d05b39e5

View file

@ -6,9 +6,7 @@ define(function (require) {
var AggType;
var AggConfig;
var indexPattern;
var dateFormat;
var stringFormat;
var numberFormat;
var fieldFormat;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
@ -16,10 +14,7 @@ define(function (require) {
AggType = Private(require('components/agg_types/_agg_type'));
AggConfig = Private(require('components/vis/_agg_config'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
dateFormat = indexPattern.fields.byName['@timestamp'].format.convert;
stringFormat = indexPattern.fields.byName.extension.format.convert;
numberFormat = indexPattern.fields.byName.bytes.format.convert;
fieldFormat = Private(require('registry/field_formats'));
}));
describe('#toDsl', function () {
@ -232,8 +227,8 @@ define(function (require) {
]
});
expect(vis.aggs[0].fieldFormatter()).to.be(numberFormat);
expect(vis.aggs[1].fieldFormatter()).to.be(stringFormat);
expect(vis.aggs[0].fieldFormatter()).to.be(fieldFormat.for('number'));
expect(vis.aggs[1].fieldFormatter()).to.be(fieldFormat.for('string'));
});
it('returns number formatter for metrics on strings', function () {
@ -253,8 +248,8 @@ define(function (require) {
]
});
expect(vis.aggs[0].fieldFormatter()).to.be(numberFormat);
expect(vis.aggs[1].fieldFormatter()).to.be(stringFormat);
expect(vis.aggs[0].fieldFormatter()).to.be(fieldFormat.for('number'));
expect(vis.aggs[1].fieldFormatter()).to.be(fieldFormat.for('string'));
});
it('returns date formatter for metrics on date fields', function () {
@ -274,8 +269,8 @@ define(function (require) {
]
});
expect(vis.aggs[0].fieldFormatter()).to.be(dateFormat);
expect(vis.aggs[1].fieldFormatter()).to.be(dateFormat);
expect(vis.aggs[0].fieldFormatter()).to.be(fieldFormat.for('date'));
expect(vis.aggs[1].fieldFormatter()).to.be(fieldFormat.for('date'));
});
it('returns the string format if the field does not have a format', function () {
@ -292,7 +287,7 @@ define(function (require) {
var agg = vis.aggs[0];
agg.params.field = { type: 'date', format: null };
expect(agg.fieldFormatter()).to.be(stringFormat);
expect(agg.fieldFormatter()).to.be(fieldFormat.for('string'));
});
@ -310,8 +305,8 @@ define(function (require) {
var agg = vis.aggs[0];
delete agg.params.field;
expect(agg.fieldFormatter()).to.be(stringFormat);
expect(agg.fieldFormatter()).to.be(fieldFormat.for('string'));
});
});
}];
});
});