From bc5dabef3c3d970f87902c68b7513ab6b2246796 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 17 Mar 2017 11:04:50 +0000 Subject: [PATCH] Revert "Fix assertions, now MapCofig.getLayer() return {} if layer not found" This reverts commit c839a0b0a33da4e0f25ba1c4168d26045cfc8755. --- test/integration/mapconfig_named_layers_datasource.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js index 48f0b65d..aac8d335 100644 --- a/test/integration/mapconfig_named_layers_datasource.js +++ b/test/integration/mapconfig_named_layers_datasource.js @@ -145,7 +145,7 @@ describe('named_layers datasources', function() { assert.equal(layers[0].type, 'cartodb'); assert.equal(layers[0].options.sql, wadusSql); - assert.deepEqual(datasource.getLayerDatasource(0), {}); + assert.equal(datasource.getLayerDatasource(0), undefined); done(); } @@ -160,7 +160,7 @@ describe('named_layers datasources', function() { assert.equal(layers[0].type, 'cartodb'); assert.equal(layers[0].options.sql, wadusSql); - assert.deepEqual(datasource.getLayerDatasource(0), {}); + assert.equal(datasource.getLayerDatasource(0), undefined); assert.equal(layers[1].type, 'cartodb'); 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].options.sql, wadusSql); - assert.deepEqual(datasource.getLayerDatasource(0), {}); + assert.equal(datasource.getLayerDatasource(0), undefined); assert.equal(layers[1].type, 'mapnik'); 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].options.sql, wadusSql); - assert.deepEqual(datasource.getLayerDatasource(3), {}); + assert.equal(datasource.getLayerDatasource(3), undefined); assert.equal(layers[4].type, 'cartodb'); 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].options.sql, wadusSql); - assert.deepEqual(datasource.getLayerDatasource(5), {}); + assert.equal(datasource.getLayerDatasource(5), undefined); assert.equal(layers[6].type, 'mapnik'); assert.equal(layers[6].options.sql, wadusMapnikSql); @@ -298,7 +298,6 @@ describe('named_layers datasources', function() { var context = {}; mapConfigNamedLayersAdapter.getMapConfig(username, testScenario.config, params, context, function(err, mapConfig) { - assert.ifError(err); testScenario.test(err, mapConfig.layers, context.datasource, done); } );