diff --git a/test/acceptance/ported/multilayer_error_cases.js b/test/acceptance/ported/multilayer_error_cases.js index 54db217a..5752a9b5 100644 --- a/test/acceptance/ported/multilayer_error_cases.js +++ b/test/acceptance/ported/multilayer_error_cases.js @@ -110,7 +110,6 @@ describe('multilayer error cases', function() { geom_column: 'the_geom' }}] }; - ServerOptions.afterLayergroupCreateCalls = 0; assert.response(server, { url: '/database/windshaft_test/layergroup', method: 'POST', @@ -123,7 +122,6 @@ describe('multilayer error cases', function() { try { assert.equal(res.statusCode, 400, res.statusCode + ': ' + res.body); // See http://github.com/CartoDB/Windshaft/issues/159 - assert.equal(ServerOptions.afterLayergroupCreateCalls, 0); var parsed = JSON.parse(res.body); assert.ok(parsed); 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.getLayergroup({ response: { status: 400 } }, function(err, parsed) { assert.ok(!err, err); - // See http://github.com/CartoDB/Windshaft/issues/159 - assert.equal(ServerOptions.afterLayergroupCreateCalls, 0); assert.ok(parsed); assert.equal(parsed.errors.length, 1); var error = parsed.errors[0]; diff --git a/test/acceptance/ported/multilayer_interactivity.js b/test/acceptance/ported/multilayer_interactivity.js index 64eb9f82..ac406725 100644 --- a/test/acceptance/ported/multilayer_interactivity.js +++ b/test/acceptance/ported/multilayer_interactivity.js @@ -23,8 +23,6 @@ describe('multilayer interactivity and layers order', function() { layers: testScenario.layers }; - PortedServerOptions.afterLayergroupCreateCalls = 0; - assert.response(server, { url: '/database/windshaft_test/layergroup', @@ -50,8 +48,6 @@ describe('multilayer interactivity and layers order', function() { '\n\tLayer types: ' + layergroup.layers.map(layerType).join(', ') ); -// assert.equal(PortedServerOptions.afterLayergroupCreateCalls, 1); - var layergroupResponse = JSON.parse(response.body); assert.ok(layergroupResponse); diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index f6b7701e..3dafd589 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -47,12 +47,5 @@ module.exports = _.extend({}, serverOptions, { enable_cors: global.environment.enable_cors, unbuffered_logging: true, // for smoother teardown from tests log_format: null, // do not log anything - afterLayergroupCreateCalls: 0, useProfiler: true, - afterLayergroupCreate: function(req, cfg, res, callback) { - res.layercount = cfg.layers.length; -// config.afterLayergroupCreateCalls++; - callback(null); - } - });