simplified tests

This commit is contained in:
Stéphane Campinas 2016-10-11 10:29:11 +01:00
parent be44e905af
commit 43767f0929
No known key found for this signature in database
GPG key ID: 8272664236A42C2F
2 changed files with 30 additions and 132 deletions

View file

@ -145,7 +145,8 @@ uiModules
const fieldTypes = param.filterFieldTypes;
if (fieldTypes) {
fields = $filter('fieldType')(fields, _.isFunction(fieldTypes) ? fieldTypes.bind(this, $scope.agg.vis) : fieldTypes);
const filter = _.isFunction(fieldTypes) ? fieldTypes.bind(this, $scope.agg.vis) : fieldTypes;
fields = $filter('fieldType')(fields, filter);
fields = $filter('orderBy')(fields, ['type', 'name']);
}

View file

@ -2,160 +2,57 @@ import expect from 'expect.js';
import propFilter from 'ui/filters/_prop_filter';
describe('prop filter', function () {
let nameFilter;
beforeEach(function () {
nameFilter = propFilter('name');
});
function getObjects(...names) {
const count = new Map();
const objects = [];
for (let name of names) {
if (!count.has(name)) {
count.set(name, 1);
}
objects.push({
name: name,
title: `${name} ${count.get(name)}`
});
count.set(name, count.get(name) + 1);
}
return objects;
}
it('should keep only the tables', function () {
const objects = [
{
name: 'table',
title: 'table 1'
},
{
name: 'table',
title: 'table 2'
},
{
name: 'pie',
title: 'pie 1'
}
];
expect(nameFilter(objects, 'table')).to.eql([
{
name: 'table',
title: 'table 1'
},
{
name: 'table',
title: 'table 2'
}
]);
const objects = getObjects('table', 'table', 'pie');
expect(nameFilter(objects, 'table')).to.eql(getObjects('table', 'table'));
});
it('should support comma-separated values', function () {
const objects = [
{
name: 'table',
title: 'table 1'
},
{
name: 'line',
title: 'line 1'
},
{
name: 'pie',
title: 'pie 1'
}
];
expect(nameFilter(objects, 'table,line')).to.eql([
{
name: 'table',
title: 'table 1'
},
{
name: 'line',
title: 'line 1'
}
]);
const objects = getObjects('table', 'line', 'pie');
expect(nameFilter(objects, 'table,line')).to.eql(getObjects('table', 'line'));
});
it('should support an array of values', function () {
const objects = [
{
name: 'table',
title: 'table 1'
},
{
name: 'line',
title: 'line 1'
},
{
name: 'pie',
title: 'pie 1'
}
];
expect(nameFilter(objects, [ 'table', 'line' ])).to.eql([
{
name: 'table',
title: 'table 1'
},
{
name: 'line',
title: 'line 1'
}
]);
const objects = getObjects('table', 'line', 'pie');
expect(nameFilter(objects, [ 'table', 'line' ])).to.eql(getObjects('table', 'line'));
});
it('should return all objects', function () {
const objects = [
{
name: 'table',
title: 'table 1'
},
{
name: 'line',
title: 'line 1'
},
{
name: 'pie',
title: 'pie 1'
}
];
const objects = getObjects('table', 'line', 'pie');
expect(nameFilter(objects, '*')).to.eql(objects);
});
it('should allow negation', function () {
const objects = [
{
name: 'table',
title: 'table 1'
},
{
name: 'line',
title: 'line 1'
},
{
name: 'pie',
title: 'pie 1'
}
];
expect(nameFilter(objects, [ '!line' ])).to.eql([
{
name: 'table',
title: 'table 1'
},
{
name: 'pie',
title: 'pie 1'
}
]);
const objects = getObjects('table', 'line', 'pie');
expect(nameFilter(objects, [ '!line' ])).to.eql(getObjects('table', 'pie'));
});
it('should support a function for specifying what should be kept', function () {
const objects = [
{
name: 'table',
title: 'table 1'
},
{
name: 'line',
title: 'line 1'
},
{
name: 'pie',
title: 'pie 1'
}
];
const objects = getObjects('table', 'line', 'pie');
const line = (value) => value === 'line';
expect(nameFilter(objects, line)).to.eql([
{
name: 'line',
title: 'line 1'
}
]);
expect(nameFilter(objects, line)).to.eql(getObjects('line'));
});
});