cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix assertions, now MapCofig.getLayer() return {} if layer not found

Browse Source
This commit is contained in:
Daniel García Aubert 2017-03-16 16:44:41 +01:00 committed by Ubuntu
parent 5f87417d9e
commit 024f1e4851
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/integration/mapconfig_named_layers_datasource.js
View File

@ -145,7 +145,7 @@ describe('named_layers datasources', function() {
assert.equal(layers[0].type, 'cartodb'); assert.equal(layers[0].type, 'cartodb');
assert.equal(layers[0].options.sql, wadusSql); assert.equal(layers[0].options.sql, wadusSql);
assert.equal(datasource.getLayerDatasource(0), undefined); assert.deepEqual(datasource.getLayerDatasource(0), {});
done(); done();
} }
@ -160,7 +160,7 @@ describe('named_layers datasources', function() {
assert.equal(layers[0].type, 'cartodb'); assert.equal(layers[0].type, 'cartodb');
assert.equal(layers[0].options.sql, wadusSql); assert.equal(layers[0].options.sql, wadusSql);
assert.equal(datasource.getLayerDatasource(0), undefined); assert.deepEqual(datasource.getLayerDatasource(0), {});
assert.equal(layers[1].type, 'cartodb'); assert.equal(layers[1].type, 'cartodb');
assert.equal(layers[1].options.sql, wadusTemplateSql); assert.equal(layers[1].options.sql, wadusTemplateSql);
@ -181,7 +181,7 @@ describe('named_layers datasources', function() {
assert.equal(layers[0].type, 'cartodb'); assert.equal(layers[0].type, 'cartodb');
assert.equal(layers[0].options.sql, wadusSql); assert.equal(layers[0].options.sql, wadusSql);
assert.equal(datasource.getLayerDatasource(0), undefined); assert.deepEqual(datasource.getLayerDatasource(0), {});
assert.equal(layers[1].type, 'mapnik'); assert.equal(layers[1].type, 'mapnik');
assert.equal(layers[1].options.sql, wadusMapnikSql); assert.equal(layers[1].options.sql, wadusMapnikSql);
@ -263,7 +263,7 @@ describe('named_layers datasources', function() {
assert.equal(layers[3].type, 'cartodb'); assert.equal(layers[3].type, 'cartodb');
assert.equal(layers[3].options.sql, wadusSql); assert.equal(layers[3].options.sql, wadusSql);
assert.equal(datasource.getLayerDatasource(3), undefined); assert.deepEqual(datasource.getLayerDatasource(3), {});
assert.equal(layers[4].type, 'cartodb'); assert.equal(layers[4].type, 'cartodb');
assert.equal(layers[4].options.sql, wadusTemplateSql); assert.equal(layers[4].options.sql, wadusTemplateSql);
@ -273,7 +273,7 @@ describe('named_layers datasources', function() {
assert.equal(layers[5].type, 'cartodb'); assert.equal(layers[5].type, 'cartodb');
assert.equal(layers[5].options.sql, wadusSql); assert.equal(layers[5].options.sql, wadusSql);
assert.equal(datasource.getLayerDatasource(5), undefined); assert.deepEqual(datasource.getLayerDatasource(5), {});
assert.equal(layers[6].type, 'mapnik'); assert.equal(layers[6].type, 'mapnik');
assert.equal(layers[6].options.sql, wadusMapnikSql); assert.equal(layers[6].options.sql, wadusMapnikSql);
@ -298,6 +298,7 @@ describe('named_layers datasources', function() {
var context = {}; var context = {};
mapConfigNamedLayersAdapter.getMapConfig(username, testScenario.config, params, context, mapConfigNamedLayersAdapter.getMapConfig(username, testScenario.config, params, context,
function(err, mapConfig) { function(err, mapConfig) {
assert.ifError(err);
testScenario.test(err, mapConfig.layers, context.datasource, done); testScenario.test(err, mapConfig.layers, context.datasource, done);
} }
); );