From b6c405bf68d5b03b95ac3307518f18cf4a526d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 30 Oct 2017 19:28:40 +0100 Subject: [PATCH 1/3] Remove send method in base controller and remove BaseController class --- lib/cartodb/controllers/analyses.js | 19 ++++++++-------- lib/cartodb/controllers/base.js | 22 ------------------- lib/cartodb/controllers/layergroup.js | 24 ++++++++++++++------- lib/cartodb/controllers/map.js | 19 +++++++--------- lib/cartodb/controllers/named_maps.js | 22 +++++++------------ lib/cartodb/controllers/named_maps_admin.js | 17 +++++++-------- 6 files changed, 49 insertions(+), 74 deletions(-) delete mode 100644 lib/cartodb/controllers/base.js diff --git a/lib/cartodb/controllers/analyses.js b/lib/cartodb/controllers/analyses.js index 7aabc11b..ffc0bea1 100644 --- a/lib/cartodb/controllers/analyses.js +++ b/lib/cartodb/controllers/analyses.js @@ -3,21 +3,13 @@ var assert = require('assert'); var dot = require('dot'); dot.templateSettings.strip = false; var PSQL = require('cartodb-psql'); - -var util = require('util'); -var BaseController = require('./base'); - var cors = require('../middleware/cors'); var userMiddleware = require('../middleware/user'); - function AnalysesController(prepareContext) { - BaseController.call(this); this.prepareContext = prepareContext; } -util.inherits(AnalysesController, BaseController); - module.exports = AnalysesController; AnalysesController.prototype.register = function(app) { @@ -30,9 +22,16 @@ AnalysesController.prototype.register = function(app) { ); }; -AnalysesController.prototype.sendResponse = function(req, res, resource) { +AnalysesController.prototype.sendResponse = function(req, res, body) { res.set('Cache-Control', 'public,max-age=10,must-revalidate'); - this.send(req, res, resource, 200); + + res.status(200); + + if (req.query && req.query.callback) { + res.jsonp(body); + } else { + res.json(body); + } }; AnalysesController.prototype.catalog = function (req, res, next) { diff --git a/lib/cartodb/controllers/base.js b/lib/cartodb/controllers/base.js deleted file mode 100644 index b9c6ac1e..00000000 --- a/lib/cartodb/controllers/base.js +++ /dev/null @@ -1,22 +0,0 @@ -function BaseController() { -} - -module.exports = BaseController; - -BaseController.prototype.send = function(req, res, body, status, headers) { - if (headers) { - res.set(headers); - } - - res.status(status); - - if (!Buffer.isBuffer(body) && typeof body === 'object') { - if (req.query && req.query.callback) { - res.jsonp(body); - } else { - res.json(body); - } - } else { - res.send(body); - } -}; diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js index c5e4c53a..dc6f85ff 100644 --- a/lib/cartodb/controllers/layergroup.js +++ b/lib/cartodb/controllers/layergroup.js @@ -1,9 +1,6 @@ var assert = require('assert'); var step = require('step'); -var util = require('util'); -var BaseController = require('./base'); - var cors = require('../middleware/cors'); var userMiddleware = require('../middleware/user'); var allowQueryParams = require('../middleware/allow-query-params'); @@ -30,8 +27,6 @@ var QueryTables = require('cartodb-query-tables'); */ function LayergroupController(prepareContext, pgConnection, mapStore, tileBackend, previewBackend, attributesBackend, surrogateKeysCache, userLimitsApi, layergroupAffectedTables, analysisBackend) { - BaseController.call(this); - this.pgConnection = pgConnection; this.mapStore = mapStore; this.tileBackend = tileBackend; @@ -47,8 +42,6 @@ function LayergroupController(prepareContext, pgConnection, mapStore, tileBacken this.prepareContext = prepareContext; } -util.inherits(LayergroupController, BaseController); - module.exports = LayergroupController; LayergroupController.prototype.register = function(app) { @@ -422,7 +415,22 @@ LayergroupController.prototype.sendResponse = function(req, res, body, status, h res.set('X-Cache-Channel', affectedTables.getCacheChannel()); self.surrogateKeysCache.tag(res, affectedTables); } - self.send(req, res, body, status, headers); + + if (headers) { + res.set(headers); + } + + res.status(status); + + if (!Buffer.isBuffer(body) && typeof body === 'object') { + if (req.query && req.query.callback) { + res.jsonp(body); + } else { + res.json(body); + } + } else { + res.send(body); + } } ); diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index f2e86d13..d1f67813 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -6,9 +6,6 @@ var QueryTables = require('cartodb-query-tables'); var ResourceLocator = require('../models/resource-locator'); -var util = require('util'); -var BaseController = require('./base'); - var cors = require('../middleware/cors'); var userMiddleware = require('../middleware/user'); @@ -36,9 +33,6 @@ var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/cr function MapController(prepareContext, pgConnection, templateMaps, mapBackend, metadataBackend, surrogateKeysCache, userLimitsApi, layergroupAffectedTables, mapConfigAdapter, statsBackend) { - - BaseController.call(this); - this.pgConnection = pgConnection; this.templateMaps = templateMaps; this.mapBackend = mapBackend; @@ -54,11 +48,8 @@ function MapController(prepareContext, pgConnection, templateMaps, mapBackend, m this.prepareContext = prepareContext; } -util.inherits(MapController, BaseController); - module.exports = MapController; - MapController.prototype.register = function(app) { app.get( app.base_url_mapconfig, @@ -181,7 +172,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn, next) { var datasource = context.datasource || Datasource.EmptyDatasource(); mapConfig = new MapConfig(requestMapConfig, datasource); self.mapBackend.createLayergroup( - mapConfig, + mapConfig, res.locals, new CreateLayergroupMapConfigProvider(mapConfig, res.locals.user, self.userLimitsApi, res.locals), this @@ -294,7 +285,13 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn res.set('X-Layergroup-Id', layergroup.layergroupid); self.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(cdbuser, mapConfigProvider.getTemplateName())); - self.send(req, res, layergroup, 200); + res.status(200); + + if (req.query && req.query.callback) { + res.jsonp(layergroup); + } else { + res.json(layergroup); + } } } ); diff --git a/lib/cartodb/controllers/named_maps.js b/lib/cartodb/controllers/named_maps.js index 759ae4b6..55790bbf 100644 --- a/lib/cartodb/controllers/named_maps.js +++ b/lib/cartodb/controllers/named_maps.js @@ -3,17 +3,12 @@ var assert = require('assert'); var _ = require('underscore'); var NamedMapsCacheEntry = require('../cache/model/named_maps_entry'); -var util = require('util'); -var BaseController = require('./base'); - var cors = require('../middleware/cors'); var userMiddleware = require('../middleware/user'); var allowQueryParams = require('../middleware/allow-query-params'); function NamedMapsController(prepareContext, namedMapProviderCache, tileBackend, previewBackend, surrogateKeysCache, tablesExtentApi, metadataBackend) { - BaseController.call(this); - this.namedMapProviderCache = namedMapProviderCache; this.tileBackend = tileBackend; this.previewBackend = previewBackend; @@ -23,8 +18,6 @@ function NamedMapsController(prepareContext, namedMapProviderCache, tileBackend, this.prepareContext = prepareContext; } -util.inherits(NamedMapsController, BaseController); - module.exports = NamedMapsController; NamedMapsController.prototype.register = function(app) { @@ -46,7 +39,7 @@ NamedMapsController.prototype.register = function(app) { ); }; -NamedMapsController.prototype.sendResponse = function(req, res, resource, headers, namedMapProvider) { +NamedMapsController.prototype.sendResponse = function(req, res, body, headers, namedMapProvider) { this.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(res.locals.user, namedMapProvider.getTemplateName())); res.set('Content-Type', headers['content-type'] || headers['Content-Type'] || 'image/png'); res.set('Cache-Control', 'public,max-age=7200,must-revalidate'); @@ -79,7 +72,8 @@ NamedMapsController.prototype.sendResponse = function(req, res, resource, header self.surrogateKeysCache.tag(res, result); } } - self.send(req, res, resource, 200); + res.status(200); + res.send(body); } ); }; @@ -143,7 +137,7 @@ NamedMapsController.prototype.staticMap = function(req, res, next) { assert.ifError(err); namedMapProvider = _namedMapProvider; - + self.prepareLayerFilterFromPreviewLayers(cdbUser, req, res.locals, namedMapProvider, this); }, function prepareImageOptions(err) { @@ -192,10 +186,10 @@ NamedMapsController.prototype.staticMap = function(req, res, next) { }; NamedMapsController.prototype.prepareLayerFilterFromPreviewLayers = function ( - user, - req, - params, - namedMapProvider, + user, + req, + params, + namedMapProvider, callback ) { var self = this; diff --git a/lib/cartodb/controllers/named_maps_admin.js b/lib/cartodb/controllers/named_maps_admin.js index ae57ada3..0f54ddf3 100644 --- a/lib/cartodb/controllers/named_maps_admin.js +++ b/lib/cartodb/controllers/named_maps_admin.js @@ -2,9 +2,6 @@ var step = require('step'); var assert = require('assert'); var templateName = require('../backends/template_maps').templateName; -var util = require('util'); -var BaseController = require('./base'); - var cors = require('../middleware/cors'); var userMiddleware = require('../middleware/user'); @@ -16,14 +13,10 @@ var userMiddleware = require('../middleware/user'); * @constructor */ function NamedMapsAdminController(authApi, templateMaps) { - BaseController.call(this); - this.authApi = authApi; this.templateMaps = templateMaps; } -util.inherits(NamedMapsAdminController, BaseController); - module.exports = NamedMapsAdminController; NamedMapsAdminController.prototype.register = function (app) { @@ -206,12 +199,18 @@ NamedMapsAdminController.prototype.list = function(req, res, next) { }; function finishFn(controller, req, res, description, status, next) { - return function finish(err, response){ + return function finish(err, body){ if (err) { err.label = description; next(err); } else { - controller.send(req, res, response, status || 200); + res.status(status || 200); + + if (req.query && req.query.callback) { + res.jsonp(body); + } else { + res.json(body); + } } }; } From fb3afaa6ab5fa5977c9e52f354de132a48f8fcfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 30 Oct 2017 19:29:19 +0100 Subject: [PATCH 2/3] Fix jshint max-complexity issue by using extract method --- lib/cartodb/controllers/map.js | 59 ++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index d1f67813..f1bbe55e 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -184,38 +184,49 @@ MapController.prototype.create = function(req, res, prepareConfigFn, next) { }, function finish(err, layergroup) { if (err) { - if (Number.isFinite(err.layerIndex)) { - var error = new Error(err.message); - error.http_status = err.http_status; + err = Number.isFinite(err.layerIndex) ? populateError(err, mapConfig) : err; - if (!err.http_status && err.message.indexOf('column "the_geom_webmercator" does not exist') >= 0) { - error.http_status = 400; - } - - error.type = 'layer'; - error.subtype = err.message.indexOf('Postgis Plugin') >= 0 ? 'query' : undefined; - error.layer = { - id: mapConfig.getLayerId(err.layerIndex), - index: err.layerIndex, - type: mapConfig.layerType(err.layerIndex) - }; - - err = error; - } err.label = 'ANONYMOUS LAYERGROUP'; - next(err); + + return next(err); + } + + var analysesResults = context.analysesResults || []; + self.addDataviewsAndWidgetsUrls(res.locals.user, layergroup, mapConfig.obj()); + self.addAnalysesMetadata(res.locals.user, layergroup, analysesResults, true); + addContextMetadata(layergroup, mapConfig.obj(), context); + res.set('X-Layergroup-Id', layergroup.layergroupid); + + res.status(200); + + if (req.query && req.query.callback) { + res.jsonp(layergroup); } else { - var analysesResults = context.analysesResults || []; - self.addDataviewsAndWidgetsUrls(res.locals.user, layergroup, mapConfig.obj()); - self.addAnalysesMetadata(res.locals.user, layergroup, analysesResults, true); - addContextMetadata(layergroup, mapConfig.obj(), context); - res.set('X-Layergroup-Id', layergroup.layergroupid); - self.send(req, res, layergroup, 200); + res.json(layergroup); } } ); }; +function populateError(err, mapConfig) { + var error = new Error(err.message); + error.http_status = err.http_status; + + if (!err.http_status && err.message.indexOf('column "the_geom_webmercator" does not exist') >= 0) { + error.http_status = 400; + } + + error.type = 'layer'; + error.subtype = err.message.indexOf('Postgis Plugin') >= 0 ? 'query' : undefined; + error.layer = { + id: mapConfig.getLayerId(err.layerIndex), + index: err.layerIndex, + type: mapConfig.layerType(err.layerIndex) + }; + + return error; +} + function addContextMetadata(layergroup, mapConfig, context) { if (layergroup.metadata && Array.isArray(layergroup.metadata.layers) && Array.isArray(mapConfig.layers)) { layergroup.metadata.layers = layergroup.metadata.layers.map(function(layer, layerIndex) { From 3f49743cd062265ca90fa43cb27bcda27b40e736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 30 Oct 2017 19:30:03 +0100 Subject: [PATCH 3/3] Remove BaseController dependency and remove unused code --- test/acceptance/overviews_queries.js | 9 --------- test/acceptance/ported/attributes.js | 13 ------------- test/acceptance/ported/blend.js | 14 -------------- test/acceptance/ported/blend_filtering.js | 8 -------- test/acceptance/ported/blend_http_fallback.js | 7 ------- test/acceptance/ported/blend_http_timeout.js | 14 -------------- test/acceptance/ported/external_resources.js | 10 ---------- test/acceptance/ported/limits.js | 8 +------- test/acceptance/ported/multilayer.js | 11 ----------- test/acceptance/ported/multilayer_error_cases.js | 12 ------------ test/acceptance/ported/multilayer_interactivity.js | 12 ------------ test/acceptance/ported/raster.js | 13 ------------- test/acceptance/ported/regressions.js | 12 ------------ test/acceptance/ported/retina.js | 10 ---------- test/acceptance/ported/server.js | 10 ---------- test/acceptance/ported/server_gettile.js | 11 ----------- test/acceptance/ported/server_png8_format.js | 10 ---------- test/acceptance/ported/static_maps.js | 8 -------- test/acceptance/ported/torque.js | 11 ----------- test/acceptance/ported/torque_boundaries.js | 12 ------------ test/acceptance/ported/torque_png.js | 14 -------------- test/acceptance/ported/torque_zero_zero.js | 14 -------------- test/acceptance/ported/wrap.js | 14 -------------- 23 files changed, 1 insertion(+), 256 deletions(-) diff --git a/test/acceptance/overviews_queries.js b/test/acceptance/overviews_queries.js index 0434ebfc..ad7599a6 100644 --- a/test/acceptance/overviews_queries.js +++ b/test/acceptance/overviews_queries.js @@ -4,7 +4,6 @@ var assert = require('../support/assert'); var cartodbServer = require('../../lib/cartodb/server'); var ServerOptions = require('./ported/support/ported_server_options'); var testClient = require('./ported/support/test_client'); -var BaseController = require('../../lib/cartodb/controllers/base'); describe('overviews_queries', function() { @@ -13,15 +12,7 @@ describe('overviews_queries', function() { var IMAGE_EQUALS_TOLERANCE_PER_MIL = 2; - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - after(function() { - BaseController.prototype.req2params = req2paramsFn; - testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir); }); diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes.js index 39f3f461..abd4e5ab 100644 --- a/test/acceptance/ported/attributes.js +++ b/test/acceptance/ported/attributes.js @@ -4,13 +4,10 @@ var assert = require('../../support/assert'); var step = require('step'); var cartodbServer = require('../../../lib/cartodb/server'); var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); - describe('attributes', function() { - var server = cartodbServer(PortedServerOptions); server.setMaxListeners(0); @@ -49,16 +46,6 @@ describe('attributes', function() { testHelper.deleteRedisKeys(keysToDelete, done); }); - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - it("can only be fetched from layer having an attributes spec", function(done) { var expected_token; diff --git a/test/acceptance/ported/blend.js b/test/acceptance/ported/blend.js index 1e844d80..52273568 100644 --- a/test/acceptance/ported/blend.js +++ b/test/acceptance/ported/blend.js @@ -3,21 +3,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var testClient = require('./support/test_client'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('blend png renderer', function() { - - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - var IMAGE_TOLERANCE_PER_MIL = 20; function plainTorqueMapConfig(plainColor) { diff --git a/test/acceptance/ported/blend_filtering.js b/test/acceptance/ported/blend_filtering.js index dc8cd470..2ada716e 100644 --- a/test/acceptance/ported/blend_filtering.js +++ b/test/acceptance/ported/blend_filtering.js @@ -5,20 +5,13 @@ var testClient = require('./support/test_client'); var fs = require('fs'); var http = require('http'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('blend layer filtering', function() { var IMG_TOLERANCE_PER_MIL = 20; var httpRendererResourcesServer; - var req2paramsFn; before(function(done) { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - // Start a server to test external resources httpRendererResourcesServer = http.createServer( function(request, response) { var filename = __dirname + '/../../fixtures/http/light_nolabels-1-0-0.png'; @@ -32,7 +25,6 @@ describe('blend layer filtering', function() { }); after(function(done) { - BaseController.prototype.req2params = req2paramsFn; httpRendererResourcesServer.close(done); }); diff --git a/test/acceptance/ported/blend_http_fallback.js b/test/acceptance/ported/blend_http_fallback.js index 480dc5c0..f86d3dfc 100644 --- a/test/acceptance/ported/blend_http_fallback.js +++ b/test/acceptance/ported/blend_http_fallback.js @@ -5,19 +5,13 @@ var testClient = require('./support/test_client'); var fs = require('fs'); var http = require('http'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('blend http fallback', function() { var IMG_TOLERANCE_PER_MIL = 20; var httpRendererResourcesServer; - var req2paramsFn; before(function(done) { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; // Start a server to test external resources httpRendererResourcesServer = http.createServer( function(request, response) { if (request.url.match(/^\/error404\//)) { @@ -39,7 +33,6 @@ describe('blend http fallback', function() { }); after(function(done) { - BaseController.prototype.req2params = req2paramsFn; httpRendererResourcesServer.close(done); }); diff --git a/test/acceptance/ported/blend_http_timeout.js b/test/acceptance/ported/blend_http_timeout.js index 341f72b3..54481fd0 100644 --- a/test/acceptance/ported/blend_http_timeout.js +++ b/test/acceptance/ported/blend_http_timeout.js @@ -6,21 +6,7 @@ var serverOptions = require('./support/ported_server_options'); var fs = require('fs'); var http = require('http'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe.skip('blend http client timeout', function() { - - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - var mapConfig = { version: '1.3.0', layers: [ diff --git a/test/acceptance/ported/external_resources.js b/test/acceptance/ported/external_resources.js index 11ad5176..0aae14c3 100644 --- a/test/acceptance/ported/external_resources.js +++ b/test/acceptance/ported/external_resources.js @@ -1,16 +1,12 @@ var testHelper = require('../../support/test_helper'); - var assert = require('../../support/assert'); var fs = require('fs'); var PortedServerOptions = require('./support/ported_server_options'); var http = require('http'); var testClient = require('./support/test_client'); - var nock = require('nock'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('external resources', function() { var res_serv; // resources server @@ -19,12 +15,8 @@ describe('external resources', function() { var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25; - var req2paramsFn; before(function(done) { nock.enableNetConnect('127.0.0.1'); - - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; // Start a server to test external resources res_serv = http.createServer( function(request, response) { ++res_serv_status.numrequests; @@ -44,8 +36,6 @@ describe('external resources', function() { }); after(function(done) { - BaseController.prototype.req2params = req2paramsFn; - testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir); // Close the resources server diff --git a/test/acceptance/ported/limits.js b/test/acceptance/ported/limits.js index c111c87c..0a8ee378 100644 --- a/test/acceptance/ported/limits.js +++ b/test/acceptance/ported/limits.js @@ -6,19 +6,14 @@ var assert = require('../../support/assert'); var testClient = require('./support/test_client'); var serverOptions = require('./support/ported_server_options'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe.skip('render limits', function() { var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25; var limitsConfig; var onTileErrorStrategy; - var req2paramsFn; + before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; limitsConfig = serverOptions.renderer.mapnik.limits; serverOptions.renderer.mapnik.limits = { render: 50, @@ -31,7 +26,6 @@ describe.skip('render limits', function() { }); after(function() { - BaseController.prototype.req2params = req2paramsFn; serverOptions.renderer.mapnik.limits = limitsConfig; serverOptions.renderer.onTileErrorStrategy = onTileErrorStrategy; }); diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer.js index 0592c147..0ad9f5de 100644 --- a/test/acceptance/ported/multilayer.js +++ b/test/acceptance/ported/multilayer.js @@ -8,7 +8,6 @@ var mapnik = require('windshaft').mapnik; var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); -var BaseController = require('../../../lib/cartodb/controllers/base'); describe('multilayer', function() { @@ -24,16 +23,6 @@ describe('multilayer', function() { assert.equal(res.headers['access-control-allow-origin'], '*'); } - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - // See https://github.com/Vizzuality/Windshaft/issues/70 it("post layergroup with encoding in content-type", function(done) { var layergroup = { diff --git a/test/acceptance/ported/multilayer_error_cases.js b/test/acceptance/ported/multilayer_error_cases.js index 3408baa2..92ce0b1f 100644 --- a/test/acceptance/ported/multilayer_error_cases.js +++ b/test/acceptance/ported/multilayer_error_cases.js @@ -7,23 +7,11 @@ var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); var TestClient = require('../../support/test-client'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('multilayer error cases', function() { var server = cartodbServer(ServerOptions); server.setMaxListeners(0); - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - // var client = null; afterEach(function(done) { if (this.client) { diff --git a/test/acceptance/ported/multilayer_interactivity.js b/test/acceptance/ported/multilayer_interactivity.js index 7d512670..4542f710 100644 --- a/test/acceptance/ported/multilayer_interactivity.js +++ b/test/acceptance/ported/multilayer_interactivity.js @@ -7,23 +7,11 @@ var getLayerTypeFn = require('windshaft').model.MapConfig.prototype.getType; var PortedServerOptions = require('./support/ported_server_options'); var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('multilayer interactivity and layers order', function() { var server = cartodbServer(PortedServerOptions); server.setMaxListeners(0); - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - function layerType(layer) { return layer.type || 'undefined'; } diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster.js index b16dd56d..448661f2 100644 --- a/test/acceptance/ported/raster.js +++ b/test/acceptance/ported/raster.js @@ -4,8 +4,6 @@ var assert = require('../../support/assert'); var step = require('step'); var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); - -var BaseController = require('../../../lib/cartodb/controllers/base'); var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); describe('raster', function() { @@ -20,18 +18,7 @@ describe('raster', function() { var IMAGE_EQUALS_TOLERANCE_PER_MIL = 2; - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - it("can render raster for valid mapconfig", function(done) { - var mapconfig = { version: '1.2.0', layers: [ diff --git a/test/acceptance/ported/regressions.js b/test/acceptance/ported/regressions.js index 2a2188c1..dd765b57 100644 --- a/test/acceptance/ported/regressions.js +++ b/test/acceptance/ported/regressions.js @@ -1,22 +1,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); -var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('regressions', function() { - - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir); }); diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina.js index 80c3fcc5..7469214b 100644 --- a/test/acceptance/ported/retina.js +++ b/test/acceptance/ported/retina.js @@ -5,7 +5,6 @@ var mapnik = require('windshaft').mapnik; var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); describe('retina support', function() { @@ -15,15 +14,6 @@ describe('retina support', function() { var server = cartodbServer(ServerOptions); server.setMaxListeners(0); - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); var keysToDelete; beforeEach(function(done) { diff --git a/test/acceptance/ported/server.js b/test/acceptance/ported/server.js index 650cf2c5..b18bae07 100644 --- a/test/acceptance/ported/server.js +++ b/test/acceptance/ported/server.js @@ -5,22 +5,12 @@ var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('server', function() { var server = cartodbServer(ServerOptions); server.setMaxListeners(0); - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - after(function() { - BaseController.prototype.req2params = req2paramsFn; - testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir); }); diff --git a/test/acceptance/ported/server_gettile.js b/test/acceptance/ported/server_gettile.js index d9a92661..f3c9ba81 100644 --- a/test/acceptance/ported/server_gettile.js +++ b/test/acceptance/ported/server_gettile.js @@ -7,8 +7,6 @@ var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('server_gettile', function() { var server = cartodbServer(ServerOptions); @@ -16,16 +14,7 @@ describe('server_gettile', function() { var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25; - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir); }); diff --git a/test/acceptance/ported/server_png8_format.js b/test/acceptance/ported/server_png8_format.js index 092e9ad7..18151330 100644 --- a/test/acceptance/ported/server_png8_format.js +++ b/test/acceptance/ported/server_png8_format.js @@ -6,13 +6,11 @@ var fs = require('fs'); var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); var IMAGE_EQUALS_TOLERANCE_PER_MIL = 85; describe('server_png8_format', function() { - var serverOptionsPng32 = ServerOptions; serverOptionsPng32.grainstore = _.clone(ServerOptions.grainstore); serverOptionsPng32.grainstore.mapnik_tile_format = 'png32'; @@ -25,13 +23,9 @@ describe('server_png8_format', function() { var serverPng8 = cartodbServer(serverOptionsPng8); serverPng8.setMaxListeners(0); - var layergroupId; - var req2paramsFn; before(function(done) { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; var testPngFilesDir = __dirname + '/../../results/png'; fs.readdirSync(testPngFilesDir) .filter(function(fileName) { @@ -45,10 +39,6 @@ describe('server_png8_format', function() { done(); }); - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - var keysToDelete; beforeEach(function() { keysToDelete = { diff --git a/test/acceptance/ported/static_maps.js b/test/acceptance/ported/static_maps.js index 2a04ca29..1002cdd5 100644 --- a/test/acceptance/ported/static_maps.js +++ b/test/acceptance/ported/static_maps.js @@ -5,9 +5,6 @@ var testClient = require('./support/test_client'); var http = require('http'); var fs = require('fs'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('static_maps', function() { var validUrlTemplate = 'http://127.0.0.1:8033/{s}/{z}/{x}/{y}.png'; @@ -15,11 +12,7 @@ describe('static_maps', function() { var httpRendererResourcesServer; - var req2paramsFn; before(function(done) { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - // Start a server to test external resources httpRendererResourcesServer = http.createServer( function(request, response) { var filename = __dirname + '/../../fixtures/http/basemap.png'; @@ -33,7 +26,6 @@ describe('static_maps', function() { }); after(function(done) { - BaseController.prototype.req2params = req2paramsFn; httpRendererResourcesServer.close(done); }); diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque.js index c148a521..47ae2eee 100644 --- a/test/acceptance/ported/torque.js +++ b/test/acceptance/ported/torque.js @@ -6,7 +6,6 @@ var step = require('step'); var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); describe('torque', function() { @@ -14,16 +13,6 @@ describe('torque', function() { var server = cartodbServer(ServerOptions); server.setMaxListeners(0); - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - var keysToDelete; beforeEach(function() { keysToDelete = {}; diff --git a/test/acceptance/ported/torque_boundaries.js b/test/acceptance/ported/torque_boundaries.js index 1456c055..a984389d 100644 --- a/test/acceptance/ported/torque_boundaries.js +++ b/test/acceptance/ported/torque_boundaries.js @@ -4,21 +4,9 @@ var assert = require('../../support/assert'); var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); describe('torque boundary points', function() { - - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = ServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - var layergroupIdToDelete = null; beforeEach(function() { diff --git a/test/acceptance/ported/torque_png.js b/test/acceptance/ported/torque_png.js index 69eaadab..57b3ffa1 100644 --- a/test/acceptance/ported/torque_png.js +++ b/test/acceptance/ported/torque_png.js @@ -3,21 +3,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var testClient = require('./support/test_client'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('torque png renderer', function() { - - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - var IMAGE_TOLERANCE_PER_MIL = 20; var torquePngPointsMapConfig = { diff --git a/test/acceptance/ported/torque_zero_zero.js b/test/acceptance/ported/torque_zero_zero.js index b0b00081..fe6755ae 100644 --- a/test/acceptance/ported/torque_zero_zero.js +++ b/test/acceptance/ported/torque_zero_zero.js @@ -3,21 +3,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var testClient = require('./support/test_client'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('torque tiles at 0,0 point', function() { - - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - /* Tiles are represented as in: diff --git a/test/acceptance/ported/wrap.js b/test/acceptance/ported/wrap.js index 64a8e2f4..d79e2b56 100644 --- a/test/acceptance/ported/wrap.js +++ b/test/acceptance/ported/wrap.js @@ -3,21 +3,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var testClient = require('./support/test_client'); -var PortedServerOptions = require('./support/ported_server_options'); -var BaseController = require('../../../lib/cartodb/controllers/base'); - describe('wrap x coordinate', function() { - - var req2paramsFn; - before(function() { - req2paramsFn = BaseController.prototype.req2params; - BaseController.prototype.req2params = PortedServerOptions.req2params; - }); - - after(function() { - BaseController.prototype.req2params = req2paramsFn; - }); - describe('renders correct tile', function() { var IMG_TOLERANCE_PER_MIL = 20;