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

Remove unused porperties from ported server options

Browse Source
This commit is contained in:
Daniel García Aubert 2018-03-16 20:04:29 +01:00
parent ed9083de24
commit a7f6eafd5c
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/acceptance/ported/multilayer_error_cases.js
View File

@ -110,7 +110,6 @@ describe('multilayer error cases', function() {
geom_column: 'the_geom' geom_column: 'the_geom'
}}] }}]
}; };
ServerOptions.afterLayergroupCreateCalls = 0;
assert.response(server, { assert.response(server, {
url: '/database/windshaft_test/layergroup', url: '/database/windshaft_test/layergroup',
method: 'POST', method: 'POST',
@ -123,7 +122,6 @@ describe('multilayer error cases', function() {
try { try {
assert.equal(res.statusCode, 400, res.statusCode + ': ' + res.body); assert.equal(res.statusCode, 400, res.statusCode + ': ' + res.body);
// See http://github.com/CartoDB/Windshaft/issues/159 // See http://github.com/CartoDB/Windshaft/issues/159
assert.equal(ServerOptions.afterLayergroupCreateCalls, 0);
var parsed = JSON.parse(res.body); var parsed = JSON.parse(res.body);
assert.ok(parsed); assert.ok(parsed);
assert.equal(parsed.errors.length, 1); assert.equal(parsed.errors.length, 1);
@ -164,12 +162,9 @@ describe('multilayer error cases', function() {
}} }}
] ]
}; };
ServerOptions.afterLayergroupCreateCalls = 0;
this.client = new TestClient(layergroup); this.client = new TestClient(layergroup);
this.client.getLayergroup({ response: { status: 400 } }, function(err, parsed) { this.client.getLayergroup({ response: { status: 400 } }, function(err, parsed) {
assert.ok(!err, err); assert.ok(!err, err);
// See http://github.com/CartoDB/Windshaft/issues/159
assert.equal(ServerOptions.afterLayergroupCreateCalls, 0);
assert.ok(parsed); assert.ok(parsed);
assert.equal(parsed.errors.length, 1); assert.equal(parsed.errors.length, 1);
var error = parsed.errors[0]; var error = parsed.errors[0];

4
test/acceptance/ported/multilayer_interactivity.js
View File

@ -23,8 +23,6 @@ describe('multilayer interactivity and layers order', function() {
layers: testScenario.layers layers: testScenario.layers
}; };
PortedServerOptions.afterLayergroupCreateCalls = 0;
assert.response(server, assert.response(server,
{ {
url: '/database/windshaft_test/layergroup', url: '/database/windshaft_test/layergroup',
@ -50,8 +48,6 @@ describe('multilayer interactivity and layers order', function() {
'\n\tLayer types: ' + layergroup.layers.map(layerType).join(', ') '\n\tLayer types: ' + layergroup.layers.map(layerType).join(', ')
); );
// assert.equal(PortedServerOptions.afterLayergroupCreateCalls, 1);
var layergroupResponse = JSON.parse(response.body); var layergroupResponse = JSON.parse(response.body);
assert.ok(layergroupResponse); assert.ok(layergroupResponse);

7
test/acceptance/ported/support/ported_server_options.js
View File

@ -47,12 +47,5 @@ module.exports = _.extend({}, serverOptions, {
enable_cors: global.environment.enable_cors, enable_cors: global.environment.enable_cors,
unbuffered_logging: true, // for smoother teardown from tests unbuffered_logging: true, // for smoother teardown from tests
log_format: null, // do not log anything log_format: null, // do not log anything
afterLayergroupCreateCalls: 0,
useProfiler: true, useProfiler: true,
afterLayergroupCreate: function(req, cfg, res, callback) {
res.layercount = cfg.layers.length;
// config.afterLayergroupCreateCalls++;
callback(null);
}
}); });