From 9cfaf6eefc635ae78748fb8fdcf310de0bf0664b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 30 Sep 2019 19:18:24 +0200 Subject: [PATCH 01/37] Draft: be able to inject middlewares from configuration --- config/environments/development.js.example | 12 +++++++++++- config/environments/production.js.example | 12 +++++++++++- config/environments/staging.js.example | 12 +++++++++++- lib/cartodb/api/api-router.js | 8 +++++--- lib/cartodb/api/map/map-router.js | 4 +++- lib/cartodb/api/template/template-router.js | 4 +++- 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 68737330..adc7aa1d 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -22,12 +22,22 @@ var config = { '/api/v1', '/user/:user/api/v1', ], + // Attach middlewares at the begining of the req/res cycle + // to perform custom operations. + middlewares: [ + function noop () { + return function noopMiddleware (req, res, next) { + next(); + } + } + ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, map: { paths: [ '/map', - ] + ], + middlewares: [] }, // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 5e8ab271..9173c53b 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -22,12 +22,22 @@ var config = { '/api/v1', '/user/:user/api/v1', ], + // Attach middlewares at the begining of the req/res cycle + // to perform custom operations. + middlewares: [ + function noop () { + return function noopMiddleware (req, res, next) { + next(); + } + } + ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, map: { paths: [ '/map', - ] + ], + middlewares: [] }, // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 4741fd74..123ce930 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -22,12 +22,22 @@ var config = { '/api/v1', '/user/:user/api/v1', ], + // Attach middlewares at the begining of the req/res cycle + // to perform custom operations. + middlewares: [ + function noop () { + return function noopMiddleware (req, res, next) { + next(); + } + } + ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, map: { paths: [ '/map', - ] + ], + middlewares: [] }, // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index fb62aa46..ac317839 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -204,8 +204,10 @@ module.exports = class ApiRouter { Object.keys(this.serverOptions.routes).forEach(apiVersion => { const routes = this.serverOptions.routes[apiVersion]; - const apiRouter = router({ mergeParams: true }); + const apiMiddlewares = routes.middlewares || []; + + apiMiddlewares.forEach(middleware => apiRouter.use(middleware())); apiRouter.use(logger(this.serverOptions)); apiRouter.use(initializeStatusCode()); @@ -219,8 +221,8 @@ module.exports = class ApiRouter { apiRouter.use(cors()); apiRouter.use(user()); - this.templateRouter.register(apiRouter, routes.template.paths); - this.mapRouter.register(apiRouter, routes.map.paths); + this.templateRouter.register(apiRouter, routes.template.paths, routes.template.middlewares); + this.mapRouter.register(apiRouter, routes.map.paths, routes.map.middlewares); apiRouter.use(sendResponse()); apiRouter.use(syntaxError()); diff --git a/lib/cartodb/api/map/map-router.js b/lib/cartodb/api/map/map-router.js index 8fb7b8b2..a26637cb 100644 --- a/lib/cartodb/api/map/map-router.js +++ b/lib/cartodb/api/map/map-router.js @@ -126,9 +126,11 @@ module.exports = class MapRouter { ); } - register (apiRouter, mapPaths) { + register (apiRouter, mapPaths, mapMiddlewares = []) { const mapRouter = router({ mergeParams: true }); + mapMiddlewares.forEach(middleware => mapRouter.use(middleware())); + this.analysisLayergroupController.register(mapRouter); this.attributesLayergroupController.register(mapRouter); this.dataviewLayergroupController.register(mapRouter); diff --git a/lib/cartodb/api/template/template-router.js b/lib/cartodb/api/template/template-router.js index 0299679d..b4a43053 100644 --- a/lib/cartodb/api/template/template-router.js +++ b/lib/cartodb/api/template/template-router.js @@ -54,9 +54,11 @@ module.exports = class TemplateRouter { ); } - register (apiRouter, templatePaths) { + register (apiRouter, templatePaths, templateMiddlewares = []) { const templateRouter = router({ mergeParams: true }); + templateMiddlewares.forEach(middleware => templateRouter.use(middleware())); + this.namedMapController.register(templateRouter); this.tileTemplateController.register(templateRouter); this.adminTemplateController.register(templateRouter); From c82a5c38df27c9c6f4f48cd8baccb4992cb21b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 1 Oct 2019 18:20:17 +0200 Subject: [PATCH 02/37] Fix indentation --- app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 2f9bff99..0864c7fc 100755 --- a/app.js +++ b/app.js @@ -27,9 +27,9 @@ var argv = require('yargs') .usage('Usage: $0 [options]') .help('h') .example( - '$0 production -c /etc/sql-api/config.js', - 'start server in production environment with /etc/sql-api/config.js as config file' -) + '$0 production -c /etc/sql-api/config.js', + 'start server in production environment with /etc/sql-api/config.js as config file' + ) .alias('h', 'help') .alias('c', 'config') .nargs('c', 1) From 26bba3c5f50c05a657f41cba1ead1594544fe9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 1 Oct 2019 19:31:14 +0200 Subject: [PATCH 03/37] Prepare next release version --- NEWS.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 3be0d437..2bd15df1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,12 @@ # Changelog +## 7.3.0 +Released 2019-mm-dd + +Announcements: + +- Added mechanism to inject custom middlewares through configuration. + ## 7.2.0 Released 2019-09-30 diff --git a/package-lock.json b/package-lock.json index 34b12b1d..06ca24ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "7.2.0", + "version": "7.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 86673cf5..f0e54b5d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "7.2.0", + "version": "7.3.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From 3220e3de319036488c4e5f75e765f7f7663f4a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 1 Oct 2019 19:34:03 +0200 Subject: [PATCH 04/37] Remove old api configuration paths --- NEWS.md | 1 + lib/cartodb/api/api-router.js | 4 +- lib/cartodb/server.js | 10 +-- lib/cartodb/server_options.js | 41 +--------- test/acceptance/ported/attributes.js | 18 ++--- test/acceptance/ported/multilayer.js | 80 +++++++++---------- .../ported/multilayer_error_cases.js | 20 ++--- .../ported/multilayer_interactivity.js | 2 +- test/acceptance/ported/raster.js | 6 +- test/acceptance/ported/retina.js | 4 +- test/acceptance/ported/server_png8_format.js | 4 +- .../ported/support/ported_server_options.js | 29 ------- test/acceptance/ported/support/test_client.js | 8 +- test/acceptance/ported/torque.js | 24 +++--- test/acceptance/ported/torque_boundaries.js | 12 +-- 15 files changed, 96 insertions(+), 167 deletions(-) diff --git a/NEWS.md b/NEWS.md index 2bd15df1..58d6104f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,7 @@ Released 2019-mm-dd Announcements: - Added mechanism to inject custom middlewares through configuration. +- Stop requiring unused config properties: "base_url", "base_url_mapconfig", and "base_url_templated". ## 7.2.0 Released 2019-09-30 diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index ac317839..2b267161 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -202,8 +202,8 @@ module.exports = class ApiRouter { app.layergroupAffectedTablesCache = this.layergroupAffectedTablesCache; } - Object.keys(this.serverOptions.routes).forEach(apiVersion => { - const routes = this.serverOptions.routes[apiVersion]; + Object.keys(this.serverOptions.routes).forEach(api => { + const routes = this.serverOptions.routes[api]; const apiRouter = router({ mergeParams: true }); const apiMiddlewares = routes.middlewares || []; diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index a200b062..0ce6380e 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -14,7 +14,9 @@ const ServerInfoController = require('./server-info-controller'); const StatsClient = require('./stats/client'); module.exports = function createServer (serverOptions) { - validateOptions(serverOptions); + if (!serverOptions.hasOwnProperty('routes')) { + throw new Error('Must initialise server with "routes" as base paths configuration'); + } // Make stats client globally accessible global.statsClient = StatsClient.getInstance(serverOptions.statsd); @@ -41,12 +43,6 @@ module.exports = function createServer (serverOptions) { return app; }; -function validateOptions(opts) { - if (!_.isString(opts.base_url) || !_.isString(opts.base_url_mapconfig) || !_.isString(opts.base_url_templated)) { - throw new Error("Must initialise server with: 'base_url'/'base_url_mapconfig'/'base_url_templated' URLs"); - } -} - function bootstrapFonts(opts) { // Set carto renderer configuration for MMLStore opts.grainstore.carto_env = opts.grainstore.carto_env || {}; diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 5c9da8c6..b60b92ba 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -63,29 +63,11 @@ module.exports = { port: global.environment.port, host: global.environment.host }, - // FIXME: Remove it. This is no longer needed, paths are defined in routers - // This is for inline maps and table maps - base_url: global.environment.base_url_legacy || '/tiles/:table', - - /// @deprecated with Windshaft-0.17.0 - ///base_url_notable: '/tiles', - - // FIXME: Remove it. This is no longer needed, paths are defined in routers - // This is for Detached maps - // - // "maps" is the official, while - // "tiles/layergroup" is for backward compatibility up to 1.6.x - // - base_url_mapconfig: global.environment.base_url_detached || '(?:/maps|/tiles/layergroup)', - - // FIXME: Remove it. This is no longer needed, paths are defined in routers - base_url_templated: global.environment.base_url_templated || '(?:/maps/named|/tiles/template)', - // Base URLs for the APIs // // See http://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API routes: global.environment.routes || { - v1: { + api: { paths: [ '/api/v1', '/user/:user/api/v1', @@ -104,29 +86,8 @@ module.exports = { '/map/named' ] } - }, - // For compatibility with versions up to 1.6.x - v0: { - paths: [ - '/tiles' - ], - // Base url for the Detached Maps API - // "/tiles/layergroup" is for compatibility with versions up to 1.6.x - map: { - paths: [ - '/layergroup' - ] - }, - // Base url for the Templated Maps API - // "/tiles/template" is for compatibility with versions up to 1.6.x - template: { - paths: [ - '/template' - ] - } } }, - grainstore: { map: { // TODO: allow to specify in configuration diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes.js index 6f899c64..13af276e 100644 --- a/test/acceptance/ported/attributes.js +++ b/test/acceptance/ported/attributes.js @@ -58,7 +58,7 @@ describe('attributes', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -86,7 +86,7 @@ describe('attributes', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/attributes/1', + url: '/api/v1/map/' + expected_token + '/0/attributes/1', method: 'GET', headers: { host: 'localhost' @@ -109,7 +109,7 @@ describe('attributes', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/1/attributes/1', + url: '/api/v1/map/' + expected_token + '/1/attributes/1', method: 'GET', headers: { host: 'localhost' @@ -128,7 +128,7 @@ describe('attributes', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/1/attributes/-666', + url: '/api/v1/map/' + expected_token + '/1/attributes/-666', method: 'GET', headers: { host: 'localhost' @@ -169,7 +169,7 @@ describe('attributes', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -202,7 +202,7 @@ describe('attributes', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -230,7 +230,7 @@ describe('attributes', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + + url: '/api/v1/map/' + expected_token + '/0/attributes/1?callback=test', method: 'GET', headers: { @@ -257,7 +257,7 @@ describe('attributes', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/1/attributes/1', + url: '/api/v1/map/' + expected_token + '/1/attributes/1', method: 'GET', headers: { host: 'localhost' @@ -297,7 +297,7 @@ describe('attributes', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer.js index d7a0b0c7..f996d45c 100644 --- a/test/acceptance/ported/multilayer.js +++ b/test/acceptance/ported/multilayer.js @@ -51,7 +51,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json; charset=utf-8' }, data: JSON.stringify(layergroup) @@ -92,7 +92,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -108,7 +108,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0.png', + url: '/api/v1/map/' + expected_token + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -162,7 +162,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -185,7 +185,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0.png', + url: '/api/v1/map/' + expected_token + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -204,7 +204,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0/0.grid.json', + url: '/api/v1/map/' + expected_token + '/0/0/0/0.grid.json', method: 'GET', headers: { host: 'localhost' } }, {}, function(res) { @@ -222,7 +222,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + + url: '/api/v1/map/' + expected_token + '/1/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } @@ -275,7 +275,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup?' + querystring.stringify({ + url: '/api/v1/map?' + querystring.stringify({ config: JSON.stringify(layergroup) }), method: 'GET', @@ -300,7 +300,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0.png', + url: '/api/v1/map/' + expected_token + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -319,7 +319,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + + url: '/api/v1/map/' + expected_token + '/0/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } @@ -338,7 +338,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + + url: '/api/v1/map/' + expected_token + '/1/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } @@ -391,7 +391,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup?' + querystring.stringify({ + url: '/api/v1/map?' + querystring.stringify({ config: JSON.stringify(layergroup), callback: 'jsonp_test' }), @@ -427,7 +427,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0.png', + url: '/api/v1/map/' + expected_token + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -446,7 +446,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + + url: '/api/v1/map/' + expected_token + '/0/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } @@ -465,7 +465,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + + url: '/api/v1/map/' + expected_token + '/1/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } @@ -527,7 +527,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -547,7 +547,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0.png', + url: '/api/v1/map/' + expected_token + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -566,7 +566,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + + url: '/api/v1/map/' + expected_token + '/0/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } @@ -585,7 +585,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + + url: '/api/v1/map/' + expected_token + '/1/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } @@ -604,7 +604,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/1/attributes/4', + url: '/api/v1/map/' + expected_token + '/1/attributes/4', method: 'GET', headers: { host: 'localhost' } }, {}, function(res, err) { @@ -624,7 +624,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/2/0/0/0.json.torque', + url: '/api/v1/map/' + expected_token + '/2/0/0/0.json.torque', method: 'GET', headers: { host: 'localhost' } }, {}, function(res, err) { next(err, res); }); @@ -647,7 +647,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/1/0/0/0.json.torque', + url: '/api/v1/map/' + expected_token + '/1/0/0/0.json.torque', method: 'GET', headers: { host: 'localhost' } }, {}, function(res, err) { next(err, res); }); @@ -707,7 +707,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup1) @@ -723,7 +723,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup2) @@ -740,7 +740,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + token1 + '/0/0/0.png', + url: '/api/v1/map/' + token1 + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -759,7 +759,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + token1 + '/0/0/0/0.grid.json?interactivity=cartodb_id', + url: '/api/v1/map/' + token1 + '/0/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } }, {}, function(res) { @@ -777,7 +777,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + token2 + '/0/0/0.png', + url: '/api/v1/map/' + token2 + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -796,7 +796,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + token2 + '/0/0/0/0.grid.json?interactivity=cartodb_id', + url: '/api/v1/map/' + token2 + '/0/0/0/0.grid.json?interactivity=cartodb_id', method: 'GET', headers: { host: 'localhost' } }, {}, function(res) { @@ -853,7 +853,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -875,7 +875,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0.png', + url: '/api/v1/map/' + expected_token + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -921,7 +921,7 @@ describe('multilayer', function() { }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -950,7 +950,7 @@ describe('multilayer', function() { ] }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -985,7 +985,7 @@ describe('multilayer', function() { function doBadPost() { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: _.template(tpl, {font:'bogus'}) @@ -1005,7 +1005,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: _.template(tpl, {font:available_system_fonts[0]}) @@ -1033,7 +1033,7 @@ describe('multilayer', function() { it("geting options on layergroup should return CORS headers", function(done){ const allowHeaders = 'X-Requested-With, X-Prototype-Version, X-CSRF-Token, Authorization, Content-Type'; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'OPTIONS' },{ status: 200, @@ -1069,7 +1069,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -1091,7 +1091,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0/0.grid.json', + url: '/api/v1/map/' + expected_token + '/0/0/0/0.grid.json', method: 'GET', headers: { host: 'localhost' } }, {}, function(res) { @@ -1145,7 +1145,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -1208,7 +1208,7 @@ describe('multilayer', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -1226,7 +1226,7 @@ describe('multilayer', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + token1 + '/0/0/0.png', + url: '/api/v1/map/' + token1 + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } diff --git a/test/acceptance/ported/multilayer_error_cases.js b/test/acceptance/ported/multilayer_error_cases.js index 6194879b..246f9964 100644 --- a/test/acceptance/ported/multilayer_error_cases.js +++ b/test/acceptance/ported/multilayer_error_cases.js @@ -27,7 +27,7 @@ describe('multilayer error cases', function() { it("post layergroup with wrong Content-Type", function(done) { assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -43,7 +43,7 @@ describe('multilayer error cases', function() { it("post layergroup with no layers", function(done) { assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -59,7 +59,7 @@ describe('multilayer error cases', function() { it("post layergroup jsonp errors are returned with 200 status", function(done) { assert.response(server, { - url: '/database/windshaft_test/layergroup?callback=test', + url: '/api/v1/map?callback=test', method: 'POST', headers: { host: 'localhost', @@ -90,7 +90,7 @@ describe('multilayer error cases', function() { ] }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -116,7 +116,7 @@ describe('multilayer error cases', function() { }}] }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -199,7 +199,7 @@ describe('multilayer error cases', function() { ] }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -238,7 +238,7 @@ describe('multilayer error cases', function() { ] }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -283,7 +283,7 @@ describe('multilayer error cases', function() { }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -389,7 +389,7 @@ describe('multilayer error cases', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/deadbeef/0/0/0/0.grid.json', + url: '/api/v1/map/deadbeef/0/0/0/0.grid.json', method: 'GET', encoding: 'binary', headers: { @@ -425,7 +425,7 @@ describe('multilayer error cases', function() { }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: {'Content-Type': 'application/json; charset=utf-8' }, data: '{' + JSON.stringify(layergroup) diff --git a/test/acceptance/ported/multilayer_interactivity.js b/test/acceptance/ported/multilayer_interactivity.js index c2c11fad..62948038 100644 --- a/test/acceptance/ported/multilayer_interactivity.js +++ b/test/acceptance/ported/multilayer_interactivity.js @@ -30,7 +30,7 @@ describe('multilayer interactivity and layers order', function() { assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster.js index 58a6b2bf..574de93c 100644 --- a/test/acceptance/ported/raster.js +++ b/test/acceptance/ported/raster.js @@ -48,7 +48,7 @@ describe('raster', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(mapconfig) @@ -73,7 +73,7 @@ describe('raster', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0.png', + url: '/api/v1/map/' + expected_token + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { host: 'localhost' } @@ -131,7 +131,7 @@ describe('raster', function() { assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina.js index bdc1188c..d2a82306 100644 --- a/test/acceptance/ported/retina.js +++ b/test/acceptance/ported/retina.js @@ -40,7 +40,7 @@ describe('retina support', function() { assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -71,7 +71,7 @@ describe('retina support', function() { function testRetinaImage(scaleFactor, responseHead, assertFn) { assert.response(server, { - url: '/database/windshaft_test/layergroup/' + layergroupId + '/0/0/0' + scaleFactor + '.png', + url: '/api/v1/map/' + layergroupId + '/0/0/0' + scaleFactor + '.png', method: 'GET', encoding: 'binary', headers: { diff --git a/test/acceptance/ported/server_png8_format.js b/test/acceptance/ported/server_png8_format.js index 86af4682..ab4f2758 100644 --- a/test/acceptance/ported/server_png8_format.js +++ b/test/acceptance/ported/server_png8_format.js @@ -66,7 +66,7 @@ describe('server_png8_format', function() { assert.response( serverPng32, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -87,7 +87,7 @@ describe('server_png8_format', function() { var tilePartialUrl = _.template('/<%= z %>/<%= x %>/<%= y %>.png', tile); var requestPayload = { - url: '/database/windshaft_test/layergroup/' + layergroupId + tilePartialUrl, + url: '/api/v1/map/' + layergroupId + tilePartialUrl, method: 'GET', encoding: 'binary', headers: { diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index cf040a48..10908124 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -9,35 +9,6 @@ var overviewsQueryRewriter = new OverviewsQueryRewriter({ }); module.exports = _.extend({}, serverOptions, { - // FIXME: Remove it. This is no longer needed, paths are defined in routers - base_url: '/database/:dbname/table/:table', - // FIXME: Remove it. This is no longer needed, paths are defined in routers - base_url_mapconfig: '/database/:dbname/layergroup', - - routes: { - v0: { - paths: [ - '/tiles', - '/database/:dbname' - ], - // Base url for the Detached Maps API - // "/tiles/layergroup" is for compatibility with versions up to 1.6.x - map: { - paths: [ - '/layergroup' - ] - }, - // Base url for the Templated Maps API - // "/tiles/template" is for compatibility with versions up to 1.6.x - template: { - paths: [ - '/template' - ] - } - } - }, - - grainstore: { datasource: { geometry_field: 'the_geom', diff --git a/test/acceptance/ported/support/test_client.js b/test/acceptance/ported/support/test_client.js index 01d00bf2..67d5c11e 100644 --- a/test/acceptance/ported/support/test_client.js +++ b/test/acceptance/ported/support/test_client.js @@ -138,7 +138,7 @@ function layergroupRequest(layergroupConfig, method, callbackName, extraParams) method = method || 'POST'; var request = { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', headers: { host: 'localhost', 'Content-Type': 'application/json' @@ -346,7 +346,7 @@ function getGeneric(layergroupConfig, url, expectedResponse, callback) { function requestLayergroup() { var next = this; var request = { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', @@ -379,7 +379,7 @@ function getGeneric(layergroupConfig, url, expectedResponse, callback) { var next = this; - var finalUrl = '/database/windshaft_test/layergroup/' + _.template(url, { + var finalUrl = '/api/v1/map/' + _.template(url, { layergroupid: layergroupid }); @@ -475,7 +475,7 @@ function withLayergroup(layergroupConfig, options, callback) { const urlTpl = function ({layergroupid, cache_buster = null, tile }) { const { signer, token , cacheBuster } = LayergroupToken.parse(layergroupid); - const base = '/database/windshaft_test/layergroup/'; + const base = '/api/v1/map/'; return `${base}${signerTpl({signer})}${token}${cacheTpl({cache_buster, cacheBuster})}${tile}`; }; diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque.js index 82f3fda1..31f3cf55 100644 --- a/test/acceptance/ported/torque.js +++ b/test/acceptance/ported/torque.js @@ -54,7 +54,7 @@ describe('torque', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -77,7 +77,7 @@ describe('torque', function() { var css = 'Map { -torque-frame-count: 2; }'; layergroup.layers[0].options.cartocss = css; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -100,7 +100,7 @@ describe('torque', function() { var css = 'Map { -torque-frame-count: 2; -torque-resolution: 3; }'; layergroup.layers[0].options.cartocss = css; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -142,7 +142,7 @@ describe('torque', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) @@ -185,7 +185,7 @@ describe('torque', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(mapconfig) @@ -224,7 +224,7 @@ describe('torque', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0.png', + url: '/api/v1/map/' + expected_token + '/0/0/0.png', method: 'GET', encoding: 'binary', headers: { @@ -245,7 +245,7 @@ describe('torque', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0/0.grid.json', + url: '/api/v1/map/' + expected_token + '/0/0/0/0.grid.json', method: 'GET', headers: { host: 'localhost' @@ -265,7 +265,7 @@ describe('torque', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0/0.json.torque', + url: '/api/v1/map/' + expected_token + '/0/0/0/0.json.torque', method: 'GET', headers: { host: 'localhost' @@ -286,7 +286,7 @@ describe('torque', function() { assert.ifError(err); var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/0/0/0.torque.json', + url: '/api/v1/map/' + expected_token + '/0/0/0/0.torque.json', method: 'GET', headers: { host: 'localhost' @@ -333,7 +333,7 @@ describe('torque', function() { { var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(mapconfig) @@ -382,7 +382,7 @@ describe('torque', function() { var next = this; global.environment.postgres.port = 54777; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(mapconfig) @@ -431,7 +431,7 @@ describe('torque', function() { function request(){ var next = this; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(layergroup) diff --git a/test/acceptance/ported/torque_boundaries.js b/test/acceptance/ported/torque_boundaries.js index 1f0fcd80..55b26297 100644 --- a/test/acceptance/ported/torque_boundaries.js +++ b/test/acceptance/ported/torque_boundaries.js @@ -241,7 +241,7 @@ describe('torque boundary points', function() { it(desc, function (done) { assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(boundaryPointsMapConfig) @@ -255,7 +255,7 @@ describe('torque boundary points', function() { var partialUrl = tileRequest.z + '/' + tileRequest.x + '/' + tileRequest.y; assert.response(server, { - url: '/database/windshaft_test/layergroup/' + expected_token + '/0/' + partialUrl + '.json.torque', + url: '/api/v1/map/' + expected_token + '/0/' + partialUrl + '.json.torque', method: 'GET', headers: { host: 'localhost' @@ -358,7 +358,7 @@ describe('torque boundary points', function() { }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(londonPointMapConfig) @@ -371,7 +371,7 @@ describe('torque boundary points', function() { assert.response(server, { - url: '/database/windshaft_test/layergroup/' + layergroupId + '/0/2/1/1.json.torque', + url: '/api/v1/map/' + layergroupId + '/0/2/1/1.json.torque', method: 'GET', headers: { host: 'localhost' @@ -424,7 +424,7 @@ describe('torque boundary points', function() { }; assert.response(server, { - url: '/database/windshaft_test/layergroup', + url: '/api/v1/map', method: 'POST', headers: { host: 'localhost', 'Content-Type': 'application/json' }, data: JSON.stringify(londonPointMapConfig) @@ -437,7 +437,7 @@ describe('torque boundary points', function() { assert.response(server, { - url: '/database/windshaft_test/layergroup/' + layergroupId + '/0/13/4255/2765.json.torque', + url: '/api/v1/map/' + layergroupId + '/0/13/4255/2765.json.torque', method: 'GET', headers: { host: 'localhost' From 4aa844946d5ecfb680e04821a6592bcb6e878111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 1 Oct 2019 19:42:04 +0200 Subject: [PATCH 05/37] Update environment example files --- config/environments/development.js.example | 29 +++-------------- config/environments/production.js.example | 29 +++-------------- config/environments/staging.js.example | 29 +++-------------- config/environments/test.js.example | 37 ++++++++-------------- 4 files changed, 29 insertions(+), 95 deletions(-) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index adc7aa1d..54761d97 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -17,12 +17,12 @@ var config = { // // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API ,routes: { - v1: { + api: { paths: [ '/api/v1', '/user/:user/api/v1', ], - // Attach middlewares at the begining of the req/res cycle + // Optional: attach middlewares at the begining of the req/res cycle // to perform custom operations. middlewares: [ function noop () { @@ -37,34 +37,15 @@ var config = { paths: [ '/map', ], - middlewares: [] + middlewares: [] // Optional }, // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, template: { paths: [ '/map/named' - ] - } - }, - // For compatibility with versions up to 1.6.x - v0: { - paths: [ - '/tiles' - ], - // Base url for the Detached Maps API - // "/tiles/layergroup" is for compatibility with versions up to 1.6.x - map: { - paths: [ - '/layergroup' - ] - }, - // Base url for the Templated Maps API - // "/tiles/template" is for compatibility with versions up to 1.6.x - template: { - paths: [ - '/template' - ] + ], + middlewares: [] // Optional } } } diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 9173c53b..623623c2 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -17,12 +17,12 @@ var config = { // // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API ,routes: { - v1: { + api: { paths: [ '/api/v1', '/user/:user/api/v1', ], - // Attach middlewares at the begining of the req/res cycle + // Optional: attach middlewares at the begining of the req/res cycle // to perform custom operations. middlewares: [ function noop () { @@ -37,34 +37,15 @@ var config = { paths: [ '/map', ], - middlewares: [] + middlewares: [] // Optional }, // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, template: { paths: [ '/map/named' - ] - } - }, - // For compatibility with versions up to 1.6.x - v0: { - paths: [ - '/tiles' - ], - // Base url for the Detached Maps API - // "/tiles/layergroup" is for compatibility with versions up to 1.6.x - map: { - paths: [ - '/layergroup' - ] - }, - // Base url for the Templated Maps API - // "/tiles/template" is for compatibility with versions up to 1.6.x - template: { - paths: [ - '/template' - ] + ], + middlewares: [] // Optional } } } diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 123ce930..f3baa4fa 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -17,12 +17,12 @@ var config = { // // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API ,routes: { - v1: { + api: { paths: [ '/api/v1', '/user/:user/api/v1', ], - // Attach middlewares at the begining of the req/res cycle + // Optional: attach middlewares at the begining of the req/res cycle // to perform custom operations. middlewares: [ function noop () { @@ -37,34 +37,15 @@ var config = { paths: [ '/map', ], - middlewares: [] + middlewares: [] // Optional }, // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, template: { paths: [ '/map/named' - ] - } - }, - // For compatibility with versions up to 1.6.x - v0: { - paths: [ - '/tiles' - ], - // Base url for the Detached Maps API - // "/tiles/layergroup" is for compatibility with versions up to 1.6.x - map: { - paths: [ - '/layergroup' - ] - }, - // Base url for the Templated Maps API - // "/tiles/template" is for compatibility with versions up to 1.6.x - template: { - paths: [ - '/template' - ] + ], + middlewares: [] // Optional } } } diff --git a/config/environments/test.js.example b/config/environments/test.js.example index fae21737..f41e4ca9 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -17,44 +17,35 @@ var config = { // // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API ,routes: { - v1: { + api: { paths: [ '/api/v1', '/user/:user/api/v1', ], + // Optional: attach middlewares at the begining of the req/res cycle + // to perform custom operations. + middlewares: [ + function noop () { + return function noopMiddleware (req, res, next) { + next(); + } + } + ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, map: { paths: [ '/map', - ] + ], + middlewares: [] // Optional }, // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, template: { paths: [ '/map/named' - ] - } - }, - // For compatibility with versions up to 1.6.x - v0: { - paths: [ - '/tiles' - ], - // Base url for the Detached Maps API - // "/tiles/layergroup" is for compatibility with versions up to 1.6.x - map: { - paths: [ - '/layergroup' - ] - }, - // Base url for the Templated Maps API - // "/tiles/template" is for compatibility with versions up to 1.6.x - template: { - paths: [ - '/template' - ] + ], + middlewares: [] // Optional } } } From 5fe6845d7cdc7681f0dab20bf7e162683132cd76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 1 Oct 2019 19:48:16 +0200 Subject: [PATCH 06/37] Add comments --- config/environments/development.js.example | 5 ++++- config/environments/production.js.example | 5 ++++- config/environments/staging.js.example | 5 ++++- config/environments/test.js.example | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 54761d97..a9cb7a78 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -16,13 +16,16 @@ var config = { // Base URLs for the APIs // // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API + // + // Note: each entry corresponds with an express' router. + // You must define at least one path. However, middlewares are optional. ,routes: { api: { paths: [ '/api/v1', '/user/:user/api/v1', ], - // Optional: attach middlewares at the begining of the req/res cycle + // Optional: attach middlewares at the begining of the router // to perform custom operations. middlewares: [ function noop () { diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 623623c2..f6babe62 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -16,13 +16,16 @@ var config = { // Base URLs for the APIs // // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API + // + // Note: each entry corresponds with an express' router. + // You must define at least one path. However, middlewares are optional. ,routes: { api: { paths: [ '/api/v1', '/user/:user/api/v1', ], - // Optional: attach middlewares at the begining of the req/res cycle + // Optional: attach middlewares at the begining of the router // to perform custom operations. middlewares: [ function noop () { diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index f3baa4fa..a2675eb3 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -16,13 +16,16 @@ var config = { // Base URLs for the APIs // // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API + // + // Note: each entry corresponds with an express' router. + // You must define at least one path. However, middlewares are optional. ,routes: { api: { paths: [ '/api/v1', '/user/:user/api/v1', ], - // Optional: attach middlewares at the begining of the req/res cycle + // Optional: attach middlewares at the begining of the router // to perform custom operations. middlewares: [ function noop () { diff --git a/config/environments/test.js.example b/config/environments/test.js.example index f41e4ca9..9f69f2f0 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -16,13 +16,16 @@ var config = { // Base URLs for the APIs // // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API + // + // Note: each entry corresponds with an express' router. + // You must define at least one path. However, middlewares are optional. ,routes: { api: { paths: [ '/api/v1', '/user/:user/api/v1', ], - // Optional: attach middlewares at the begining of the req/res cycle + // Optional: attach middlewares at the begining of the router // to perform custom operations. middlewares: [ function noop () { From 975f07df99ee6973aefecd68107b930731e80079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 2 Oct 2019 10:42:29 +0200 Subject: [PATCH 07/37] Use Object.values() --- lib/cartodb/api/api-router.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index 2b267161..60d0648b 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -202,10 +202,11 @@ module.exports = class ApiRouter { app.layergroupAffectedTablesCache = this.layergroupAffectedTablesCache; } - Object.keys(this.serverOptions.routes).forEach(api => { - const routes = this.serverOptions.routes[api]; + Object.values(this.serverOptions.routes).forEach(route => { const apiRouter = router({ mergeParams: true }); - const apiMiddlewares = routes.middlewares || []; + + const apiPaths = route.paths; + const apiMiddlewares = route.middlewares || []; apiMiddlewares.forEach(middleware => apiRouter.use(middleware())); @@ -221,15 +222,13 @@ module.exports = class ApiRouter { apiRouter.use(cors()); apiRouter.use(user()); - this.templateRouter.register(apiRouter, routes.template.paths, routes.template.middlewares); - this.mapRouter.register(apiRouter, routes.map.paths, routes.map.middlewares); + this.templateRouter.register(apiRouter, route.template.paths, route.template.middlewares); + this.mapRouter.register(apiRouter, route.map.paths, route.map.middlewares); apiRouter.use(sendResponse()); apiRouter.use(syntaxError()); apiRouter.use(errorMiddleware()); - const apiPaths = routes.paths; - apiPaths.forEach(path => app.use(path, apiRouter)); }); } From dd06de2632661e19d64c9fbc2be0ba1a8059f54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 4 Oct 2019 12:07:58 +0200 Subject: [PATCH 08/37] Use new routes configuration --- config/environments/development.js.example | 12 ++++----- config/environments/production.js.example | 12 ++++----- config/environments/staging.js.example | 12 ++++----- config/environments/test.js.example | 12 ++++----- lib/cartodb/api/api-router.js | 8 +++--- lib/cartodb/api/map/map-router.js | 28 ++++++++++++--------- lib/cartodb/api/template/template-router.js | 16 +++++++----- lib/cartodb/server.js | 2 +- 8 files changed, 55 insertions(+), 47 deletions(-) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index a9cb7a78..91ff546c 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -20,7 +20,7 @@ var config = { // Note: each entry corresponds with an express' router. // You must define at least one path. However, middlewares are optional. ,routes: { - api: { + api: [{ paths: [ '/api/v1', '/user/:user/api/v1', @@ -36,21 +36,21 @@ var config = { ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, - map: { + map: [{ paths: [ '/map', ], middlewares: [] // Optional - }, + }], // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, - template: { + template: [{ paths: [ '/map/named' ], middlewares: [] // Optional - } - } + }] + }] } // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status. diff --git a/config/environments/production.js.example b/config/environments/production.js.example index f6babe62..3e75a897 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -20,7 +20,7 @@ var config = { // Note: each entry corresponds with an express' router. // You must define at least one path. However, middlewares are optional. ,routes: { - api: { + api: [{ paths: [ '/api/v1', '/user/:user/api/v1', @@ -36,21 +36,21 @@ var config = { ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, - map: { + map: [{ paths: [ '/map', ], middlewares: [] // Optional - }, + }], // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, - template: { + template: [{ paths: [ '/map/named' ], middlewares: [] // Optional - } - } + }] + }] } // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status. diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index a2675eb3..49e08ac7 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -20,7 +20,7 @@ var config = { // Note: each entry corresponds with an express' router. // You must define at least one path. However, middlewares are optional. ,routes: { - api: { + api: [{ paths: [ '/api/v1', '/user/:user/api/v1', @@ -36,21 +36,21 @@ var config = { ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, - map: { + map: [{ paths: [ '/map', ], middlewares: [] // Optional - }, + }], // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, - template: { + template: [{ paths: [ '/map/named' ], middlewares: [] // Optional - } - } + }] + }] } // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status. diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 9f69f2f0..04797ae9 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -20,7 +20,7 @@ var config = { // Note: each entry corresponds with an express' router. // You must define at least one path. However, middlewares are optional. ,routes: { - api: { + api: [{ paths: [ '/api/v1', '/user/:user/api/v1', @@ -36,21 +36,21 @@ var config = { ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, - map: { + map: [{ paths: [ '/map', ], middlewares: [] // Optional - }, + }], // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, - template: { + template: [{ paths: [ '/map/named' ], middlewares: [] // Optional - } - } + }] + }] } // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status. diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index 60d0648b..0081c0eb 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -196,13 +196,13 @@ module.exports = class ApiRouter { this.templateRouter = new TemplateRouter({ collaborators }); } - register (app) { + register (app, routes) { // FIXME: we need a better way to reset cache while running tests if (process.env.NODE_ENV === 'test') { app.layergroupAffectedTablesCache = this.layergroupAffectedTablesCache; } - Object.values(this.serverOptions.routes).forEach(route => { + routes.forEach(route => { const apiRouter = router({ mergeParams: true }); const apiPaths = route.paths; @@ -222,8 +222,8 @@ module.exports = class ApiRouter { apiRouter.use(cors()); apiRouter.use(user()); - this.templateRouter.register(apiRouter, route.template.paths, route.template.middlewares); - this.mapRouter.register(apiRouter, route.map.paths, route.map.middlewares); + this.templateRouter.register(apiRouter, route.template); + this.mapRouter.register(apiRouter, route.map); apiRouter.use(sendResponse()); apiRouter.use(syntaxError()); diff --git a/lib/cartodb/api/map/map-router.js b/lib/cartodb/api/map/map-router.js index a26637cb..2e17a59f 100644 --- a/lib/cartodb/api/map/map-router.js +++ b/lib/cartodb/api/map/map-router.js @@ -126,21 +126,25 @@ module.exports = class MapRouter { ); } - register (apiRouter, mapPaths, mapMiddlewares = []) { + register (apiRouter, routes) { const mapRouter = router({ mergeParams: true }); - mapMiddlewares.forEach(middleware => mapRouter.use(middleware())); + routes.forEach(route => { + const { paths, middlewares = [] } = route; - this.analysisLayergroupController.register(mapRouter); - this.attributesLayergroupController.register(mapRouter); - this.dataviewLayergroupController.register(mapRouter); - this.previewLayergroupController.register(mapRouter); - this.tileLayergroupController.register(mapRouter); - this.anonymousMapController.register(mapRouter); - this.previewTemplateController.register(mapRouter); - this.analysesController.register(mapRouter); - this.clusteredFeaturesLayergroupController.register(mapRouter); + middlewares.forEach(middleware => mapRouter.use(middleware())); - mapPaths.forEach(path => apiRouter.use(path, mapRouter)); + this.analysisLayergroupController.register(mapRouter); + this.attributesLayergroupController.register(mapRouter); + this.dataviewLayergroupController.register(mapRouter); + this.previewLayergroupController.register(mapRouter); + this.tileLayergroupController.register(mapRouter); + this.anonymousMapController.register(mapRouter); + this.previewTemplateController.register(mapRouter); + this.analysesController.register(mapRouter); + this.clusteredFeaturesLayergroupController.register(mapRouter); + + paths.forEach(path => apiRouter.use(path, mapRouter)); + }); } }; diff --git a/lib/cartodb/api/template/template-router.js b/lib/cartodb/api/template/template-router.js index b4a43053..566dfec4 100644 --- a/lib/cartodb/api/template/template-router.js +++ b/lib/cartodb/api/template/template-router.js @@ -54,15 +54,19 @@ module.exports = class TemplateRouter { ); } - register (apiRouter, templatePaths, templateMiddlewares = []) { + register (apiRouter, routes) { const templateRouter = router({ mergeParams: true }); - templateMiddlewares.forEach(middleware => templateRouter.use(middleware())); + routes.forEach(route => { + const { paths, middlewares = [] } = route; - this.namedMapController.register(templateRouter); - this.tileTemplateController.register(templateRouter); - this.adminTemplateController.register(templateRouter); + middlewares.forEach(middleware => templateRouter.use(middleware())); - templatePaths.forEach(path => apiRouter.use(path, templateRouter)); + this.namedMapController.register(templateRouter); + this.tileTemplateController.register(templateRouter); + this.adminTemplateController.register(templateRouter); + + paths.forEach(path => apiRouter.use(path, templateRouter)); + }); } }; diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index 0ce6380e..f02ee384 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -33,7 +33,7 @@ module.exports = function createServer (serverOptions) { app.set('json replacer', jsonReplacer()); const apiRouter = new ApiRouter({ serverOptions, environmentOptions: global.environment }); - apiRouter.register(app); + apiRouter.register(app, serverOptions.routes.api); const versions = getAndValidateVersions(serverOptions); From a684bead928278add05c3fd575a134ad4e0f33ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 4 Oct 2019 12:22:23 +0200 Subject: [PATCH 09/37] Rename method 'register' -> 'route' --- lib/cartodb/api/api-router.js | 14 ++++++------- .../api/map/analyses-catalog-controller.js | 2 +- .../api/map/analysis-layergroup-controller.js | 2 +- .../api/map/anonymous-map-controller.js | 2 +- .../map/attributes-layergroup-controller.js | 2 +- ...lustered-features-layergroup-controller.js | 2 +- .../api/map/dataview-layergroup-controller.js | 2 +- lib/cartodb/api/map/map-router.js | 20 +++++++++---------- .../api/map/preview-layergroup-controller.js | 2 +- .../api/map/preview-template-controller.js | 2 +- .../api/map/tile-layergroup-controller.js | 2 +- .../api/template/admin-template-controller.js | 2 +- .../api/template/named-template-controller.js | 2 +- lib/cartodb/api/template/template-router.js | 8 ++++---- .../api/template/tile-template-controller.js | 2 +- lib/cartodb/server-info-controller.js | 2 +- lib/cartodb/server.js | 4 ++-- 17 files changed, 35 insertions(+), 37 deletions(-) diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index 0081c0eb..08e5072d 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -196,7 +196,7 @@ module.exports = class ApiRouter { this.templateRouter = new TemplateRouter({ collaborators }); } - register (app, routes) { + route (app, routes) { // FIXME: we need a better way to reset cache while running tests if (process.env.NODE_ENV === 'test') { app.layergroupAffectedTablesCache = this.layergroupAffectedTablesCache; @@ -204,11 +204,9 @@ module.exports = class ApiRouter { routes.forEach(route => { const apiRouter = router({ mergeParams: true }); + const { paths, middlewares = [] } = route; - const apiPaths = route.paths; - const apiMiddlewares = route.middlewares || []; - - apiMiddlewares.forEach(middleware => apiRouter.use(middleware())); + middlewares.forEach(middleware => apiRouter.use(middleware())); apiRouter.use(logger(this.serverOptions)); apiRouter.use(initializeStatusCode()); @@ -222,14 +220,14 @@ module.exports = class ApiRouter { apiRouter.use(cors()); apiRouter.use(user()); - this.templateRouter.register(apiRouter, route.template); - this.mapRouter.register(apiRouter, route.map); + this.templateRouter.route(apiRouter, route.template); + this.mapRouter.route(apiRouter, route.map); apiRouter.use(sendResponse()); apiRouter.use(syntaxError()); apiRouter.use(errorMiddleware()); - apiPaths.forEach(path => app.use(path, apiRouter)); + paths.forEach(path => app.use(path, apiRouter)); }); } }; diff --git a/lib/cartodb/api/map/analyses-catalog-controller.js b/lib/cartodb/api/map/analyses-catalog-controller.js index f7f66346..8c75af63 100644 --- a/lib/cartodb/api/map/analyses-catalog-controller.js +++ b/lib/cartodb/api/map/analyses-catalog-controller.js @@ -17,7 +17,7 @@ module.exports = class AnalysesController { this.userLimitsBackend = userLimitsBackend; } - register (mapRouter) { + route (mapRouter) { mapRouter.get('/analyses/catalog', this.middlewares()); } diff --git a/lib/cartodb/api/map/analysis-layergroup-controller.js b/lib/cartodb/api/map/analysis-layergroup-controller.js index 0375d9ed..fe51e607 100644 --- a/lib/cartodb/api/map/analysis-layergroup-controller.js +++ b/lib/cartodb/api/map/analysis-layergroup-controller.js @@ -17,7 +17,7 @@ module.exports = class AnalysisLayergroupController { this.authBackend = authBackend; } - register (mapRouter) { + route (mapRouter) { mapRouter.get('/:token/analysis/node/:nodeId', this.middlewares()); } diff --git a/lib/cartodb/api/map/anonymous-map-controller.js b/lib/cartodb/api/map/anonymous-map-controller.js index ef47f5b6..32707b03 100644 --- a/lib/cartodb/api/map/anonymous-map-controller.js +++ b/lib/cartodb/api/map/anonymous-map-controller.js @@ -64,7 +64,7 @@ module.exports = class AnonymousMapController { this.layergroupMetadata = layergroupMetadata; } - register (mapRouter) { + route (mapRouter) { mapRouter.options('/'); mapRouter.get('/', this.middlewares()); mapRouter.post('/', this.middlewares()); diff --git a/lib/cartodb/api/map/attributes-layergroup-controller.js b/lib/cartodb/api/map/attributes-layergroup-controller.js index 9ab394d7..a9a26ada 100644 --- a/lib/cartodb/api/map/attributes-layergroup-controller.js +++ b/lib/cartodb/api/map/attributes-layergroup-controller.js @@ -32,7 +32,7 @@ module.exports = class AttributesLayergroupController { this.surrogateKeysCache = surrogateKeysCache; } - register (mapRouter) { + route (mapRouter) { mapRouter.get('/:token/:layer/attributes/:fid', this.middlewares()); } diff --git a/lib/cartodb/api/map/clustered-features-layergroup-controller.js b/lib/cartodb/api/map/clustered-features-layergroup-controller.js index 5c17c5b1..573436d8 100644 --- a/lib/cartodb/api/map/clustered-features-layergroup-controller.js +++ b/lib/cartodb/api/map/clustered-features-layergroup-controller.js @@ -32,7 +32,7 @@ module.exports = class AggregatedFeaturesLayergroupController { this.surrogateKeysCache = surrogateKeysCache; } - register (mapRouter) { + route (mapRouter) { mapRouter.get('/:token/:layer/:z/cluster/:clusterId', this.middlewares()); } diff --git a/lib/cartodb/api/map/dataview-layergroup-controller.js b/lib/cartodb/api/map/dataview-layergroup-controller.js index d82556b8..234e6106 100644 --- a/lib/cartodb/api/map/dataview-layergroup-controller.js +++ b/lib/cartodb/api/map/dataview-layergroup-controller.js @@ -47,7 +47,7 @@ module.exports = class DataviewLayergroupController { this.surrogateKeysCache = surrogateKeysCache; } - register (mapRouter) { + route (mapRouter) { // Undocumented/non-supported API endpoint methods. // Use at your own peril. diff --git a/lib/cartodb/api/map/map-router.js b/lib/cartodb/api/map/map-router.js index 2e17a59f..c5070627 100644 --- a/lib/cartodb/api/map/map-router.js +++ b/lib/cartodb/api/map/map-router.js @@ -126,7 +126,7 @@ module.exports = class MapRouter { ); } - register (apiRouter, routes) { + route (apiRouter, routes) { const mapRouter = router({ mergeParams: true }); routes.forEach(route => { @@ -134,15 +134,15 @@ module.exports = class MapRouter { middlewares.forEach(middleware => mapRouter.use(middleware())); - this.analysisLayergroupController.register(mapRouter); - this.attributesLayergroupController.register(mapRouter); - this.dataviewLayergroupController.register(mapRouter); - this.previewLayergroupController.register(mapRouter); - this.tileLayergroupController.register(mapRouter); - this.anonymousMapController.register(mapRouter); - this.previewTemplateController.register(mapRouter); - this.analysesController.register(mapRouter); - this.clusteredFeaturesLayergroupController.register(mapRouter); + this.analysisLayergroupController.route(mapRouter); + this.attributesLayergroupController.route(mapRouter); + this.dataviewLayergroupController.route(mapRouter); + this.previewLayergroupController.route(mapRouter); + this.tileLayergroupController.route(mapRouter); + this.anonymousMapController.route(mapRouter); + this.previewTemplateController.route(mapRouter); + this.analysesController.route(mapRouter); + this.clusteredFeaturesLayergroupController.route(mapRouter); paths.forEach(path => apiRouter.use(path, mapRouter)); }); diff --git a/lib/cartodb/api/map/preview-layergroup-controller.js b/lib/cartodb/api/map/preview-layergroup-controller.js index f8980866..698d94ff 100644 --- a/lib/cartodb/api/map/preview-layergroup-controller.js +++ b/lib/cartodb/api/map/preview-layergroup-controller.js @@ -35,7 +35,7 @@ module.exports = class PreviewLayergroupController { this.surrogateKeysCache = surrogateKeysCache; } - register (mapRouter) { + route (mapRouter) { mapRouter.get('/static/center/:token/:z/:lat/:lng/:width/:height.:format', this.middlewares({ validateZoom: true, previewType: 'centered' diff --git a/lib/cartodb/api/map/preview-template-controller.js b/lib/cartodb/api/map/preview-template-controller.js index e4f42cae..e4c0beed 100644 --- a/lib/cartodb/api/map/preview-template-controller.js +++ b/lib/cartodb/api/map/preview-template-controller.js @@ -46,7 +46,7 @@ module.exports = class PreviewTemplateController { this.userLimitsBackend = userLimitsBackend; } - register (mapRouter) { + route (mapRouter) { mapRouter.get('/static/named/:template_id/:width/:height.:format', this.middlewares()); } diff --git a/lib/cartodb/api/map/tile-layergroup-controller.js b/lib/cartodb/api/map/tile-layergroup-controller.js index 422fa8b6..18fe23be 100644 --- a/lib/cartodb/api/map/tile-layergroup-controller.js +++ b/lib/cartodb/api/map/tile-layergroup-controller.js @@ -43,7 +43,7 @@ module.exports = class TileLayergroupController { this.surrogateKeysCache = surrogateKeysCache; } - register (mapRouter) { + route (mapRouter) { // REGEXP: doesn't match with `val` const not = (val) => `(?!${val})([^\/]+?)`; diff --git a/lib/cartodb/api/template/admin-template-controller.js b/lib/cartodb/api/template/admin-template-controller.js index c8d2ba97..2416afe2 100644 --- a/lib/cartodb/api/template/admin-template-controller.js +++ b/lib/cartodb/api/template/admin-template-controller.js @@ -18,7 +18,7 @@ module.exports = class AdminTemplateController { this.userLimitsBackend = userLimitsBackend; } - register (templateRouter) { + route (templateRouter) { templateRouter.options(`/:template_id`); templateRouter.post('/', this.middlewares({ diff --git a/lib/cartodb/api/template/named-template-controller.js b/lib/cartodb/api/template/named-template-controller.js index b28143dd..7a7ee9d2 100644 --- a/lib/cartodb/api/template/named-template-controller.js +++ b/lib/cartodb/api/template/named-template-controller.js @@ -63,7 +63,7 @@ module.exports = class NamedMapController { this.layergroupMetadata = layergroupMetadata; } - register (templateRouter) { + route (templateRouter) { templateRouter.get('/:template_id/jsonp', this.middlewares()); templateRouter.post('/:template_id', this.middlewares()); } diff --git a/lib/cartodb/api/template/template-router.js b/lib/cartodb/api/template/template-router.js index 566dfec4..ecdc9802 100644 --- a/lib/cartodb/api/template/template-router.js +++ b/lib/cartodb/api/template/template-router.js @@ -54,7 +54,7 @@ module.exports = class TemplateRouter { ); } - register (apiRouter, routes) { + route (apiRouter, routes) { const templateRouter = router({ mergeParams: true }); routes.forEach(route => { @@ -62,9 +62,9 @@ module.exports = class TemplateRouter { middlewares.forEach(middleware => templateRouter.use(middleware())); - this.namedMapController.register(templateRouter); - this.tileTemplateController.register(templateRouter); - this.adminTemplateController.register(templateRouter); + this.namedMapController.route(templateRouter); + this.tileTemplateController.route(templateRouter); + this.adminTemplateController.route(templateRouter); paths.forEach(path => apiRouter.use(path, templateRouter)); }); diff --git a/lib/cartodb/api/template/tile-template-controller.js b/lib/cartodb/api/template/tile-template-controller.js index daf751e6..90904027 100644 --- a/lib/cartodb/api/template/tile-template-controller.js +++ b/lib/cartodb/api/template/tile-template-controller.js @@ -31,7 +31,7 @@ module.exports = class TileTemplateController { this.userLimitsBackend = userLimitsBackend; } - register (templateRouter) { + route (templateRouter) { templateRouter.get('/:template_id/:layer/:z/:x/:y.(:format)', this.middlewares()); } diff --git a/lib/cartodb/server-info-controller.js b/lib/cartodb/server-info-controller.js index d81051cb..5fbabb26 100644 --- a/lib/cartodb/server-info-controller.js +++ b/lib/cartodb/server-info-controller.js @@ -14,7 +14,7 @@ function ServerInfoController(versions) { module.exports = ServerInfoController; -ServerInfoController.prototype.register = function(monitorRouter) { +ServerInfoController.prototype.route = function(monitorRouter) { monitorRouter.get('/health', this.health.bind(this)); monitorRouter.get('/', this.welcome.bind(this)); monitorRouter.get('/version', this.version.bind(this)); diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index f02ee384..d434c48b 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -33,12 +33,12 @@ module.exports = function createServer (serverOptions) { app.set('json replacer', jsonReplacer()); const apiRouter = new ApiRouter({ serverOptions, environmentOptions: global.environment }); - apiRouter.register(app, serverOptions.routes.api); + apiRouter.route(app, serverOptions.routes.api); const versions = getAndValidateVersions(serverOptions); const serverInfoController = new ServerInfoController(versions); - serverInfoController.register(app); + serverInfoController.route(app); return app; }; From 93edf07da87ab8746ef9116a13ac3e46ba3dc45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 4 Oct 2019 12:35:12 +0200 Subject: [PATCH 10/37] Temporary workaround to not depend on configuration changes --- lib/cartodb/api/api-router.js | 5 +++++ lib/cartodb/api/map/map-router.js | 5 +++++ lib/cartodb/api/template/template-router.js | 6 ++++++ lib/cartodb/server.js | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index 08e5072d..5657f21f 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -202,6 +202,11 @@ module.exports = class ApiRouter { app.layergroupAffectedTablesCache = this.layergroupAffectedTablesCache; } + // TODO: remove it before releasing next major version + if (!Array.isArray(routes)) { + routes = [ routes ]; + } + routes.forEach(route => { const apiRouter = router({ mergeParams: true }); const { paths, middlewares = [] } = route; diff --git a/lib/cartodb/api/map/map-router.js b/lib/cartodb/api/map/map-router.js index c5070627..7af5bd9d 100644 --- a/lib/cartodb/api/map/map-router.js +++ b/lib/cartodb/api/map/map-router.js @@ -129,6 +129,11 @@ module.exports = class MapRouter { route (apiRouter, routes) { const mapRouter = router({ mergeParams: true }); + // TODO: remove it before releasing next major version + if (!Array.isArray(routes)) { + routes = [ routes ]; + } + routes.forEach(route => { const { paths, middlewares = [] } = route; diff --git a/lib/cartodb/api/template/template-router.js b/lib/cartodb/api/template/template-router.js index ecdc9802..2bad038d 100644 --- a/lib/cartodb/api/template/template-router.js +++ b/lib/cartodb/api/template/template-router.js @@ -57,6 +57,12 @@ module.exports = class TemplateRouter { route (apiRouter, routes) { const templateRouter = router({ mergeParams: true }); + // TODO: remove it before releasing next major version + if (!Array.isArray(routes)) { + routes = [ routes ]; + } + + routes.forEach(route => { const { paths, middlewares = [] } = route; diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index d434c48b..01e68391 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -33,6 +33,12 @@ module.exports = function createServer (serverOptions) { app.set('json replacer', jsonReplacer()); const apiRouter = new ApiRouter({ serverOptions, environmentOptions: global.environment }); + + // TODO: remove it before releasing next major version + if (!Array.isArray(serverOptions.routes.api)) { + serverOptions.routes.api = [ serverOptions.routes.api ]; + } + apiRouter.route(app, serverOptions.routes.api); const versions = getAndValidateVersions(serverOptions); From 4e967980a31fdcf3052a7755dfb0ebe343b9fb52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 4 Oct 2019 12:41:27 +0200 Subject: [PATCH 11/37] Prepare next release ans update news --- NEWS.md | 5 ++++- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 58d6104f..058c65bc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,11 @@ # Changelog -## 7.3.0 +## 8.0.0 Released 2019-mm-dd +Breaking changes: +- Schema change for "routes" in configuration file, each "router" is now an array instead of an object. See [`dd06de2`](https://github.com/CartoDB/Windshaft-cartodb/pull/1126/commits/dd06de2632661e19d64c9fbc2be0ba1a8059f54c) for more details. + Announcements: - Added mechanism to inject custom middlewares through configuration. diff --git a/package-lock.json b/package-lock.json index 06ca24ab..b254d14f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "7.3.0", + "version": "8.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f0e54b5d..c983c5ab 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "7.3.0", + "version": "8.0.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From 2ce688ee2a370a2b72b2feda63d113ae81538c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 4 Oct 2019 12:56:36 +0200 Subject: [PATCH 12/37] Missed to apply configuration changes to default server options --- lib/cartodb/server_options.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index b60b92ba..4772fac6 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -74,18 +74,18 @@ module.exports = { ], // Base url for the Detached Maps API // "/api/v1/map" is the new API, - map: { + map: [{ paths: [ '/map', ] - }, + }], // Base url for the Templated Maps API // "/api/v1/map/named" is the new API, - template: { + template: [{ paths: [ '/map/named' ] - } + }] } }, grainstore: { From 4aa6ffe28c99674c9be861bbae5cdbc0798810c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 4 Oct 2019 17:54:32 +0200 Subject: [PATCH 13/37] Add tests to check custom middlewares behavior --- test/acceptance/custom-middlewares.js | 331 ++++++++++++++++++++++++++ 1 file changed, 331 insertions(+) create mode 100644 test/acceptance/custom-middlewares.js diff --git a/test/acceptance/custom-middlewares.js b/test/acceptance/custom-middlewares.js new file mode 100644 index 00000000..38067296 --- /dev/null +++ b/test/acceptance/custom-middlewares.js @@ -0,0 +1,331 @@ +'use strict'; + +const helper = require('../support/test_helper'); +const assert = require('../support/assert'); +const createServer = require('../../lib/cartodb/server'); +const serverOptions = require('../../lib/cartodb/server_options'); + +describe('custom middlewares', function () { + const RESPONSE_OK = { + statusCode: 200 + }; + const RESPONSE_KO_TEAPOT = { + statusCode: 418 + }; + + describe('wired in /api/v1', function () { + before(function () { + const options = Object.assign({}, serverOptions, { + routes: { + api: [{ + paths: [ + '/api/v1', + '/user/:user/api/v1', + ], + middlewares: [ + function teapot () { + return function teapotMiddleware (req, res) { + res.status(418).send('I\'m a teapot'); + }; + } + ], + // Base url for the Detached Maps API + // "/api/v1/map" is the new API, + map: [{ + paths: [ + '/map', + ] + }], + // Base url for the Templated Maps API + // "/api/v1/map/named" is the new API, + template: [{ + paths: [ + '/map/named' + ] + }] + }] + } + }); + + this.server = createServer(options); + }); + + it('POST /api/v1/map/named returns 418: "I\'m a teapot"', function (done) { + const templateid = `custom-middlewares-test-${Date.now()}`; + const template = { + version: '0.0.1', + name: templateid, + layergroup: { + layers: [{ + type: 'cartodb', + options: { + sql: 'select 1 as cartodb_id, null::geometry as the_geom_webmercator' + } + }] + } + }; + const request = { + url: '/api/v1/map/named?api_key=1234', + method: 'POST', + headers: { + host: 'localhost', + 'Content-Type': 'application/json' + }, + data: JSON.stringify(template) + }; + + assert.response(this.server, request, RESPONSE_KO_TEAPOT, (res, err) => { + if (err) { + return done(err); + } + + assert.equal(res.body, 'I\'m a teapot'); + + done(); + }); + }); + + it('POST /api/v1/map returns 418: "I\'m a teapot"', function (done) { + const mapConfig = { + layers: [{ + type: 'cartodb', + options: { + sql: 'select 1 as cartodb_id, null::geometry as the_geom_webmercator' + } + }] + }; + const request = { + url: '/api/v1/map', + method: 'POST', + headers: { + host: 'localhost', + 'Content-Type': 'application/json' + }, + data: JSON.stringify(mapConfig) + }; + + assert.response(this.server, request, RESPONSE_KO_TEAPOT, (res, err) => { + if (err) { + return done(err); + } + + assert.equal(res.body, 'I\'m a teapot'); + + done(); + }); + }); + }); + + describe('wired in /api/v1/map', function () { + before(function () { + const options = Object.assign({}, serverOptions, { + routes: { + api: [{ + paths: [ + '/api/v1', + '/user/:user/api/v1', + ], + // Base url for the Detached Maps API + // "/api/v1/map" is the new API, + map: [{ + paths: [ + '/map', + ], + middlewares: [ + function teapot () { + return function teapotMiddleware (req, res, next) { + if (req.path === '/') { + return res.status(418).send('I\'m a teapot'); + } + next(); + }; + } + ] + }], + // Base url for the Templated Maps API + // "/api/v1/map/named" is the new API, + template: [{ + paths: [ + '/map/named' + ] + }] + }] + } + }); + + this.server = createServer(options); + }); + + it('POST /api/v1/map/named returns 200: template created', function (done) { + const templateid = `custom-middlewares-test-${Date.now()}`; + const template = { + version: '0.0.1', + name: templateid, + layergroup: { + layers: [{ + type: 'cartodb', + options: { + sql: 'select 1 as cartodb_id, null::geometry as the_geom_webmercator' + } + }] + } + }; + const request = { + url: '/api/v1/map/named?api_key=1234', + method: 'POST', + headers: { + host: 'localhost', + 'Content-Type': 'application/json' + }, + data: JSON.stringify(template) + }; + + assert.response(this.server, request, RESPONSE_OK, (res, err) => { + if (err) { + return done(err); + } + + const body = JSON.parse(res.body); + + assert.deepEqual(body, { template_id: templateid }); + + helper.deleteRedisKeys({ ['map_tpl|localhost']: 0 }, done); + }); + }); + + it('POST /api/v1/map returns 418: "I\'m a teapot"', function (done) { + const mapConfig = { + layers: [{ + type: 'cartodb', + options: { + sql: 'select 1 as cartodb_id, null::geometry as the_geom_webmercator' + } + }] + }; + const request = { + url: '/api/v1/map', + method: 'POST', + headers: { + host: 'localhost', + 'Content-Type': 'application/json' + }, + data: JSON.stringify(mapConfig) + }; + + assert.response(this.server, request, RESPONSE_KO_TEAPOT, (res, err) => { + if (err) { + return done(err); + } + + assert.equal(res.body, 'I\'m a teapot'); + + done(); + }); + }); + }); + + describe('wired in /api/v1/map/named', function () { + before(function () { + const options = Object.assign({}, serverOptions, { + routes: { + api: [{ + paths: [ + '/api/v1', + '/user/:user/api/v1', + ], + // Base url for the Detached Maps API + // "/api/v1/map" is the new API, + map: [{ + paths: [ + '/map', + ] + }], + // Base url for the Templated Maps API + // "/api/v1/map/named" is the new API, + template: [{ + paths: [ + '/map/named' + ], + middlewares: [ + function teapot () { + return function teapotMiddleware (req, res) { + res.status(418).send('I\'m a teapot'); + }; + } + ] + }] + }] + } + }); + + this.server = createServer(options); + }); + + it('POST /api/v1/map/named returns 418: "I\'m a teapot"', function (done) { + const templateid = `custom-middlewares-test-${Date.now()}`; + const template = { + version: '0.0.1', + name: templateid, + layergroup: { + layers: [{ + type: 'cartodb', + options: { + sql: 'select 1 as cartodb_id, null::geometry as the_geom_webmercator' + } + }] + } + }; + const request = { + url: '/api/v1/map/named?api_key=1234', + method: 'POST', + headers: { + host: 'localhost', + 'Content-Type': 'application/json' + }, + data: JSON.stringify(template) + }; + + assert.response(this.server, request, RESPONSE_KO_TEAPOT, (res, err) => { + if (err) { + return done(err); + } + + assert.equal(res.body, 'I\'m a teapot'); + + done(); + }); + }); + + it('POST /api/v1/map returns 200: anonymous map created', function (done) { + const mapConfig = { + layers: [{ + type: 'cartodb', + options: { + sql: 'select 1 as cartodb_id, null::geometry as the_geom_webmercator' + } + }] + }; + const request = { + url: '/api/v1/map', + method: 'POST', + headers: { + host: 'localhost', + 'Content-Type': 'application/json' + }, + data: JSON.stringify(mapConfig) + }; + + assert.response(this.server, request, RESPONSE_OK, (res, err) => { + if (err) { + return done(err); + } + + const body = JSON.parse(res.body); + + assert.ok(body.layergroupid); + + helper.deleteRedisKeys({ ['user:localhost:mapviews:global']: 5 }, done); + }); + }); + }); +}); From 43a63feaca075b5258cdc3462174e1a56b15f2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Sun, 6 Oct 2019 18:58:21 +0200 Subject: [PATCH 14/37] Keep the backwards compatibility for routing configuration --- lib/cartodb/api/api-router.js | 5 -- lib/cartodb/api/map/map-router.js | 5 -- lib/cartodb/api/template/template-router.js | 6 --- lib/cartodb/server_options.js | 60 +++++++++++++-------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index 5657f21f..08e5072d 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -202,11 +202,6 @@ module.exports = class ApiRouter { app.layergroupAffectedTablesCache = this.layergroupAffectedTablesCache; } - // TODO: remove it before releasing next major version - if (!Array.isArray(routes)) { - routes = [ routes ]; - } - routes.forEach(route => { const apiRouter = router({ mergeParams: true }); const { paths, middlewares = [] } = route; diff --git a/lib/cartodb/api/map/map-router.js b/lib/cartodb/api/map/map-router.js index 7af5bd9d..c5070627 100644 --- a/lib/cartodb/api/map/map-router.js +++ b/lib/cartodb/api/map/map-router.js @@ -129,11 +129,6 @@ module.exports = class MapRouter { route (apiRouter, routes) { const mapRouter = router({ mergeParams: true }); - // TODO: remove it before releasing next major version - if (!Array.isArray(routes)) { - routes = [ routes ]; - } - routes.forEach(route => { const { paths, middlewares = [] } = route; diff --git a/lib/cartodb/api/template/template-router.js b/lib/cartodb/api/template/template-router.js index 2bad038d..ecdc9802 100644 --- a/lib/cartodb/api/template/template-router.js +++ b/lib/cartodb/api/template/template-router.js @@ -57,12 +57,6 @@ module.exports = class TemplateRouter { route (apiRouter, routes) { const templateRouter = router({ mergeParams: true }); - // TODO: remove it before releasing next major version - if (!Array.isArray(routes)) { - routes = [ routes ]; - } - - routes.forEach(route => { const { paths, middlewares = [] } = route; diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 4772fac6..226153c5 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -58,6 +58,43 @@ var analysisConfig = _.defaults(global.environment.analysis || {}, { limits: {} }); +const routesConfig = global.environment.routes || { + api: [{ + paths: [ + '/api/v1', + '/user/:user/api/v1', + ], + // Base url for the Detached Maps API + // "/api/v1/map" is the new API, + map: [{ + paths: [ + '/map', + ] + }], + // Base url for the Templated Maps API + // "/api/v1/map/named" is the new API, + template: [{ + paths: [ + '/map/named' + ] + }] + }] +}; + +if (!Array.isArray(routesConfig.api)) { + routesConfig.api = [ routesConfig.api ]; +} + +routesConfig.api.forEach(route => { + if (!Array.isArray(route.map)) { + route.map = [ route.map ]; + } + + if (!Array.isArray(route.template)) { + route.template = [ route.template ]; + } +}); + module.exports = { bind: { port: global.environment.port, @@ -66,28 +103,7 @@ module.exports = { // Base URLs for the APIs // // See http://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API - routes: global.environment.routes || { - api: { - paths: [ - '/api/v1', - '/user/:user/api/v1', - ], - // Base url for the Detached Maps API - // "/api/v1/map" is the new API, - map: [{ - paths: [ - '/map', - ] - }], - // Base url for the Templated Maps API - // "/api/v1/map/named" is the new API, - template: [{ - paths: [ - '/map/named' - ] - }] - } - }, + routes: routesConfig, grainstore: { map: { // TODO: allow to specify in configuration From 0d638e6bad7a4f0c6315db23539ea23ccb678db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Sun, 6 Oct 2019 19:12:11 +0200 Subject: [PATCH 15/37] Fix command example --- app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 0864c7fc..c5681e0e 100755 --- a/app.js +++ b/app.js @@ -24,11 +24,11 @@ if (!semver.satisfies(nodejsVersion, engines.node)) { setICUEnvVariable(); var argv = require('yargs') - .usage('Usage: $0 [options]') + .usage('Usage: node $0 [options]') .help('h') .example( - '$0 production -c /etc/sql-api/config.js', - 'start server in production environment with /etc/sql-api/config.js as config file' + 'node $0 production -c /etc/windshaft-cartodb/config.js', + 'start server in production environment with /etc/windshaft-cartodb/config.js as config file' ) .alias('h', 'help') .alias('c', 'config') From 281a079a62d1939bb7e478d6569ab013fab1b8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:40:50 +0200 Subject: [PATCH 16/37] Simplify folder structure --- app.js | 6 +++--- lib/{cartodb => }/api/api-router.js | 2 +- .../api/map/analyses-catalog-controller.js | 0 .../api/map/analysis-layergroup-controller.js | 0 .../api/map/anonymous-map-controller.js | 0 .../api/map/attributes-layergroup-controller.js | 0 .../clustered-features-layergroup-controller.js | 0 .../api/map/dataview-layergroup-controller.js | 0 lib/{cartodb => }/api/map/map-router.js | 0 .../api/map/preview-layergroup-controller.js | 0 .../api/map/preview-template-controller.js | 0 .../api/map/tile-layergroup-controller.js | 0 .../api/middlewares/augment-layergroup-data.js | 0 lib/{cartodb => }/api/middlewares/authorize.js | 0 .../api/middlewares/cache-channel-header.js | 0 .../api/middlewares/cache-control-header.js | 0 .../api/middlewares/check-json-content-type.js | 0 .../api/middlewares/check-static-image-format.js | 0 .../api/middlewares/clean-up-query-params.js | 0 lib/{cartodb => }/api/middlewares/coordinates.js | 0 lib/{cartodb => }/api/middlewares/cors.js | 0 lib/{cartodb => }/api/middlewares/credentials.js | 0 lib/{cartodb => }/api/middlewares/db-conn-setup.js | 0 .../api/middlewares/error-middleware.js | 0 .../api/middlewares/increment-map-view-count.js | 0 lib/{cartodb => }/api/middlewares/init-profiler.js | 0 .../api/middlewares/initialize-status-code.js | 0 .../api/middlewares/last-modified-header.js | 0 .../middlewares/last-updated-time-layergroup.js | 0 lib/{cartodb => }/api/middlewares/layer-stats.js | 0 .../api/middlewares/layergroup-id-header.js | 0 .../api/middlewares/layergroup-metadata.js | 0 .../api/middlewares/layergroup-token.js | 0 lib/{cartodb => }/api/middlewares/logger.js | 0 lib/{cartodb => }/api/middlewares/lzma.js | 0 lib/{cartodb => }/api/middlewares/map-error.js | 0 .../middlewares/map-store-map-config-provider.js | 0 .../api/middlewares/named-map-provider.js | 0 lib/{cartodb => }/api/middlewares/noop.js | 0 lib/{cartodb => }/api/middlewares/rate-limit.js | 0 lib/{cartodb => }/api/middlewares/send-response.js | 0 .../api/middlewares/served-by-host-header.js | 0 lib/{cartodb => }/api/middlewares/stats.js | 0 .../api/middlewares/surrogate-key-header.js | 0 lib/{cartodb => }/api/middlewares/syntax-error.js | 0 lib/{cartodb => }/api/middlewares/user.js | 0 lib/{cartodb => }/api/middlewares/vector-error.js | 2 +- .../api/template/admin-template-controller.js | 0 .../api/template/named-template-controller.js | 0 lib/{cartodb => }/api/template/template-router.js | 0 .../api/template/tile-template-controller.js | 0 lib/{cartodb => }/backends/analysis-status.js | 0 lib/{cartodb => }/backends/analysis.js | 0 lib/{cartodb => }/backends/auth.js | 0 lib/{cartodb => }/backends/cluster.js | 0 lib/{cartodb => }/backends/dataview.js | 0 lib/{cartodb => }/backends/filter-stats.js | 0 .../backends/layer-stats/empty-layer-stats.js | 0 lib/{cartodb => }/backends/layer-stats/factory.js | 0 .../backends/layer-stats/layer-stats.js | 0 .../backends/layer-stats/mapnik-layer-stats.js | 0 .../backends/layer-stats/torque-layer-stats.js | 0 lib/{cartodb => }/backends/overviews-metadata.js | 0 lib/{cartodb => }/backends/pg_connection.js | 0 lib/{cartodb => }/backends/pg_query_runner.js | 0 lib/{cartodb => }/backends/stats.js | 0 lib/{cartodb => }/backends/tables-extent.js | 0 lib/{cartodb => }/backends/template_maps.js | 0 .../backends/turbo-carto-postgres-datasource.js | 0 lib/{cartodb => }/backends/user-limits.js | 0 lib/{cartodb => }/cache/backend/fastly.js | 0 lib/{cartodb => }/cache/backend/varnish_http.js | 0 .../cache/layergroup_affected_tables.js | 0 lib/{cartodb => }/cache/model/named_maps_entry.js | 0 .../cache/named_map_provider_cache.js | 0 lib/{cartodb => }/cache/surrogate_keys_cache.js | 0 .../models/aggregation/aggregation-mapconfig.js | 0 .../models/aggregation/aggregation-query.js | 0 .../models/aggregation/aggregation-validator.js | 0 .../models/aggregation/time-dimension.js | 0 lib/{cartodb => }/models/cdb_request.js | 0 lib/{cartodb => }/models/dataview/aggregation.js | 0 lib/{cartodb => }/models/dataview/base.js | 0 lib/{cartodb => }/models/dataview/factory.js | 2 +- lib/{cartodb => }/models/dataview/formula.js | 0 lib/{cartodb => }/models/dataview/histogram.js | 0 .../models/dataview/histograms/base-histogram.js | 0 .../models/dataview/histograms/date-histogram.js | 0 .../dataview/histograms/numeric-histogram.js | 0 lib/{cartodb => }/models/dataview/index.js | 0 .../models/dataview/overviews/aggregation.js | 0 .../models/dataview/overviews/base.js | 0 .../models/dataview/overviews/factory.js | 2 +- .../models/dataview/overviews/formula.js | 0 .../models/dataview/overviews/histogram.js | 0 .../models/dataview/overviews/index.js | 0 lib/{cartodb => }/models/filter/analysis.js | 0 .../models/filter/analysis/category.js | 0 lib/{cartodb => }/models/filter/analysis/range.js | 0 lib/{cartodb => }/models/filter/bbox.js | 0 lib/{cartodb => }/models/layergroup-token.js | 0 .../adapter/aggregation-mapconfig-adapter.js | 0 .../adapter/analysis-mapconfig-adapter.js | 0 .../mapconfig/adapter/dataviews-widgets-adapter.js | 0 .../models/mapconfig/adapter/index.js | 0 .../adapter/mapconfig-buffer-size-adapter.js | 0 .../adapter/mapconfig-named-layers-adapter.js | 0 .../adapter/mapconfig-overviews-adapter.js | 0 .../adapter/sql-wrap-mapconfig-adapter.js | 0 .../mapconfig/adapter/turbo-carto-adapter.js | 0 .../mapconfig/adapter/vector-mapconfig-adapter.js | 0 .../mapconfig/provider/base-mapconfig-adapter.js | 0 .../provider/create-layergroup-provider.js | 0 .../mapconfig/provider/map-store-provider.js | 0 .../mapconfig/provider/named-map-provider.js | 0 lib/{cartodb => }/models/resource-locator.js | 0 lib/{cartodb => }/monitoring/health_check.js | 0 lib/{cartodb => }/server-info-controller.js | 0 lib/{cartodb => }/server.js | 2 +- lib/{cartodb => }/server_options.js | 0 lib/{cartodb => }/stats/client.js | 0 lib/{cartodb => }/stats/profiler_proxy.js | 0 .../stats/reporter/named-map-provider.js | 0 lib/{cartodb => }/stats/reporter/renderer.js | 0 lib/{cartodb => }/stats/timer.js | 0 lib/{cartodb => }/utils/database-params.js | 0 lib/{cartodb => }/utils/date-wrapper.js | 0 lib/{cartodb => }/utils/icu_data_env_setter.js | 0 lib/{cartodb => }/utils/json-replacer.js | 0 lib/{cartodb => }/utils/layergroup-metadata.js | 0 .../utils/overviews_query_rewriter.js | 0 lib/{cartodb => }/utils/query-utils.js | 0 lib/{cartodb => }/utils/substitution-tokens.js | 0 lib/{cartodb => }/utils/table_name_parser.js | 0 test/acceptance/aggregation.js | 2 +- test/acceptance/analysis/named-maps.js | 6 +++--- .../auth/authorization-basic-use-cases.js | 6 +++--- test/acceptance/buffer-size-format.js | 2 +- test/acceptance/cache/cache_headers.js | 6 +++--- .../cache/surrogate_keys_invalidation.js | 6 +++--- test/acceptance/custom-middlewares.js | 4 ++-- test/acceptance/date-wrapping.spec.js | 2 +- test/acceptance/dynamic-styling-named-maps.js | 6 +++--- test/acceptance/errors-with-context.js | 4 ++-- test/acceptance/health_check.js | 4 ++-- test/acceptance/layergroup-metadata.js | 2 +- test/acceptance/multilayer.js | 6 +++--- test/acceptance/multilayer_server.js | 8 ++++---- test/acceptance/mvt-regressions.js | 2 +- test/acceptance/mvt.js | 2 +- test/acceptance/named-map-cache-regressions.js | 4 ++-- test/acceptance/named_layers.js | 8 ++++---- test/acceptance/named_layers_visibility.js | 6 +++--- test/acceptance/named_maps_authentication.js | 8 ++++---- test/acceptance/named_maps_cache.js | 4 ++-- test/acceptance/named_maps_static_view.js | 6 +++--- test/acceptance/named_maps_stats.js | 8 ++++---- test/acceptance/overviews_metadata.js | 6 +++--- test/acceptance/overviews_metadata_named_maps.js | 6 +++--- test/acceptance/overviews_queries.js | 2 +- test/acceptance/ported/attributes.js | 4 ++-- test/acceptance/ported/multilayer.js | 4 ++-- test/acceptance/ported/multilayer_error_cases.js | 2 +- test/acceptance/ported/multilayer_interactivity.js | 4 ++-- test/acceptance/ported/raster.js | 4 ++-- test/acceptance/ported/retina.js | 4 ++-- test/acceptance/ported/server.js | 2 +- test/acceptance/ported/server_gettile.js | 2 +- test/acceptance/ported/server_png8_format.js | 4 ++-- .../ported/support/ported_server_options.js | 4 ++-- test/acceptance/ported/support/test_client.js | 4 ++-- test/acceptance/ported/torque.js | 4 ++-- test/acceptance/ported/torque_boundaries.js | 4 ++-- test/acceptance/rate-limit.test.js | 6 +++--- test/acceptance/regressions.js | 6 +++--- test/acceptance/server.js | 4 ++-- test/acceptance/stats/mapnik_stats_layergroup.js | 2 +- test/acceptance/templates.js | 8 ++++---- test/acceptance/tilejson.js | 2 +- test/acceptance/turbo-carto/named-maps.js | 6 +++--- test/acceptance/user-database-timeout-limit.js | 2 +- test/acceptance/user-render-timeout-limit.js | 2 +- test/acceptance/vector-layergroup.js | 2 +- test/acceptance/widgets/named-maps.js | 6 +++--- test/integration/analysis-backend-limits.js | 2 +- .../mapconfig_named_layers_datasource.js | 6 +++--- .../integration/mapconfig_named_layers_expanded.js | 6 +++--- test/integration/mapconfig_overviews_adapter.js | 10 +++++----- test/integration/overviews-metadata-api.js | 6 +++--- test/integration/pg-query-runner.js | 4 ++-- test/integration/profiler.js | 4 ++-- test/integration/query-tables.js | 2 +- test/integration/template-maps-limits.js | 2 +- test/support/test-client.js | 6 +++--- test/support/test_helper.js | 2 +- .../backends/layer-stats/mapnik-layer-stats.js | 2 +- .../backends/layer-stats/torque-layer-stats.js | 2 +- .../backends/turbo-carto-postgres-datasource.js | 2 +- .../cartodb/cache/model/named_maps_entry.test.js | 2 +- test/unit/cartodb/cdb_request.test.js | 2 +- test/unit/cartodb/error-middleware.test.js | 2 +- test/unit/cartodb/error_messages.test.js | 2 +- test/unit/cartodb/lzmaMiddleware.test.js | 2 +- test/unit/cartodb/mapconfig/adapter.test.js | 2 +- .../mapconfig/dataviews-widgets-adapter.test.js | 2 +- test/unit/cartodb/middlewares/coordinates.test.js | 2 +- .../unit/cartodb/model/filter/bbox-filters.test.js | 2 +- test/unit/cartodb/model/resource-locator.test.js | 2 +- test/unit/cartodb/overviews_query_rewriter.js | 2 +- test/unit/cartodb/ported/profiler.test.js | 2 +- test/unit/cartodb/ported/stats_client.test.js | 2 +- test/unit/cartodb/ported/windshaft_server.test.js | 4 ++-- test/unit/cartodb/prepare-context.test.js | 14 +++++++------- .../cartodb/stats/reporter/named-map-provider.js | 2 +- test/unit/cartodb/substitution-tokens.test.js | 2 +- test/unit/cartodb/table_name_parser.js | 2 +- test/unit/cartodb/template_maps.test.js | 2 +- test/unit/cartodb/template_maps_auth.test.js | 2 +- test/unit/cartodb/template_maps_defaults.test.js | 2 +- test/unit/cartodb/utils/date-wrapper.test.js | 2 +- test/unit/cartodb/valid_template_maps.test.js | 2 +- 221 files changed, 175 insertions(+), 175 deletions(-) rename lib/{cartodb => }/api/api-router.js (99%) rename lib/{cartodb => }/api/map/analyses-catalog-controller.js (100%) rename lib/{cartodb => }/api/map/analysis-layergroup-controller.js (100%) rename lib/{cartodb => }/api/map/anonymous-map-controller.js (100%) rename lib/{cartodb => }/api/map/attributes-layergroup-controller.js (100%) rename lib/{cartodb => }/api/map/clustered-features-layergroup-controller.js (100%) rename lib/{cartodb => }/api/map/dataview-layergroup-controller.js (100%) rename lib/{cartodb => }/api/map/map-router.js (100%) rename lib/{cartodb => }/api/map/preview-layergroup-controller.js (100%) rename lib/{cartodb => }/api/map/preview-template-controller.js (100%) rename lib/{cartodb => }/api/map/tile-layergroup-controller.js (100%) rename lib/{cartodb => }/api/middlewares/augment-layergroup-data.js (100%) rename lib/{cartodb => }/api/middlewares/authorize.js (100%) rename lib/{cartodb => }/api/middlewares/cache-channel-header.js (100%) rename lib/{cartodb => }/api/middlewares/cache-control-header.js (100%) rename lib/{cartodb => }/api/middlewares/check-json-content-type.js (100%) rename lib/{cartodb => }/api/middlewares/check-static-image-format.js (100%) rename lib/{cartodb => }/api/middlewares/clean-up-query-params.js (100%) rename lib/{cartodb => }/api/middlewares/coordinates.js (100%) rename lib/{cartodb => }/api/middlewares/cors.js (100%) rename lib/{cartodb => }/api/middlewares/credentials.js (100%) rename lib/{cartodb => }/api/middlewares/db-conn-setup.js (100%) rename lib/{cartodb => }/api/middlewares/error-middleware.js (100%) rename lib/{cartodb => }/api/middlewares/increment-map-view-count.js (100%) rename lib/{cartodb => }/api/middlewares/init-profiler.js (100%) rename lib/{cartodb => }/api/middlewares/initialize-status-code.js (100%) rename lib/{cartodb => }/api/middlewares/last-modified-header.js (100%) rename lib/{cartodb => }/api/middlewares/last-updated-time-layergroup.js (100%) rename lib/{cartodb => }/api/middlewares/layer-stats.js (100%) rename lib/{cartodb => }/api/middlewares/layergroup-id-header.js (100%) rename lib/{cartodb => }/api/middlewares/layergroup-metadata.js (100%) rename lib/{cartodb => }/api/middlewares/layergroup-token.js (100%) rename lib/{cartodb => }/api/middlewares/logger.js (100%) rename lib/{cartodb => }/api/middlewares/lzma.js (100%) rename lib/{cartodb => }/api/middlewares/map-error.js (100%) rename lib/{cartodb => }/api/middlewares/map-store-map-config-provider.js (100%) rename lib/{cartodb => }/api/middlewares/named-map-provider.js (100%) rename lib/{cartodb => }/api/middlewares/noop.js (100%) rename lib/{cartodb => }/api/middlewares/rate-limit.js (100%) rename lib/{cartodb => }/api/middlewares/send-response.js (100%) rename lib/{cartodb => }/api/middlewares/served-by-host-header.js (100%) rename lib/{cartodb => }/api/middlewares/stats.js (100%) rename lib/{cartodb => }/api/middlewares/surrogate-key-header.js (100%) rename lib/{cartodb => }/api/middlewares/syntax-error.js (100%) rename lib/{cartodb => }/api/middlewares/user.js (100%) rename lib/{cartodb => }/api/middlewares/vector-error.js (95%) rename lib/{cartodb => }/api/template/admin-template-controller.js (100%) rename lib/{cartodb => }/api/template/named-template-controller.js (100%) rename lib/{cartodb => }/api/template/template-router.js (100%) rename lib/{cartodb => }/api/template/tile-template-controller.js (100%) rename lib/{cartodb => }/backends/analysis-status.js (100%) rename lib/{cartodb => }/backends/analysis.js (100%) rename lib/{cartodb => }/backends/auth.js (100%) rename lib/{cartodb => }/backends/cluster.js (100%) rename lib/{cartodb => }/backends/dataview.js (100%) rename lib/{cartodb => }/backends/filter-stats.js (100%) rename lib/{cartodb => }/backends/layer-stats/empty-layer-stats.js (100%) rename lib/{cartodb => }/backends/layer-stats/factory.js (100%) rename lib/{cartodb => }/backends/layer-stats/layer-stats.js (100%) rename lib/{cartodb => }/backends/layer-stats/mapnik-layer-stats.js (100%) rename lib/{cartodb => }/backends/layer-stats/torque-layer-stats.js (100%) rename lib/{cartodb => }/backends/overviews-metadata.js (100%) rename lib/{cartodb => }/backends/pg_connection.js (100%) rename lib/{cartodb => }/backends/pg_query_runner.js (100%) rename lib/{cartodb => }/backends/stats.js (100%) rename lib/{cartodb => }/backends/tables-extent.js (100%) rename lib/{cartodb => }/backends/template_maps.js (100%) rename lib/{cartodb => }/backends/turbo-carto-postgres-datasource.js (100%) rename lib/{cartodb => }/backends/user-limits.js (100%) rename lib/{cartodb => }/cache/backend/fastly.js (100%) rename lib/{cartodb => }/cache/backend/varnish_http.js (100%) rename lib/{cartodb => }/cache/layergroup_affected_tables.js (100%) rename lib/{cartodb => }/cache/model/named_maps_entry.js (100%) rename lib/{cartodb => }/cache/named_map_provider_cache.js (100%) rename lib/{cartodb => }/cache/surrogate_keys_cache.js (100%) rename lib/{cartodb => }/models/aggregation/aggregation-mapconfig.js (100%) rename lib/{cartodb => }/models/aggregation/aggregation-query.js (100%) rename lib/{cartodb => }/models/aggregation/aggregation-validator.js (100%) rename lib/{cartodb => }/models/aggregation/time-dimension.js (100%) rename lib/{cartodb => }/models/cdb_request.js (100%) rename lib/{cartodb => }/models/dataview/aggregation.js (100%) rename lib/{cartodb => }/models/dataview/base.js (100%) rename lib/{cartodb => }/models/dataview/factory.js (94%) rename lib/{cartodb => }/models/dataview/formula.js (100%) rename lib/{cartodb => }/models/dataview/histogram.js (100%) rename lib/{cartodb => }/models/dataview/histograms/base-histogram.js (100%) rename lib/{cartodb => }/models/dataview/histograms/date-histogram.js (100%) rename lib/{cartodb => }/models/dataview/histograms/numeric-histogram.js (100%) rename lib/{cartodb => }/models/dataview/index.js (100%) rename lib/{cartodb => }/models/dataview/overviews/aggregation.js (100%) rename lib/{cartodb => }/models/dataview/overviews/base.js (100%) rename lib/{cartodb => }/models/dataview/overviews/factory.js (97%) rename lib/{cartodb => }/models/dataview/overviews/formula.js (100%) rename lib/{cartodb => }/models/dataview/overviews/histogram.js (100%) rename lib/{cartodb => }/models/dataview/overviews/index.js (100%) rename lib/{cartodb => }/models/filter/analysis.js (100%) rename lib/{cartodb => }/models/filter/analysis/category.js (100%) rename lib/{cartodb => }/models/filter/analysis/range.js (100%) rename lib/{cartodb => }/models/filter/bbox.js (100%) rename lib/{cartodb => }/models/layergroup-token.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/aggregation-mapconfig-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/analysis-mapconfig-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/dataviews-widgets-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/index.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/mapconfig-named-layers-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/mapconfig-overviews-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/turbo-carto-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/adapter/vector-mapconfig-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/provider/base-mapconfig-adapter.js (100%) rename lib/{cartodb => }/models/mapconfig/provider/create-layergroup-provider.js (100%) rename lib/{cartodb => }/models/mapconfig/provider/map-store-provider.js (100%) rename lib/{cartodb => }/models/mapconfig/provider/named-map-provider.js (100%) rename lib/{cartodb => }/models/resource-locator.js (100%) rename lib/{cartodb => }/monitoring/health_check.js (100%) rename lib/{cartodb => }/server-info-controller.js (100%) rename lib/{cartodb => }/server.js (98%) rename lib/{cartodb => }/server_options.js (100%) rename lib/{cartodb => }/stats/client.js (100%) rename lib/{cartodb => }/stats/profiler_proxy.js (100%) rename lib/{cartodb => }/stats/reporter/named-map-provider.js (100%) rename lib/{cartodb => }/stats/reporter/renderer.js (100%) rename lib/{cartodb => }/stats/timer.js (100%) rename lib/{cartodb => }/utils/database-params.js (100%) rename lib/{cartodb => }/utils/date-wrapper.js (100%) rename lib/{cartodb => }/utils/icu_data_env_setter.js (100%) rename lib/{cartodb => }/utils/json-replacer.js (100%) rename lib/{cartodb => }/utils/layergroup-metadata.js (100%) rename lib/{cartodb => }/utils/overviews_query_rewriter.js (100%) rename lib/{cartodb => }/utils/query-utils.js (100%) rename lib/{cartodb => }/utils/substitution-tokens.js (100%) rename lib/{cartodb => }/utils/table_name_parser.js (100%) diff --git a/app.js b/app.js index c5681e0e..5874c178 100755 --- a/app.js +++ b/app.js @@ -6,7 +6,7 @@ var path = require('path'); var fs = require('fs'); var _ = require('underscore'); var semver = require('semver'); -const setICUEnvVariable = require('./lib/cartodb/utils/icu_data_env_setter'); +const setICUEnvVariable = require('./lib/utils/icu_data_env_setter'); // jshint undef:false var log = console.log.bind(console); @@ -105,8 +105,8 @@ global.logger = global.log4js.getLogger(); // Include cartodb_windshaft only _after_ the "global" variable is set // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28 -var cartodbWindshaft = require('./lib/cartodb/server'); -var serverOptions = require('./lib/cartodb/server_options'); +var cartodbWindshaft = require('./lib/server'); +var serverOptions = require('./lib/server_options'); var server = cartodbWindshaft(serverOptions); diff --git a/lib/cartodb/api/api-router.js b/lib/api/api-router.js similarity index 99% rename from lib/cartodb/api/api-router.js rename to lib/api/api-router.js index 08e5072d..8785a50e 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/api/api-router.js @@ -282,7 +282,7 @@ function createSurrogateKeysCacheBackends(serverOptions) { return cacheBackends; } -const timeoutErrorTilePath = __dirname + '/../../../assets/render-timeout-fallback.png'; +const timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png'; const timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null}); function createRendererFactory ({ redisPool, serverOptions, environmentOptions }) { diff --git a/lib/cartodb/api/map/analyses-catalog-controller.js b/lib/api/map/analyses-catalog-controller.js similarity index 100% rename from lib/cartodb/api/map/analyses-catalog-controller.js rename to lib/api/map/analyses-catalog-controller.js diff --git a/lib/cartodb/api/map/analysis-layergroup-controller.js b/lib/api/map/analysis-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/analysis-layergroup-controller.js rename to lib/api/map/analysis-layergroup-controller.js diff --git a/lib/cartodb/api/map/anonymous-map-controller.js b/lib/api/map/anonymous-map-controller.js similarity index 100% rename from lib/cartodb/api/map/anonymous-map-controller.js rename to lib/api/map/anonymous-map-controller.js diff --git a/lib/cartodb/api/map/attributes-layergroup-controller.js b/lib/api/map/attributes-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/attributes-layergroup-controller.js rename to lib/api/map/attributes-layergroup-controller.js diff --git a/lib/cartodb/api/map/clustered-features-layergroup-controller.js b/lib/api/map/clustered-features-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/clustered-features-layergroup-controller.js rename to lib/api/map/clustered-features-layergroup-controller.js diff --git a/lib/cartodb/api/map/dataview-layergroup-controller.js b/lib/api/map/dataview-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/dataview-layergroup-controller.js rename to lib/api/map/dataview-layergroup-controller.js diff --git a/lib/cartodb/api/map/map-router.js b/lib/api/map/map-router.js similarity index 100% rename from lib/cartodb/api/map/map-router.js rename to lib/api/map/map-router.js diff --git a/lib/cartodb/api/map/preview-layergroup-controller.js b/lib/api/map/preview-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/preview-layergroup-controller.js rename to lib/api/map/preview-layergroup-controller.js diff --git a/lib/cartodb/api/map/preview-template-controller.js b/lib/api/map/preview-template-controller.js similarity index 100% rename from lib/cartodb/api/map/preview-template-controller.js rename to lib/api/map/preview-template-controller.js diff --git a/lib/cartodb/api/map/tile-layergroup-controller.js b/lib/api/map/tile-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/tile-layergroup-controller.js rename to lib/api/map/tile-layergroup-controller.js diff --git a/lib/cartodb/api/middlewares/augment-layergroup-data.js b/lib/api/middlewares/augment-layergroup-data.js similarity index 100% rename from lib/cartodb/api/middlewares/augment-layergroup-data.js rename to lib/api/middlewares/augment-layergroup-data.js diff --git a/lib/cartodb/api/middlewares/authorize.js b/lib/api/middlewares/authorize.js similarity index 100% rename from lib/cartodb/api/middlewares/authorize.js rename to lib/api/middlewares/authorize.js diff --git a/lib/cartodb/api/middlewares/cache-channel-header.js b/lib/api/middlewares/cache-channel-header.js similarity index 100% rename from lib/cartodb/api/middlewares/cache-channel-header.js rename to lib/api/middlewares/cache-channel-header.js diff --git a/lib/cartodb/api/middlewares/cache-control-header.js b/lib/api/middlewares/cache-control-header.js similarity index 100% rename from lib/cartodb/api/middlewares/cache-control-header.js rename to lib/api/middlewares/cache-control-header.js diff --git a/lib/cartodb/api/middlewares/check-json-content-type.js b/lib/api/middlewares/check-json-content-type.js similarity index 100% rename from lib/cartodb/api/middlewares/check-json-content-type.js rename to lib/api/middlewares/check-json-content-type.js diff --git a/lib/cartodb/api/middlewares/check-static-image-format.js b/lib/api/middlewares/check-static-image-format.js similarity index 100% rename from lib/cartodb/api/middlewares/check-static-image-format.js rename to lib/api/middlewares/check-static-image-format.js diff --git a/lib/cartodb/api/middlewares/clean-up-query-params.js b/lib/api/middlewares/clean-up-query-params.js similarity index 100% rename from lib/cartodb/api/middlewares/clean-up-query-params.js rename to lib/api/middlewares/clean-up-query-params.js diff --git a/lib/cartodb/api/middlewares/coordinates.js b/lib/api/middlewares/coordinates.js similarity index 100% rename from lib/cartodb/api/middlewares/coordinates.js rename to lib/api/middlewares/coordinates.js diff --git a/lib/cartodb/api/middlewares/cors.js b/lib/api/middlewares/cors.js similarity index 100% rename from lib/cartodb/api/middlewares/cors.js rename to lib/api/middlewares/cors.js diff --git a/lib/cartodb/api/middlewares/credentials.js b/lib/api/middlewares/credentials.js similarity index 100% rename from lib/cartodb/api/middlewares/credentials.js rename to lib/api/middlewares/credentials.js diff --git a/lib/cartodb/api/middlewares/db-conn-setup.js b/lib/api/middlewares/db-conn-setup.js similarity index 100% rename from lib/cartodb/api/middlewares/db-conn-setup.js rename to lib/api/middlewares/db-conn-setup.js diff --git a/lib/cartodb/api/middlewares/error-middleware.js b/lib/api/middlewares/error-middleware.js similarity index 100% rename from lib/cartodb/api/middlewares/error-middleware.js rename to lib/api/middlewares/error-middleware.js diff --git a/lib/cartodb/api/middlewares/increment-map-view-count.js b/lib/api/middlewares/increment-map-view-count.js similarity index 100% rename from lib/cartodb/api/middlewares/increment-map-view-count.js rename to lib/api/middlewares/increment-map-view-count.js diff --git a/lib/cartodb/api/middlewares/init-profiler.js b/lib/api/middlewares/init-profiler.js similarity index 100% rename from lib/cartodb/api/middlewares/init-profiler.js rename to lib/api/middlewares/init-profiler.js diff --git a/lib/cartodb/api/middlewares/initialize-status-code.js b/lib/api/middlewares/initialize-status-code.js similarity index 100% rename from lib/cartodb/api/middlewares/initialize-status-code.js rename to lib/api/middlewares/initialize-status-code.js diff --git a/lib/cartodb/api/middlewares/last-modified-header.js b/lib/api/middlewares/last-modified-header.js similarity index 100% rename from lib/cartodb/api/middlewares/last-modified-header.js rename to lib/api/middlewares/last-modified-header.js diff --git a/lib/cartodb/api/middlewares/last-updated-time-layergroup.js b/lib/api/middlewares/last-updated-time-layergroup.js similarity index 100% rename from lib/cartodb/api/middlewares/last-updated-time-layergroup.js rename to lib/api/middlewares/last-updated-time-layergroup.js diff --git a/lib/cartodb/api/middlewares/layer-stats.js b/lib/api/middlewares/layer-stats.js similarity index 100% rename from lib/cartodb/api/middlewares/layer-stats.js rename to lib/api/middlewares/layer-stats.js diff --git a/lib/cartodb/api/middlewares/layergroup-id-header.js b/lib/api/middlewares/layergroup-id-header.js similarity index 100% rename from lib/cartodb/api/middlewares/layergroup-id-header.js rename to lib/api/middlewares/layergroup-id-header.js diff --git a/lib/cartodb/api/middlewares/layergroup-metadata.js b/lib/api/middlewares/layergroup-metadata.js similarity index 100% rename from lib/cartodb/api/middlewares/layergroup-metadata.js rename to lib/api/middlewares/layergroup-metadata.js diff --git a/lib/cartodb/api/middlewares/layergroup-token.js b/lib/api/middlewares/layergroup-token.js similarity index 100% rename from lib/cartodb/api/middlewares/layergroup-token.js rename to lib/api/middlewares/layergroup-token.js diff --git a/lib/cartodb/api/middlewares/logger.js b/lib/api/middlewares/logger.js similarity index 100% rename from lib/cartodb/api/middlewares/logger.js rename to lib/api/middlewares/logger.js diff --git a/lib/cartodb/api/middlewares/lzma.js b/lib/api/middlewares/lzma.js similarity index 100% rename from lib/cartodb/api/middlewares/lzma.js rename to lib/api/middlewares/lzma.js diff --git a/lib/cartodb/api/middlewares/map-error.js b/lib/api/middlewares/map-error.js similarity index 100% rename from lib/cartodb/api/middlewares/map-error.js rename to lib/api/middlewares/map-error.js diff --git a/lib/cartodb/api/middlewares/map-store-map-config-provider.js b/lib/api/middlewares/map-store-map-config-provider.js similarity index 100% rename from lib/cartodb/api/middlewares/map-store-map-config-provider.js rename to lib/api/middlewares/map-store-map-config-provider.js diff --git a/lib/cartodb/api/middlewares/named-map-provider.js b/lib/api/middlewares/named-map-provider.js similarity index 100% rename from lib/cartodb/api/middlewares/named-map-provider.js rename to lib/api/middlewares/named-map-provider.js diff --git a/lib/cartodb/api/middlewares/noop.js b/lib/api/middlewares/noop.js similarity index 100% rename from lib/cartodb/api/middlewares/noop.js rename to lib/api/middlewares/noop.js diff --git a/lib/cartodb/api/middlewares/rate-limit.js b/lib/api/middlewares/rate-limit.js similarity index 100% rename from lib/cartodb/api/middlewares/rate-limit.js rename to lib/api/middlewares/rate-limit.js diff --git a/lib/cartodb/api/middlewares/send-response.js b/lib/api/middlewares/send-response.js similarity index 100% rename from lib/cartodb/api/middlewares/send-response.js rename to lib/api/middlewares/send-response.js diff --git a/lib/cartodb/api/middlewares/served-by-host-header.js b/lib/api/middlewares/served-by-host-header.js similarity index 100% rename from lib/cartodb/api/middlewares/served-by-host-header.js rename to lib/api/middlewares/served-by-host-header.js diff --git a/lib/cartodb/api/middlewares/stats.js b/lib/api/middlewares/stats.js similarity index 100% rename from lib/cartodb/api/middlewares/stats.js rename to lib/api/middlewares/stats.js diff --git a/lib/cartodb/api/middlewares/surrogate-key-header.js b/lib/api/middlewares/surrogate-key-header.js similarity index 100% rename from lib/cartodb/api/middlewares/surrogate-key-header.js rename to lib/api/middlewares/surrogate-key-header.js diff --git a/lib/cartodb/api/middlewares/syntax-error.js b/lib/api/middlewares/syntax-error.js similarity index 100% rename from lib/cartodb/api/middlewares/syntax-error.js rename to lib/api/middlewares/syntax-error.js diff --git a/lib/cartodb/api/middlewares/user.js b/lib/api/middlewares/user.js similarity index 100% rename from lib/cartodb/api/middlewares/user.js rename to lib/api/middlewares/user.js diff --git a/lib/cartodb/api/middlewares/vector-error.js b/lib/api/middlewares/vector-error.js similarity index 95% rename from lib/cartodb/api/middlewares/vector-error.js rename to lib/api/middlewares/vector-error.js index 4de1ebce..6e69f982 100644 --- a/lib/cartodb/api/middlewares/vector-error.js +++ b/lib/api/middlewares/vector-error.js @@ -1,7 +1,7 @@ 'use strict'; const fs = require('fs'); -const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../../assets/render-timeout-fallback.mvt'); +const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../assets/render-timeout-fallback.mvt'); module.exports = function vectorError() { return function vectorErrorMiddleware(err, req, res, next) { diff --git a/lib/cartodb/api/template/admin-template-controller.js b/lib/api/template/admin-template-controller.js similarity index 100% rename from lib/cartodb/api/template/admin-template-controller.js rename to lib/api/template/admin-template-controller.js diff --git a/lib/cartodb/api/template/named-template-controller.js b/lib/api/template/named-template-controller.js similarity index 100% rename from lib/cartodb/api/template/named-template-controller.js rename to lib/api/template/named-template-controller.js diff --git a/lib/cartodb/api/template/template-router.js b/lib/api/template/template-router.js similarity index 100% rename from lib/cartodb/api/template/template-router.js rename to lib/api/template/template-router.js diff --git a/lib/cartodb/api/template/tile-template-controller.js b/lib/api/template/tile-template-controller.js similarity index 100% rename from lib/cartodb/api/template/tile-template-controller.js rename to lib/api/template/tile-template-controller.js diff --git a/lib/cartodb/backends/analysis-status.js b/lib/backends/analysis-status.js similarity index 100% rename from lib/cartodb/backends/analysis-status.js rename to lib/backends/analysis-status.js diff --git a/lib/cartodb/backends/analysis.js b/lib/backends/analysis.js similarity index 100% rename from lib/cartodb/backends/analysis.js rename to lib/backends/analysis.js diff --git a/lib/cartodb/backends/auth.js b/lib/backends/auth.js similarity index 100% rename from lib/cartodb/backends/auth.js rename to lib/backends/auth.js diff --git a/lib/cartodb/backends/cluster.js b/lib/backends/cluster.js similarity index 100% rename from lib/cartodb/backends/cluster.js rename to lib/backends/cluster.js diff --git a/lib/cartodb/backends/dataview.js b/lib/backends/dataview.js similarity index 100% rename from lib/cartodb/backends/dataview.js rename to lib/backends/dataview.js diff --git a/lib/cartodb/backends/filter-stats.js b/lib/backends/filter-stats.js similarity index 100% rename from lib/cartodb/backends/filter-stats.js rename to lib/backends/filter-stats.js diff --git a/lib/cartodb/backends/layer-stats/empty-layer-stats.js b/lib/backends/layer-stats/empty-layer-stats.js similarity index 100% rename from lib/cartodb/backends/layer-stats/empty-layer-stats.js rename to lib/backends/layer-stats/empty-layer-stats.js diff --git a/lib/cartodb/backends/layer-stats/factory.js b/lib/backends/layer-stats/factory.js similarity index 100% rename from lib/cartodb/backends/layer-stats/factory.js rename to lib/backends/layer-stats/factory.js diff --git a/lib/cartodb/backends/layer-stats/layer-stats.js b/lib/backends/layer-stats/layer-stats.js similarity index 100% rename from lib/cartodb/backends/layer-stats/layer-stats.js rename to lib/backends/layer-stats/layer-stats.js diff --git a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js b/lib/backends/layer-stats/mapnik-layer-stats.js similarity index 100% rename from lib/cartodb/backends/layer-stats/mapnik-layer-stats.js rename to lib/backends/layer-stats/mapnik-layer-stats.js diff --git a/lib/cartodb/backends/layer-stats/torque-layer-stats.js b/lib/backends/layer-stats/torque-layer-stats.js similarity index 100% rename from lib/cartodb/backends/layer-stats/torque-layer-stats.js rename to lib/backends/layer-stats/torque-layer-stats.js diff --git a/lib/cartodb/backends/overviews-metadata.js b/lib/backends/overviews-metadata.js similarity index 100% rename from lib/cartodb/backends/overviews-metadata.js rename to lib/backends/overviews-metadata.js diff --git a/lib/cartodb/backends/pg_connection.js b/lib/backends/pg_connection.js similarity index 100% rename from lib/cartodb/backends/pg_connection.js rename to lib/backends/pg_connection.js diff --git a/lib/cartodb/backends/pg_query_runner.js b/lib/backends/pg_query_runner.js similarity index 100% rename from lib/cartodb/backends/pg_query_runner.js rename to lib/backends/pg_query_runner.js diff --git a/lib/cartodb/backends/stats.js b/lib/backends/stats.js similarity index 100% rename from lib/cartodb/backends/stats.js rename to lib/backends/stats.js diff --git a/lib/cartodb/backends/tables-extent.js b/lib/backends/tables-extent.js similarity index 100% rename from lib/cartodb/backends/tables-extent.js rename to lib/backends/tables-extent.js diff --git a/lib/cartodb/backends/template_maps.js b/lib/backends/template_maps.js similarity index 100% rename from lib/cartodb/backends/template_maps.js rename to lib/backends/template_maps.js diff --git a/lib/cartodb/backends/turbo-carto-postgres-datasource.js b/lib/backends/turbo-carto-postgres-datasource.js similarity index 100% rename from lib/cartodb/backends/turbo-carto-postgres-datasource.js rename to lib/backends/turbo-carto-postgres-datasource.js diff --git a/lib/cartodb/backends/user-limits.js b/lib/backends/user-limits.js similarity index 100% rename from lib/cartodb/backends/user-limits.js rename to lib/backends/user-limits.js diff --git a/lib/cartodb/cache/backend/fastly.js b/lib/cache/backend/fastly.js similarity index 100% rename from lib/cartodb/cache/backend/fastly.js rename to lib/cache/backend/fastly.js diff --git a/lib/cartodb/cache/backend/varnish_http.js b/lib/cache/backend/varnish_http.js similarity index 100% rename from lib/cartodb/cache/backend/varnish_http.js rename to lib/cache/backend/varnish_http.js diff --git a/lib/cartodb/cache/layergroup_affected_tables.js b/lib/cache/layergroup_affected_tables.js similarity index 100% rename from lib/cartodb/cache/layergroup_affected_tables.js rename to lib/cache/layergroup_affected_tables.js diff --git a/lib/cartodb/cache/model/named_maps_entry.js b/lib/cache/model/named_maps_entry.js similarity index 100% rename from lib/cartodb/cache/model/named_maps_entry.js rename to lib/cache/model/named_maps_entry.js diff --git a/lib/cartodb/cache/named_map_provider_cache.js b/lib/cache/named_map_provider_cache.js similarity index 100% rename from lib/cartodb/cache/named_map_provider_cache.js rename to lib/cache/named_map_provider_cache.js diff --git a/lib/cartodb/cache/surrogate_keys_cache.js b/lib/cache/surrogate_keys_cache.js similarity index 100% rename from lib/cartodb/cache/surrogate_keys_cache.js rename to lib/cache/surrogate_keys_cache.js diff --git a/lib/cartodb/models/aggregation/aggregation-mapconfig.js b/lib/models/aggregation/aggregation-mapconfig.js similarity index 100% rename from lib/cartodb/models/aggregation/aggregation-mapconfig.js rename to lib/models/aggregation/aggregation-mapconfig.js diff --git a/lib/cartodb/models/aggregation/aggregation-query.js b/lib/models/aggregation/aggregation-query.js similarity index 100% rename from lib/cartodb/models/aggregation/aggregation-query.js rename to lib/models/aggregation/aggregation-query.js diff --git a/lib/cartodb/models/aggregation/aggregation-validator.js b/lib/models/aggregation/aggregation-validator.js similarity index 100% rename from lib/cartodb/models/aggregation/aggregation-validator.js rename to lib/models/aggregation/aggregation-validator.js diff --git a/lib/cartodb/models/aggregation/time-dimension.js b/lib/models/aggregation/time-dimension.js similarity index 100% rename from lib/cartodb/models/aggregation/time-dimension.js rename to lib/models/aggregation/time-dimension.js diff --git a/lib/cartodb/models/cdb_request.js b/lib/models/cdb_request.js similarity index 100% rename from lib/cartodb/models/cdb_request.js rename to lib/models/cdb_request.js diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/models/dataview/aggregation.js similarity index 100% rename from lib/cartodb/models/dataview/aggregation.js rename to lib/models/dataview/aggregation.js diff --git a/lib/cartodb/models/dataview/base.js b/lib/models/dataview/base.js similarity index 100% rename from lib/cartodb/models/dataview/base.js rename to lib/models/dataview/base.js diff --git a/lib/cartodb/models/dataview/factory.js b/lib/models/dataview/factory.js similarity index 94% rename from lib/cartodb/models/dataview/factory.js rename to lib/models/dataview/factory.js index 729305fc..bd035270 100644 --- a/lib/cartodb/models/dataview/factory.js +++ b/lib/models/dataview/factory.js @@ -1,6 +1,6 @@ 'use strict'; -const dataviews = require('./'); +const dataviews = require('.'); module.exports = class DataviewFactory { static get dataviews() { diff --git a/lib/cartodb/models/dataview/formula.js b/lib/models/dataview/formula.js similarity index 100% rename from lib/cartodb/models/dataview/formula.js rename to lib/models/dataview/formula.js diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/models/dataview/histogram.js similarity index 100% rename from lib/cartodb/models/dataview/histogram.js rename to lib/models/dataview/histogram.js diff --git a/lib/cartodb/models/dataview/histograms/base-histogram.js b/lib/models/dataview/histograms/base-histogram.js similarity index 100% rename from lib/cartodb/models/dataview/histograms/base-histogram.js rename to lib/models/dataview/histograms/base-histogram.js diff --git a/lib/cartodb/models/dataview/histograms/date-histogram.js b/lib/models/dataview/histograms/date-histogram.js similarity index 100% rename from lib/cartodb/models/dataview/histograms/date-histogram.js rename to lib/models/dataview/histograms/date-histogram.js diff --git a/lib/cartodb/models/dataview/histograms/numeric-histogram.js b/lib/models/dataview/histograms/numeric-histogram.js similarity index 100% rename from lib/cartodb/models/dataview/histograms/numeric-histogram.js rename to lib/models/dataview/histograms/numeric-histogram.js diff --git a/lib/cartodb/models/dataview/index.js b/lib/models/dataview/index.js similarity index 100% rename from lib/cartodb/models/dataview/index.js rename to lib/models/dataview/index.js diff --git a/lib/cartodb/models/dataview/overviews/aggregation.js b/lib/models/dataview/overviews/aggregation.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/aggregation.js rename to lib/models/dataview/overviews/aggregation.js diff --git a/lib/cartodb/models/dataview/overviews/base.js b/lib/models/dataview/overviews/base.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/base.js rename to lib/models/dataview/overviews/base.js diff --git a/lib/cartodb/models/dataview/overviews/factory.js b/lib/models/dataview/overviews/factory.js similarity index 97% rename from lib/cartodb/models/dataview/overviews/factory.js rename to lib/models/dataview/overviews/factory.js index 1a402f88..c67aea8e 100644 --- a/lib/cartodb/models/dataview/overviews/factory.js +++ b/lib/models/dataview/overviews/factory.js @@ -1,7 +1,7 @@ 'use strict'; var parentFactory = require('../factory'); -var dataviews = require('./'); +var dataviews = require('.'); function OverviewsDataviewFactory(queryRewriter, queryRewriteData, options) { this.queryRewriter = queryRewriter; diff --git a/lib/cartodb/models/dataview/overviews/formula.js b/lib/models/dataview/overviews/formula.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/formula.js rename to lib/models/dataview/overviews/formula.js diff --git a/lib/cartodb/models/dataview/overviews/histogram.js b/lib/models/dataview/overviews/histogram.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/histogram.js rename to lib/models/dataview/overviews/histogram.js diff --git a/lib/cartodb/models/dataview/overviews/index.js b/lib/models/dataview/overviews/index.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/index.js rename to lib/models/dataview/overviews/index.js diff --git a/lib/cartodb/models/filter/analysis.js b/lib/models/filter/analysis.js similarity index 100% rename from lib/cartodb/models/filter/analysis.js rename to lib/models/filter/analysis.js diff --git a/lib/cartodb/models/filter/analysis/category.js b/lib/models/filter/analysis/category.js similarity index 100% rename from lib/cartodb/models/filter/analysis/category.js rename to lib/models/filter/analysis/category.js diff --git a/lib/cartodb/models/filter/analysis/range.js b/lib/models/filter/analysis/range.js similarity index 100% rename from lib/cartodb/models/filter/analysis/range.js rename to lib/models/filter/analysis/range.js diff --git a/lib/cartodb/models/filter/bbox.js b/lib/models/filter/bbox.js similarity index 100% rename from lib/cartodb/models/filter/bbox.js rename to lib/models/filter/bbox.js diff --git a/lib/cartodb/models/layergroup-token.js b/lib/models/layergroup-token.js similarity index 100% rename from lib/cartodb/models/layergroup-token.js rename to lib/models/layergroup-token.js diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/models/mapconfig/adapter/aggregation-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js rename to lib/models/mapconfig/adapter/aggregation-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js b/lib/models/mapconfig/adapter/analysis-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js rename to lib/models/mapconfig/adapter/analysis-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js b/lib/models/mapconfig/adapter/dataviews-widgets-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js rename to lib/models/mapconfig/adapter/dataviews-widgets-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/index.js b/lib/models/mapconfig/adapter/index.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/index.js rename to lib/models/mapconfig/adapter/index.js diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js b/lib/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js rename to lib/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js b/lib/models/mapconfig/adapter/mapconfig-named-layers-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js rename to lib/models/mapconfig/adapter/mapconfig-named-layers-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/models/mapconfig/adapter/mapconfig-overviews-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js rename to lib/models/mapconfig/adapter/mapconfig-overviews-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js b/lib/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js rename to lib/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js b/lib/models/mapconfig/adapter/turbo-carto-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js rename to lib/models/mapconfig/adapter/turbo-carto-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js b/lib/models/mapconfig/adapter/vector-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js rename to lib/models/mapconfig/adapter/vector-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/provider/base-mapconfig-adapter.js b/lib/models/mapconfig/provider/base-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/provider/base-mapconfig-adapter.js rename to lib/models/mapconfig/provider/base-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js b/lib/models/mapconfig/provider/create-layergroup-provider.js similarity index 100% rename from lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js rename to lib/models/mapconfig/provider/create-layergroup-provider.js diff --git a/lib/cartodb/models/mapconfig/provider/map-store-provider.js b/lib/models/mapconfig/provider/map-store-provider.js similarity index 100% rename from lib/cartodb/models/mapconfig/provider/map-store-provider.js rename to lib/models/mapconfig/provider/map-store-provider.js diff --git a/lib/cartodb/models/mapconfig/provider/named-map-provider.js b/lib/models/mapconfig/provider/named-map-provider.js similarity index 100% rename from lib/cartodb/models/mapconfig/provider/named-map-provider.js rename to lib/models/mapconfig/provider/named-map-provider.js diff --git a/lib/cartodb/models/resource-locator.js b/lib/models/resource-locator.js similarity index 100% rename from lib/cartodb/models/resource-locator.js rename to lib/models/resource-locator.js diff --git a/lib/cartodb/monitoring/health_check.js b/lib/monitoring/health_check.js similarity index 100% rename from lib/cartodb/monitoring/health_check.js rename to lib/monitoring/health_check.js diff --git a/lib/cartodb/server-info-controller.js b/lib/server-info-controller.js similarity index 100% rename from lib/cartodb/server-info-controller.js rename to lib/server-info-controller.js diff --git a/lib/cartodb/server.js b/lib/server.js similarity index 98% rename from lib/cartodb/server.js rename to lib/server.js index 01e68391..9f7b7ee0 100644 --- a/lib/cartodb/server.js +++ b/lib/server.js @@ -68,7 +68,7 @@ function mapnikVersion(opts) { function getAndValidateVersions(options) { var warn = console.warn.bind(console); // jshint ignore:line - var packageDefinition = require('../../package.json'); + var packageDefinition = require('../package.json'); var declaredDependencies = packageDefinition.dependencies || {}; var installedDependenciesVersions = { diff --git a/lib/cartodb/server_options.js b/lib/server_options.js similarity index 100% rename from lib/cartodb/server_options.js rename to lib/server_options.js diff --git a/lib/cartodb/stats/client.js b/lib/stats/client.js similarity index 100% rename from lib/cartodb/stats/client.js rename to lib/stats/client.js diff --git a/lib/cartodb/stats/profiler_proxy.js b/lib/stats/profiler_proxy.js similarity index 100% rename from lib/cartodb/stats/profiler_proxy.js rename to lib/stats/profiler_proxy.js diff --git a/lib/cartodb/stats/reporter/named-map-provider.js b/lib/stats/reporter/named-map-provider.js similarity index 100% rename from lib/cartodb/stats/reporter/named-map-provider.js rename to lib/stats/reporter/named-map-provider.js diff --git a/lib/cartodb/stats/reporter/renderer.js b/lib/stats/reporter/renderer.js similarity index 100% rename from lib/cartodb/stats/reporter/renderer.js rename to lib/stats/reporter/renderer.js diff --git a/lib/cartodb/stats/timer.js b/lib/stats/timer.js similarity index 100% rename from lib/cartodb/stats/timer.js rename to lib/stats/timer.js diff --git a/lib/cartodb/utils/database-params.js b/lib/utils/database-params.js similarity index 100% rename from lib/cartodb/utils/database-params.js rename to lib/utils/database-params.js diff --git a/lib/cartodb/utils/date-wrapper.js b/lib/utils/date-wrapper.js similarity index 100% rename from lib/cartodb/utils/date-wrapper.js rename to lib/utils/date-wrapper.js diff --git a/lib/cartodb/utils/icu_data_env_setter.js b/lib/utils/icu_data_env_setter.js similarity index 100% rename from lib/cartodb/utils/icu_data_env_setter.js rename to lib/utils/icu_data_env_setter.js diff --git a/lib/cartodb/utils/json-replacer.js b/lib/utils/json-replacer.js similarity index 100% rename from lib/cartodb/utils/json-replacer.js rename to lib/utils/json-replacer.js diff --git a/lib/cartodb/utils/layergroup-metadata.js b/lib/utils/layergroup-metadata.js similarity index 100% rename from lib/cartodb/utils/layergroup-metadata.js rename to lib/utils/layergroup-metadata.js diff --git a/lib/cartodb/utils/overviews_query_rewriter.js b/lib/utils/overviews_query_rewriter.js similarity index 100% rename from lib/cartodb/utils/overviews_query_rewriter.js rename to lib/utils/overviews_query_rewriter.js diff --git a/lib/cartodb/utils/query-utils.js b/lib/utils/query-utils.js similarity index 100% rename from lib/cartodb/utils/query-utils.js rename to lib/utils/query-utils.js diff --git a/lib/cartodb/utils/substitution-tokens.js b/lib/utils/substitution-tokens.js similarity index 100% rename from lib/cartodb/utils/substitution-tokens.js rename to lib/utils/substitution-tokens.js diff --git a/lib/cartodb/utils/table_name_parser.js b/lib/utils/table_name_parser.js similarity index 100% rename from lib/cartodb/utils/table_name_parser.js rename to lib/utils/table_name_parser.js diff --git a/test/acceptance/aggregation.js b/test/acceptance/aggregation.js index 7bc5e6de..347d91e8 100644 --- a/test/acceptance/aggregation.js +++ b/test/acceptance/aggregation.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const WebMercatorHelper = require('cartodb-query-tables').utils.webMercatorHelper; const webmercator = new WebMercatorHelper(); diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps.js index dd34b7dd..b6e5f103 100644 --- a/test/acceptance/analysis/named-maps.js +++ b/test/acceptance/analysis/named-maps.js @@ -4,11 +4,11 @@ var assert = require('../../support/assert'); var helper = require('../../support/test_helper'); -var CartodbWindshaft = require('../../../lib/cartodb/server'); -var serverOptions = require('../../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../../lib/server'); +var serverOptions = require('../../../lib/server_options'); var TestClient = require('../../support/test-client'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('named-maps analysis', function() { var server; diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases.js index d0c3a17c..e86a879e 100644 --- a/test/acceptance/auth/authorization-basic-use-cases.js +++ b/test/acceptance/auth/authorization-basic-use-cases.js @@ -2,9 +2,9 @@ const assert = require('../../support/assert'); const testHelper = require('../../support/test_helper'); -const CartodbWindshaft = require('../../../lib/cartodb/server'); -const serverOptions = require('../../../lib/cartodb/server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +const CartodbWindshaft = require('../../../lib/server'); +const serverOptions = require('../../../lib/server_options'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); function singleLayergroupConfig(sql, cartocss) { return { diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format.js index e3daf626..120bf42b 100644 --- a/test/acceptance/buffer-size-format.js +++ b/test/acceptance/buffer-size-format.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var fs = require('fs'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/cartodb/server_options'); +var serverOptions = require('../../lib/server_options'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE_PER_MIL = 5; diff --git a/test/acceptance/cache/cache_headers.js b/test/acceptance/cache/cache_headers.js index 46a22026..81a0dd85 100644 --- a/test/acceptance/cache/cache_headers.js +++ b/test/acceptance/cache/cache_headers.js @@ -5,10 +5,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var qs = require('querystring'); -var CartodbWindshaft = require('../../../lib/cartodb/server'); -var serverOptions = require('../../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../../lib/server'); +var serverOptions = require('../../../lib/server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('get requests with cache headers', function() { var server; diff --git a/test/acceptance/cache/surrogate_keys_invalidation.js b/test/acceptance/cache/surrogate_keys_invalidation.js index aa22892b..ae3e47c4 100644 --- a/test/acceptance/cache/surrogate_keys_invalidation.js +++ b/test/acceptance/cache/surrogate_keys_invalidation.js @@ -7,13 +7,13 @@ var step = require('step'); var FastlyPurge = require('fastly-purge'); var _ = require('underscore'); -var NamedMapsCacheEntry = require(__dirname + '/../../../lib/cartodb/cache/model/named_maps_entry'); -var CartodbWindshaft = require(__dirname + '/../../../lib/cartodb/server'); +var NamedMapsCacheEntry = require(__dirname + '/../../../lib/cache/model/named_maps_entry'); +var CartodbWindshaft = require(__dirname + '/../../../lib/server'); var nock = require('nock'); describe('templates surrogate keys', function() { - var serverOptions = require('../../../lib/cartodb/server_options'); + var serverOptions = require('../../../lib/server_options'); // Enable Varnish purge for tests var varnishHost = serverOptions.varnish_host; diff --git a/test/acceptance/custom-middlewares.js b/test/acceptance/custom-middlewares.js index 38067296..a4bb7559 100644 --- a/test/acceptance/custom-middlewares.js +++ b/test/acceptance/custom-middlewares.js @@ -2,8 +2,8 @@ const helper = require('../support/test_helper'); const assert = require('../support/assert'); -const createServer = require('../../lib/cartodb/server'); -const serverOptions = require('../../lib/cartodb/server_options'); +const createServer = require('../../lib/server'); +const serverOptions = require('../../lib/server_options'); describe('custom middlewares', function () { const RESPONSE_OK = { diff --git a/test/acceptance/date-wrapping.spec.js b/test/acceptance/date-wrapping.spec.js index f26caf1e..a3c98261 100644 --- a/test/acceptance/date-wrapping.spec.js +++ b/test/acceptance/date-wrapping.spec.js @@ -4,7 +4,7 @@ const assert = require('assert'); const TestClient = require('../support/test-client'); const mapConfigFactory = require('../fixtures/test_mapconfigFactory'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const usePgMvtRenderer = serverOptions.renderer.mvt.usePostGIS; const describe_mvt = !usePgMvtRenderer ? describe : describe.skip; diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js index 994e347f..744bf1cd 100644 --- a/test/acceptance/dynamic-styling-named-maps.js +++ b/test/acceptance/dynamic-styling-named-maps.js @@ -2,10 +2,10 @@ var assert = require('../support/assert'); var step = require('step'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var testHelper = require(__dirname + '/../support/test_helper'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); describe('dynamic styling for named maps', function() { var server; diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context.js index 1adc877a..4d07617f 100644 --- a/test/acceptance/errors-with-context.js +++ b/test/acceptance/errors-with-context.js @@ -1,8 +1,8 @@ 'use strict'; var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); describe('error with context', function () { var server; diff --git a/test/acceptance/health_check.js b/test/acceptance/health_check.js index 112cc88d..b49eb03f 100644 --- a/test/acceptance/health_check.js +++ b/test/acceptance/health_check.js @@ -5,8 +5,8 @@ require(__dirname + '/../support/test_helper'); var fs = require('fs'); var assert = require('../support/assert'); -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); describe('health checks', function () { diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata.js index 50e30895..816c44b2 100644 --- a/test/acceptance/layergroup-metadata.js +++ b/test/acceptance/layergroup-metadata.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); describe('layergroup metadata', function () { const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 28d9914f..6ccfd82f 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -11,15 +11,15 @@ var mapnik = require('windshaft').mapnik; var semver = require('semver'); var helper = require(__dirname + '/../support/test_helper'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var windshaft_fixtures = __dirname + '/../../node_modules/windshaft/test/fixtures'; var IMAGE_EQUALS_TOLERANCE_PER_MIL = 20; var IMAGE_EQUALS_HIGHER_TOLERANCE_PER_MIL = 25; -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); var QueryTables = require('cartodb-query-tables').queryTables; diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 3f6c1b45..24080b52 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -6,12 +6,12 @@ var assert = require('../support/assert'); var _ = require('underscore'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); -var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); +var PgQueryRunner = require('../../lib/backends/pg_query_runner'); var QueryTables = require('cartodb-query-tables').queryTables; -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); describe('tests from old api translated to multilayer', function() { var server; diff --git a/test/acceptance/mvt-regressions.js b/test/acceptance/mvt-regressions.js index c660e23d..c8c4ffa8 100644 --- a/test/acceptance/mvt-regressions.js +++ b/test/acceptance/mvt-regressions.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const suites = [ { diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index bb446680..10c5cac7 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -4,7 +4,7 @@ require('../support/test_helper'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/cartodb/server_options'); +var serverOptions = require('../../lib/server_options'); function createMapConfig(sql = TestClient.SQL.ONE_POINT) { return { diff --git a/test/acceptance/named-map-cache-regressions.js b/test/acceptance/named-map-cache-regressions.js index 8521ca8a..15c03f51 100644 --- a/test/acceptance/named-map-cache-regressions.js +++ b/test/acceptance/named-map-cache-regressions.js @@ -4,8 +4,8 @@ require('../support/test_helper'); const request = require('request'); const assert = require('assert'); -const Server = require('../../lib/cartodb/server'); -const serverOptions = require('../../lib/cartodb/server_options'); +const Server = require('../../lib/server'); +const serverOptions = require('../../lib/server_options'); const { mapnik } = require('windshaft'); const helper = require('../support/test_helper'); diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js index b80bfacc..4d92880f 100644 --- a/test/acceptance/named_layers.js +++ b/test/acceptance/named_layers.js @@ -3,13 +3,13 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); var step = require('step'); diff --git a/test/acceptance/named_layers_visibility.js b/test/acceptance/named_layers_visibility.js index 0df92ed6..5d1f9618 100644 --- a/test/acceptance/named_layers_visibility.js +++ b/test/acceptance/named_layers_visibility.js @@ -4,11 +4,11 @@ var step = require('step'); var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE = 20; diff --git a/test/acceptance/named_maps_authentication.js b/test/acceptance/named_maps_authentication.js index 4f8e343c..f1edf5b2 100644 --- a/test/acceptance/named_maps_authentication.js +++ b/test/acceptance/named_maps_authentication.js @@ -6,10 +6,10 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); -var NamedMapsCacheEntry = require('../../lib/cartodb/cache/model/named_maps_entry'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); describe('named maps authentication', function() { var server; diff --git a/test/acceptance/named_maps_cache.js b/test/acceptance/named_maps_cache.js index 0cdc2a49..eb2edcd0 100644 --- a/test/acceptance/named_maps_cache.js +++ b/test/acceptance/named_maps_cache.js @@ -5,8 +5,8 @@ require('../support/test_helper'); const helper = require('../support/test_helper'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); describe('named maps provider cache', function() { var server; diff --git a/test/acceptance/named_maps_static_view.js b/test/acceptance/named_maps_static_view.js index 8a9b1402..1075b398 100644 --- a/test/acceptance/named_maps_static_view.js +++ b/test/acceptance/named_maps_static_view.js @@ -6,9 +6,9 @@ var RedisPool = require('redis-mpool'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); describe('named maps static view', function() { // configure redis pool instance to use in tests diff --git a/test/acceptance/named_maps_stats.js b/test/acceptance/named_maps_stats.js index fc80cbbc..1ad92772 100644 --- a/test/acceptance/named_maps_stats.js +++ b/test/acceptance/named_maps_stats.js @@ -6,10 +6,10 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); -var NamedMapsCacheEntry = require('../../lib/cartodb/cache/model/named_maps_entry'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); describe('named maps preview stats', function() { var server; diff --git a/test/acceptance/overviews_metadata.js b/test/acceptance/overviews_metadata.js index 90642777..2b2b25a8 100644 --- a/test/acceptance/overviews_metadata.js +++ b/test/acceptance/overviews_metadata.js @@ -3,10 +3,10 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var RedisPool = require('redis-mpool'); diff --git a/test/acceptance/overviews_metadata_named_maps.js b/test/acceptance/overviews_metadata_named_maps.js index 9e66cf07..e4822e0b 100644 --- a/test/acceptance/overviews_metadata_named_maps.js +++ b/test/acceptance/overviews_metadata_named_maps.js @@ -3,10 +3,10 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var RedisPool = require('redis-mpool'); diff --git a/test/acceptance/overviews_queries.js b/test/acceptance/overviews_queries.js index c3726a61..ade842c9 100644 --- a/test/acceptance/overviews_queries.js +++ b/test/acceptance/overviews_queries.js @@ -3,7 +3,7 @@ var testHelper = require('../support/test_helper'); var assert = require('../support/assert'); -var cartodbServer = require('../../lib/cartodb/server'); +var cartodbServer = require('../../lib/server'); var ServerOptions = require('./ported/support/ported_server_options'); var testClient = require('./ported/support/test_client'); diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes.js index 13af276e..b77dfbbb 100644 --- a/test/acceptance/ported/attributes.js +++ b/test/acceptance/ported/attributes.js @@ -4,9 +4,9 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var step = require('step'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var PortedServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('attributes', function() { var server; diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer.js index f996d45c..9ecbbf48 100644 --- a/test/acceptance/ported/multilayer.js +++ b/test/acceptance/ported/multilayer.js @@ -7,9 +7,9 @@ var _ = require('underscore'); var querystring = require('querystring'); var step = require('step'); var mapnik = require('windshaft').mapnik; -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('multilayer', function() { var server; diff --git a/test/acceptance/ported/multilayer_error_cases.js b/test/acceptance/ported/multilayer_error_cases.js index 246f9964..a05976a6 100644 --- a/test/acceptance/ported/multilayer_error_cases.js +++ b/test/acceptance/ported/multilayer_error_cases.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var step = require('step'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/ported/multilayer_interactivity.js b/test/acceptance/ported/multilayer_interactivity.js index 62948038..4dd3fa69 100644 --- a/test/acceptance/ported/multilayer_interactivity.js +++ b/test/acceptance/ported/multilayer_interactivity.js @@ -4,10 +4,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var _ = require('underscore'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var getLayerTypeFn = require('windshaft').model.MapConfig.prototype.getType; var PortedServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('multilayer interactivity and layers order', function() { var server; diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster.js index 574de93c..ec206e1b 100644 --- a/test/acceptance/ported/raster.js +++ b/test/acceptance/ported/raster.js @@ -4,9 +4,9 @@ var testHelper =require('../../support/test_helper'); var assert = require('../../support/assert'); var step = require('step'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('raster', function() { diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina.js index d2a82306..8c29a9f5 100644 --- a/test/acceptance/ported/retina.js +++ b/test/acceptance/ported/retina.js @@ -4,10 +4,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var mapnik = require('windshaft').mapnik; -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('retina support', function() { diff --git a/test/acceptance/ported/server.js b/test/acceptance/ported/server.js index 58febf38..28eb9340 100644 --- a/test/acceptance/ported/server.js +++ b/test/acceptance/ported/server.js @@ -3,7 +3,7 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); diff --git a/test/acceptance/ported/server_gettile.js b/test/acceptance/ported/server_gettile.js index 61daa568..98a19659 100644 --- a/test/acceptance/ported/server_gettile.js +++ b/test/acceptance/ported/server_gettile.js @@ -5,7 +5,7 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var mapnik = require('windshaft').mapnik; var semver = require('semver'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); diff --git a/test/acceptance/ported/server_png8_format.js b/test/acceptance/ported/server_png8_format.js index ab4f2758..f9a0624a 100644 --- a/test/acceptance/ported/server_png8_format.js +++ b/test/acceptance/ported/server_png8_format.js @@ -5,10 +5,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var _ = require('underscore'); var fs = require('fs'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); var IMAGE_EQUALS_TOLERANCE_PER_MIL = 85; diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index 10908124..db1a2ecf 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -1,9 +1,9 @@ 'use strict'; var _ = require('underscore'); -var serverOptions = require('../../../../lib/cartodb/server_options'); +var serverOptions = require('../../../../lib/server_options'); var mapnik = require('windshaft').mapnik; -var OverviewsQueryRewriter = require('../../../../lib/cartodb/utils/overviews_query_rewriter'); +var OverviewsQueryRewriter = require('../../../../lib/utils/overviews_query_rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)' }); diff --git a/test/acceptance/ported/support/test_client.js b/test/acceptance/ported/support/test_client.js index 67d5c11e..6b19d3c4 100644 --- a/test/acceptance/ported/support/test_client.js +++ b/test/acceptance/ported/support/test_client.js @@ -1,14 +1,14 @@ 'use strict'; var testHelper = require('../../../support/test_helper'); -var LayergroupToken = require('../../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../../lib/models/layergroup-token'); var step = require('step'); var assert = require('../../../support/assert'); var _ = require('underscore'); var querystring = require('querystring'); var mapnik = require('windshaft').mapnik; -var CartodbServer = require('../../../../lib/cartodb/server'); +var CartodbServer = require('../../../../lib/server'); var PortedServerOptions = require('./ported_server_options'); var DEFAULT_POINT_STYLE = [ diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque.js index 31f3cf55..528885d8 100644 --- a/test/acceptance/ported/torque.js +++ b/test/acceptance/ported/torque.js @@ -5,10 +5,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var _ = require('underscore'); var step = require('step'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('torque', function() { var server; diff --git a/test/acceptance/ported/torque_boundaries.js b/test/acceptance/ported/torque_boundaries.js index 55b26297..b3d09e91 100644 --- a/test/acceptance/ported/torque_boundaries.js +++ b/test/acceptance/ported/torque_boundaries.js @@ -3,10 +3,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('torque boundary points', function() { var server; diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js index f5b6f456..d9589d0b 100644 --- a/test/acceptance/rate-limit.test.js +++ b/test/acceptance/rate-limit.test.js @@ -7,9 +7,9 @@ const redis = require('redis'); const RedisPool = require('redis-mpool'); const cartodbRedis = require('cartodb-redis'); const TestClient = require('../support/test-client'); -const UserLimitsBackend = require('../../lib/cartodb/backends/user-limits'); -const rateLimitMiddleware = require('../../lib/cartodb/api/middlewares/rate-limit'); -const serverOptions = require('../../lib/cartodb/server_options'); +const UserLimitsBackend = require('../../lib/backends/user-limits'); +const rateLimitMiddleware = require('../../lib/api/middlewares/rate-limit'); +const serverOptions = require('../../lib/server_options'); const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitMiddleware; let userLimitsApi; diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions.js index 21d9c970..df91d910 100644 --- a/test/acceptance/regressions.js +++ b/test/acceptance/regressions.js @@ -4,9 +4,9 @@ require('../support/test_helper'); var assert = require('../support/assert'); const helper = require('../support/test_helper'); var TestClient = require('../support/test-client'); -const LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); -const CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -const serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +const LayergroupToken = require('../../lib/models/layergroup-token'); +const CartodbWindshaft = require(__dirname + '/../../lib/server'); +const serverOptions = require(__dirname + '/../../lib/server_options'); describe('regressions', function() { diff --git a/test/acceptance/server.js b/test/acceptance/server.js index 183d6bac..39275415 100644 --- a/test/acceptance/server.js +++ b/test/acceptance/server.js @@ -6,8 +6,8 @@ var assert = require('../support/assert'); var querystring = require('querystring'); var step = require('step'); -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); describe('server', function() { diff --git a/test/acceptance/stats/mapnik_stats_layergroup.js b/test/acceptance/stats/mapnik_stats_layergroup.js index 55ca7a64..5395bf0c 100644 --- a/test/acceptance/stats/mapnik_stats_layergroup.js +++ b/test/acceptance/stats/mapnik_stats_layergroup.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); -const serverOptions = require('../../../lib/cartodb/server_options'); +const serverOptions = require('../../../lib/server_options'); const suites = [ { diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js index 72e6fa73..28a76701 100644 --- a/test/acceptance/templates.js +++ b/test/acceptance/templates.js @@ -6,7 +6,7 @@ var redis = require('redis'); var step = require('step'); var strftime = require('strftime'); var QueryTables = require('cartodb-query-tables').queryTables; -var NamedMapsCacheEntry = require('../../lib/cartodb/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); var redis_stats_db = 5; // Pollute the PG environment to make sure @@ -20,10 +20,10 @@ var http = require('http'); var helper = require(__dirname + '/../support/test_helper'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); describe('template_api', function() { var server; diff --git a/test/acceptance/tilejson.js b/test/acceptance/tilejson.js index 19ef158f..22db6082 100644 --- a/test/acceptance/tilejson.js +++ b/test/acceptance/tilejson.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; diff --git a/test/acceptance/turbo-carto/named-maps.js b/test/acceptance/turbo-carto/named-maps.js index 6a302498..17269442 100644 --- a/test/acceptance/turbo-carto/named-maps.js +++ b/test/acceptance/turbo-carto/named-maps.js @@ -2,10 +2,10 @@ var assert = require('../../support/assert'); var step = require('step'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); var testHelper = require('../../support/test_helper'); -var CartodbWindshaft = require('../../../lib/cartodb/server'); -var serverOptions = require('../../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../../lib/server'); +var serverOptions = require('../../../lib/server_options'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE_PER_MIL = 10; diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit.js index 629d3778..81c0161c 100644 --- a/test/acceptance/user-database-timeout-limit.js +++ b/test/acceptance/user-database-timeout-limit.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit.js index a011ce70..6e2e1e36 100644 --- a/test/acceptance/user-render-timeout-limit.js +++ b/test/acceptance/user-render-timeout-limit.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/cartodb/server_options'); +var serverOptions = require('../../lib/server_options'); const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js index d23403db..781e4d3f 100644 --- a/test/acceptance/vector-layergroup.js +++ b/test/acceptance/vector-layergroup.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const POINTS_SQL_1 = ` diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps.js index ab136dc0..d034453a 100644 --- a/test/acceptance/widgets/named-maps.js +++ b/test/acceptance/widgets/named-maps.js @@ -8,10 +8,10 @@ var queue = require('queue-async'); var helper = require('../../support/test_helper'); -var CartodbWindshaft = require('../../../lib/cartodb/server'); -var serverOptions = require('../../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../../lib/server'); +var serverOptions = require('../../../lib/server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('named-maps widgets', function() { var server; diff --git a/test/integration/analysis-backend-limits.js b/test/integration/analysis-backend-limits.js index 21e7d9cc..2bc94f15 100644 --- a/test/integration/analysis-backend-limits.js +++ b/test/integration/analysis-backend-limits.js @@ -8,7 +8,7 @@ var redis = require('redis'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var AnalysisBackend = require('../../lib/cartodb/backends/analysis'); +var AnalysisBackend = require('../../lib/backends/analysis'); describe('analysis-backend limits', function() { diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js index d3eefd28..55247105 100644 --- a/test/integration/mapconfig_named_layers_datasource.js +++ b/test/integration/mapconfig_named_layers_datasource.js @@ -4,9 +4,9 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); -var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); -var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); +var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter'); // configure redis pool instance to use in tests var redisPool = new RedisPool(global.environment.redis); diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig_named_layers_expanded.js index ea3a34a4..e0f3e71e 100644 --- a/test/integration/mapconfig_named_layers_expanded.js +++ b/test/integration/mapconfig_named_layers_expanded.js @@ -4,9 +4,9 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); -var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); -var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); +var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter'); describe('mapconfig-named-layers-adapter', function() { diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js index 64a2d0c9..b737c058 100644 --- a/test/integration/mapconfig_overviews_adapter.js +++ b/test/integration/mapconfig_overviews_adapter.js @@ -5,11 +5,11 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); -var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); -var OverviewsMetadataBackend = require('../../lib/cartodb/backends/overviews-metadata'); -var FilterStatsBackend = require('../../lib/cartodb/backends/filter-stats'); -var MapConfigOverviewsAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter'); +var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var PgQueryRunner = require('../../lib/backends/pg_query_runner'); +var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata'); +var FilterStatsBackend = require('../../lib/backends/filter-stats'); +var MapConfigOverviewsAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-overviews-adapter'); var redisPool = new RedisPool(global.environment.redis); var metadataBackend = cartodbRedis({pool: redisPool}); diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api.js index c3e241ec..761ccad0 100644 --- a/test/integration/overviews-metadata-api.js +++ b/test/integration/overviews-metadata-api.js @@ -7,9 +7,9 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/cartodb/backends/pg_connection'); -var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); -var OverviewsMetadataBackend = require('../../lib/cartodb/backends/overviews-metadata'); +var PgConnection = require('../../lib/backends/pg_connection'); +var PgQueryRunner = require('../../lib/backends/pg_query_runner'); +var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata'); describe('OverviewsMetadataBackend', function() { diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner.js index a979ee81..9c6b80b2 100644 --- a/test/integration/pg-query-runner.js +++ b/test/integration/pg-query-runner.js @@ -7,8 +7,8 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/cartodb/backends/pg_connection'); -var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); +var PgConnection = require('../../lib/backends/pg_connection'); +var PgQueryRunner = require('../../lib/backends/pg_query_runner'); describe('PgQueryRunner', function() { diff --git a/test/integration/profiler.js b/test/integration/profiler.js index 4bc7ee0e..a4f81857 100644 --- a/test/integration/profiler.js +++ b/test/integration/profiler.js @@ -3,8 +3,8 @@ require('../support/test_helper'); var assert = require('assert'); -var StatsClient = require('../../lib/cartodb/stats/client'); -var ProfilerProxy = require('../../lib/cartodb/stats/profiler_proxy'); +var StatsClient = require('../../lib/stats/client'); +var ProfilerProxy = require('../../lib/stats/profiler_proxy'); describe('profiler + statsd', function() { var statsInstance; diff --git a/test/integration/query-tables.js b/test/integration/query-tables.js index 721de841..bf21f34c 100644 --- a/test/integration/query-tables.js +++ b/test/integration/query-tables.js @@ -7,7 +7,7 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/cartodb/backends/pg_connection'); +var PgConnection = require('../../lib/backends/pg_connection'); var QueryTables = require('cartodb-query-tables').queryTables; diff --git a/test/integration/template-maps-limits.js b/test/integration/template-maps-limits.js index 37f3ca9f..d8b7d8e2 100644 --- a/test/integration/template-maps-limits.js +++ b/test/integration/template-maps-limits.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var assert = require('assert'); var redis = require('redis'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps'); +var TemplateMaps = require('../../lib/backends/template_maps'); describe('TemplateMaps limits', function() { diff --git a/test/support/test-client.js b/test/support/test-client.js index 5d88f6e0..b18580e4 100644 --- a/test/support/test-client.js +++ b/test/support/test-client.js @@ -7,13 +7,13 @@ var PSQL = require('cartodb-psql'); var _ = require('underscore'); var mapnik = require('windshaft').mapnik; -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var assert = require('./assert'); var helper = require('./test_helper'); -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); serverOptions.analysis.batch.inlineExecution = true; const MAPNIK_SUPPORTED_FORMATS = { diff --git a/test/support/test_helper.js b/test/support/test_helper.js index 55fad97a..cc5ff311 100644 --- a/test/support/test_helper.js +++ b/test/support/test_helper.js @@ -15,7 +15,7 @@ var lzmaWorker = new LZMA(); var redis = require('redis'); var log4js = require('log4js'); -const setICUEnvVariable = require('../../lib/cartodb/utils/icu_data_env_setter'); +const setICUEnvVariable = require('../../lib/utils/icu_data_env_setter'); // set environment specific variables global.environment = require(__dirname + '/../../config/environments/test'); diff --git a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js index 874fba28..7106e60f 100644 --- a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js +++ b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var MapnikLayerStats = require('../../../../../lib/cartodb/backends/layer-stats/mapnik-layer-stats'); +var MapnikLayerStats = require('../../../../../lib/backends/layer-stats/mapnik-layer-stats'); var MapConfig = require('windshaft').model.MapConfig; function getDbConnectionMock () { diff --git a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js b/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js index c00260c8..a6638610 100644 --- a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js +++ b/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var TorqueLayerStats = require('../../../../../lib/cartodb/backends/layer-stats/torque-layer-stats'); +var TorqueLayerStats = require('../../../../../lib/backends/layer-stats/torque-layer-stats'); var MapConfig = require('windshaft').model.MapConfig; describe('torque-layer-stats', function () { diff --git a/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js b/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js index 861f51d8..420edf7f 100644 --- a/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js +++ b/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js @@ -1,6 +1,6 @@ 'use strict'; -var PostgresDatasource = require('../../../../lib/cartodb/backends/turbo-carto-postgres-datasource'); +var PostgresDatasource = require('../../../../lib/backends/turbo-carto-postgres-datasource'); var PSQL = require('cartodb-psql'); var _ = require('underscore'); var assert = require('assert'); diff --git a/test/unit/cartodb/cache/model/named_maps_entry.test.js b/test/unit/cartodb/cache/model/named_maps_entry.test.js index 335f30c7..35be48d1 100644 --- a/test/unit/cartodb/cache/model/named_maps_entry.test.js +++ b/test/unit/cartodb/cache/model/named_maps_entry.test.js @@ -4,7 +4,7 @@ require('../../../../support/test_helper'); var assert = require('assert'); var _ = require('underscore'); -var NamedMapsCacheEntry = require('../../../../../lib/cartodb/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../../../../lib/cache/model/named_maps_entry'); describe('cache named_maps_entry', function() { diff --git a/test/unit/cartodb/cdb_request.test.js b/test/unit/cartodb/cdb_request.test.js index 0dbf35a3..78d55761 100644 --- a/test/unit/cartodb/cdb_request.test.js +++ b/test/unit/cartodb/cdb_request.test.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var CdbRequest = require('../../../lib/cartodb/models/cdb_request'); +var CdbRequest = require('../../../lib/models/cdb_request'); describe('req2params', function() { diff --git a/test/unit/cartodb/error-middleware.test.js b/test/unit/cartodb/error-middleware.test.js index 1f17ed9c..1645d422 100644 --- a/test/unit/cartodb/error-middleware.test.js +++ b/test/unit/cartodb/error-middleware.test.js @@ -3,7 +3,7 @@ require('../../support/test_helper.js'); var assert = require('assert'); -var errorMiddleware = require('../../../lib/cartodb/api/middlewares/error-middleware'); +var errorMiddleware = require('../../../lib/api/middlewares/error-middleware'); describe('error-middleware', function() { diff --git a/test/unit/cartodb/error_messages.test.js b/test/unit/cartodb/error_messages.test.js index 13ea1661..981b0a21 100644 --- a/test/unit/cartodb/error_messages.test.js +++ b/test/unit/cartodb/error_messages.test.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var errorMiddleware = require('../../../lib/cartodb/api/middlewares/error-middleware'); +var errorMiddleware = require('../../../lib/api/middlewares/error-middleware'); describe('error messages clean up', function() { diff --git a/test/unit/cartodb/lzmaMiddleware.test.js b/test/unit/cartodb/lzmaMiddleware.test.js index 4dc355fb..6d9c214e 100644 --- a/test/unit/cartodb/lzmaMiddleware.test.js +++ b/test/unit/cartodb/lzmaMiddleware.test.js @@ -3,7 +3,7 @@ var assert = require('assert'); var testHelper = require('../../support/test_helper'); -var lzmaMiddleware = require('../../../lib/cartodb/api/middlewares/lzma'); +var lzmaMiddleware = require('../../../lib/api/middlewares/lzma'); describe('lzma-middleware', function() { diff --git a/test/unit/cartodb/mapconfig/adapter.test.js b/test/unit/cartodb/mapconfig/adapter.test.js index d2832c78..b82237f1 100644 --- a/test/unit/cartodb/mapconfig/adapter.test.js +++ b/test/unit/cartodb/mapconfig/adapter.test.js @@ -3,7 +3,7 @@ //require('../../../support/test_helper'); var assert = require('assert'); -var MapConfigAdapter = require('../../../../lib/cartodb/models/mapconfig/adapter'); +var MapConfigAdapter = require('../../../../lib/models/mapconfig/adapter'); describe('MapConfigAdapter', function() { var user = 'wadus'; diff --git a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js b/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js index 58eaa709..5cf94175 100644 --- a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js +++ b/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js @@ -3,7 +3,7 @@ //require('../../../support/test_helper'); var assert = require('assert'); -var DataviewsMapConfigAdapter = require('../../../../lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter'); +var DataviewsMapConfigAdapter = require('../../../../lib/models/mapconfig/adapter/dataviews-widgets-adapter'); describe('dataviews-widgets-adapter', function() { diff --git a/test/unit/cartodb/middlewares/coordinates.test.js b/test/unit/cartodb/middlewares/coordinates.test.js index f6c39d88..ca13d6a3 100644 --- a/test/unit/cartodb/middlewares/coordinates.test.js +++ b/test/unit/cartodb/middlewares/coordinates.test.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('assert'); -const coordinates = require('../../../../lib/cartodb/api/middlewares/coordinates'); +const coordinates = require('../../../../lib/api/middlewares/coordinates'); describe('coordinates middleware', function () { it('should return error: invalid zoom paramenter (-1)', function (done) { diff --git a/test/unit/cartodb/model/filter/bbox-filters.test.js b/test/unit/cartodb/model/filter/bbox-filters.test.js index a0e7a14b..03b90b96 100644 --- a/test/unit/cartodb/model/filter/bbox-filters.test.js +++ b/test/unit/cartodb/model/filter/bbox-filters.test.js @@ -4,7 +4,7 @@ require('../../../../support/test_helper'); var util = require('util'); var assert = require('../../../../support/assert'); -var BboxFilter = require('../../../../../lib/cartodb/models/filter/bbox'); +var BboxFilter = require('../../../../../lib/models/filter/bbox'); var MAX_EXTENT_MERCATOR_REF = [ -BboxFilter.LONGITUDE_MAX_VALUE, diff --git a/test/unit/cartodb/model/resource-locator.test.js b/test/unit/cartodb/model/resource-locator.test.js index e9571c3e..332fa886 100644 --- a/test/unit/cartodb/model/resource-locator.test.js +++ b/test/unit/cartodb/model/resource-locator.test.js @@ -3,7 +3,7 @@ require('../../../support/test_helper'); var assert = require('../../../support/assert'); -var ResourceLocator = require('../../../../lib/cartodb/models/resource-locator'); +var ResourceLocator = require('../../../../lib/models/resource-locator'); describe('ResourceLocator', function() { var USERNAME = 'username'; diff --git a/test/unit/cartodb/overviews_query_rewriter.js b/test/unit/cartodb/overviews_query_rewriter.js index a3d07e4c..4aa74264 100644 --- a/test/unit/cartodb/overviews_query_rewriter.js +++ b/test/unit/cartodb/overviews_query_rewriter.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var OverviewsQueryRewriter = require('../../../lib/cartodb/utils/overviews_query_rewriter'); +var OverviewsQueryRewriter = require('../../../lib/utils/overviews_query_rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ zoom_level: 'ZoomLevel()' }); diff --git a/test/unit/cartodb/ported/profiler.test.js b/test/unit/cartodb/ported/profiler.test.js index d9bc775e..45c3e05f 100644 --- a/test/unit/cartodb/ported/profiler.test.js +++ b/test/unit/cartodb/ported/profiler.test.js @@ -3,7 +3,7 @@ require('../../../support/test_helper'); var assert = require('assert'); -var ProfilerProxy = require('../../../../lib/cartodb/stats/profiler_proxy'); +var ProfilerProxy = require('../../../../lib/stats/profiler_proxy'); describe('profiler', function() { diff --git a/test/unit/cartodb/ported/stats_client.test.js b/test/unit/cartodb/ported/stats_client.test.js index 230d8b25..5e21da8e 100644 --- a/test/unit/cartodb/ported/stats_client.test.js +++ b/test/unit/cartodb/ported/stats_client.test.js @@ -4,7 +4,7 @@ require('../../../support/test_helper'); var assert = require('assert'); -var StatsClient = require('../../../../lib/cartodb/stats/client'); +var StatsClient = require('../../../../lib/stats/client'); describe('stats client', function() { var statsInstance; diff --git a/test/unit/cartodb/ported/windshaft_server.test.js b/test/unit/cartodb/ported/windshaft_server.test.js index 1591dc45..cf19f1b2 100644 --- a/test/unit/cartodb/ported/windshaft_server.test.js +++ b/test/unit/cartodb/ported/windshaft_server.test.js @@ -3,8 +3,8 @@ require('../../../support/test_helper.js'); var assert = require('assert'); -var cartodbServer = require('../../../../lib/cartodb/server'); -var serverOptions = require('../../../../lib/cartodb/server_options'); +var cartodbServer = require('../../../../lib/server'); +var serverOptions = require('../../../../lib/server_options'); describe('windshaft', function() { diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js index 5de8a677..21046391 100644 --- a/test/unit/cartodb/prepare-context.test.js +++ b/test/unit/cartodb/prepare-context.test.js @@ -5,14 +5,14 @@ var _ = require('underscore'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../../lib/cartodb/backends/pg_connection'); -var AuthBackend = require('../../../lib/cartodb/backends/auth'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps'); +var PgConnection = require('../../../lib/backends/pg_connection'); +var AuthBackend = require('../../../lib/backends/auth'); +var TemplateMaps = require('../../../lib/backends/template_maps'); -const cleanUpQueryParamsMiddleware = require('../../../lib/cartodb/api/middlewares/clean-up-query-params'); -const authorizeMiddleware = require('../../../lib/cartodb/api/middlewares/authorize'); -const dbConnSetupMiddleware = require('../../../lib/cartodb/api/middlewares/db-conn-setup'); -const credentialsMiddleware = require('../../../lib/cartodb/api/middlewares/credentials'); +const cleanUpQueryParamsMiddleware = require('../../../lib/api/middlewares/clean-up-query-params'); +const authorizeMiddleware = require('../../../lib/api/middlewares/authorize'); +const dbConnSetupMiddleware = require('../../../lib/api/middlewares/db-conn-setup'); +const credentialsMiddleware = require('../../../lib/api/middlewares/credentials'); var windshaft = require('windshaft'); diff --git a/test/unit/cartodb/stats/reporter/named-map-provider.js b/test/unit/cartodb/stats/reporter/named-map-provider.js index f99a9edf..eefa9816 100644 --- a/test/unit/cartodb/stats/reporter/named-map-provider.js +++ b/test/unit/cartodb/stats/reporter/named-map-provider.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('assert'); -const NamedMapProviderReporter = require('../../../../../lib/cartodb/stats/reporter/named-map-provider'); +const NamedMapProviderReporter = require('../../../../../lib/stats/reporter/named-map-provider'); describe('named-map-provider-reporter', function () { it('should report metrics every 100 ms', function (done) { diff --git a/test/unit/cartodb/substitution-tokens.test.js b/test/unit/cartodb/substitution-tokens.test.js index 61b78e39..f092e22e 100644 --- a/test/unit/cartodb/substitution-tokens.test.js +++ b/test/unit/cartodb/substitution-tokens.test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var SubstitutionTokens = require('../../../lib/cartodb/utils/substitution-tokens'); +var SubstitutionTokens = require('../../../lib/utils/substitution-tokens'); describe('SubstitutionTokens', function() { diff --git a/test/unit/cartodb/table_name_parser.js b/test/unit/cartodb/table_name_parser.js index 3c7aac48..dd62a410 100644 --- a/test/unit/cartodb/table_name_parser.js +++ b/test/unit/cartodb/table_name_parser.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var TableNameParser = require('../../../lib/cartodb/utils/table_name_parser'); +var TableNameParser = require('../../../lib/utils/table_name_parser'); describe('TableNameParser', function() { diff --git a/test/unit/cartodb/template_maps.test.js b/test/unit/cartodb/template_maps.test.js index d504dc2d..555a327d 100644 --- a/test/unit/cartodb/template_maps.test.js +++ b/test/unit/cartodb/template_maps.test.js @@ -4,7 +4,7 @@ var testHelper = require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template_maps.js'); var step = require('step'); var _ = require('underscore'); diff --git a/test/unit/cartodb/template_maps_auth.test.js b/test/unit/cartodb/template_maps_auth.test.js index 9497adde..5b96b538 100644 --- a/test/unit/cartodb/template_maps_auth.test.js +++ b/test/unit/cartodb/template_maps_auth.test.js @@ -5,7 +5,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps'); +var TemplateMaps = require('../../../lib/backends/template_maps'); describe('template_maps_auth', function() { diff --git a/test/unit/cartodb/template_maps_defaults.test.js b/test/unit/cartodb/template_maps_defaults.test.js index dc612cd5..1a3e6e7b 100644 --- a/test/unit/cartodb/template_maps_defaults.test.js +++ b/test/unit/cartodb/template_maps_defaults.test.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template_maps.js'); var _ = require('underscore'); describe('template_maps', function() { diff --git a/test/unit/cartodb/utils/date-wrapper.test.js b/test/unit/cartodb/utils/date-wrapper.test.js index 0ef7c126..3cb05743 100644 --- a/test/unit/cartodb/utils/date-wrapper.test.js +++ b/test/unit/cartodb/utils/date-wrapper.test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var dateWrapper = require('../../../../lib/cartodb/utils/date-wrapper'); +var dateWrapper = require('../../../../lib/utils/date-wrapper'); describe('date-wrapper', function() { diff --git a/test/unit/cartodb/valid_template_maps.test.js b/test/unit/cartodb/valid_template_maps.test.js index c9a90b2c..1b07f161 100644 --- a/test/unit/cartodb/valid_template_maps.test.js +++ b/test/unit/cartodb/valid_template_maps.test.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template_maps.js'); var _ = require('underscore'); describe('template_maps', function() { From 7142e4db3752d760ffc637e7a503f0dffde55251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:43:40 +0200 Subject: [PATCH 17/37] Rename pg_connection -> pg-connection --- lib/api/api-router.js | 2 +- lib/backends/{pg_connection.js => pg-connection.js} | 0 test/integration/mapconfig_named_layers_datasource.js | 2 +- test/integration/mapconfig_named_layers_expanded.js | 2 +- test/integration/mapconfig_overviews_adapter.js | 2 +- test/integration/overviews-metadata-api.js | 2 +- test/integration/pg-query-runner.js | 2 +- test/integration/query-tables.js | 2 +- test/unit/cartodb/prepare-context.test.js | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename lib/backends/{pg_connection.js => pg-connection.js} (100%) diff --git a/lib/api/api-router.js b/lib/api/api-router.js index 8785a50e..7ad27b9c 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -7,7 +7,7 @@ const cartodbRedis = require('cartodb-redis'); const windshaft = require('windshaft'); -const PgConnection = require('../backends/pg_connection'); +const PgConnection = require('../backends/pg-connection'); const AnalysisBackend = require('../backends/analysis'); const AnalysisStatusBackend = require('../backends/analysis-status'); const DataviewBackend = require('../backends/dataview'); diff --git a/lib/backends/pg_connection.js b/lib/backends/pg-connection.js similarity index 100% rename from lib/backends/pg_connection.js rename to lib/backends/pg-connection.js diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js index 55247105..ff208a3a 100644 --- a/test/integration/mapconfig_named_layers_datasource.js +++ b/test/integration/mapconfig_named_layers_datasource.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); var TemplateMaps = require('../../lib/backends/template_maps.js'); -var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var PgConnection = require('../../lib/backends/pg-connection'); var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter'); // configure redis pool instance to use in tests diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig_named_layers_expanded.js index e0f3e71e..558f8852 100644 --- a/test/integration/mapconfig_named_layers_expanded.js +++ b/test/integration/mapconfig_named_layers_expanded.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); var TemplateMaps = require('../../lib/backends/template_maps.js'); -var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var PgConnection = require('../../lib/backends/pg-connection'); var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter'); describe('mapconfig-named-layers-adapter', function() { diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js index b737c058..b6c7a583 100644 --- a/test/integration/mapconfig_overviews_adapter.js +++ b/test/integration/mapconfig_overviews_adapter.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var PgConnection = require('../../lib/backends/pg-connection'); var PgQueryRunner = require('../../lib/backends/pg_query_runner'); var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata'); var FilterStatsBackend = require('../../lib/backends/filter-stats'); diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api.js index 761ccad0..20f86ff3 100644 --- a/test/integration/overviews-metadata-api.js +++ b/test/integration/overviews-metadata-api.js @@ -7,7 +7,7 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/backends/pg_connection'); +var PgConnection = require('../../lib/backends/pg-connection'); var PgQueryRunner = require('../../lib/backends/pg_query_runner'); var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata'); diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner.js index 9c6b80b2..e2288a43 100644 --- a/test/integration/pg-query-runner.js +++ b/test/integration/pg-query-runner.js @@ -7,7 +7,7 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/backends/pg_connection'); +var PgConnection = require('../../lib/backends/pg-connection'); var PgQueryRunner = require('../../lib/backends/pg_query_runner'); diff --git a/test/integration/query-tables.js b/test/integration/query-tables.js index bf21f34c..341b722b 100644 --- a/test/integration/query-tables.js +++ b/test/integration/query-tables.js @@ -7,7 +7,7 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/backends/pg_connection'); +var PgConnection = require('../../lib/backends/pg-connection'); var QueryTables = require('cartodb-query-tables').queryTables; diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js index 21046391..5442db90 100644 --- a/test/unit/cartodb/prepare-context.test.js +++ b/test/unit/cartodb/prepare-context.test.js @@ -5,7 +5,7 @@ var _ = require('underscore'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../../lib/backends/pg_connection'); +var PgConnection = require('../../../lib/backends/pg-connection'); var AuthBackend = require('../../../lib/backends/auth'); var TemplateMaps = require('../../../lib/backends/template_maps'); From b1d5f0f9e8b7a130e9a593e10879fd0e603c21e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:45:46 +0200 Subject: [PATCH 18/37] Rename pg_query_runner -> pg-query-runner --- lib/api/api-router.js | 2 +- lib/backends/{pg_query_runner.js => pg-query-runner.js} | 0 test/acceptance/multilayer_server.js | 2 +- test/integration/mapconfig_overviews_adapter.js | 2 +- test/integration/overviews-metadata-api.js | 2 +- test/integration/pg-query-runner.js | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename lib/backends/{pg_query_runner.js => pg-query-runner.js} (100%) diff --git a/lib/api/api-router.js b/lib/api/api-router.js index 7ad27b9c..c9f1199e 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -12,7 +12,7 @@ const AnalysisBackend = require('../backends/analysis'); const AnalysisStatusBackend = require('../backends/analysis-status'); const DataviewBackend = require('../backends/dataview'); const TemplateMaps = require('../backends/template_maps.js'); -const PgQueryRunner = require('../backends/pg_query_runner'); +const PgQueryRunner = require('../backends/pg-query-runner'); const StatsBackend = require('../backends/stats'); const AuthBackend = require('../backends/auth'); diff --git a/lib/backends/pg_query_runner.js b/lib/backends/pg-query-runner.js similarity index 100% rename from lib/backends/pg_query_runner.js rename to lib/backends/pg-query-runner.js diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 24080b52..9a79471f 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -8,7 +8,7 @@ var _ = require('underscore'); var LayergroupToken = require('../../lib/models/layergroup-token'); -var PgQueryRunner = require('../../lib/backends/pg_query_runner'); +var PgQueryRunner = require('../../lib/backends/pg-query-runner'); var QueryTables = require('cartodb-query-tables').queryTables; var CartodbWindshaft = require('../../lib/server'); var serverOptions = require('../../lib/server_options'); diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js index b6c7a583..1fe93b47 100644 --- a/test/integration/mapconfig_overviews_adapter.js +++ b/test/integration/mapconfig_overviews_adapter.js @@ -6,7 +6,7 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); var PgConnection = require('../../lib/backends/pg-connection'); -var PgQueryRunner = require('../../lib/backends/pg_query_runner'); +var PgQueryRunner = require('../../lib/backends/pg-query-runner'); var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata'); var FilterStatsBackend = require('../../lib/backends/filter-stats'); var MapConfigOverviewsAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-overviews-adapter'); diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api.js index 20f86ff3..f8eb34c2 100644 --- a/test/integration/overviews-metadata-api.js +++ b/test/integration/overviews-metadata-api.js @@ -8,7 +8,7 @@ var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); var PgConnection = require('../../lib/backends/pg-connection'); -var PgQueryRunner = require('../../lib/backends/pg_query_runner'); +var PgQueryRunner = require('../../lib/backends/pg-query-runner'); var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata'); diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner.js index e2288a43..ad6f4443 100644 --- a/test/integration/pg-query-runner.js +++ b/test/integration/pg-query-runner.js @@ -8,7 +8,7 @@ var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); var PgConnection = require('../../lib/backends/pg-connection'); -var PgQueryRunner = require('../../lib/backends/pg_query_runner'); +var PgQueryRunner = require('../../lib/backends/pg-query-runner'); describe('PgQueryRunner', function() { From 83f58288f98f2bc3f7dbe9cae20f4534bf492bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:47:42 +0200 Subject: [PATCH 19/37] Rename varnish_http -> varnish-http --- lib/api/api-router.js | 2 +- lib/cache/backend/{varnish_http.js => varnish-http.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/cache/backend/{varnish_http.js => varnish-http.js} (100%) diff --git a/lib/api/api-router.js b/lib/api/api-router.js index c9f1199e..e7acb779 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -25,7 +25,7 @@ const ClusterBackend = require('../backends/cluster'); const LayergroupAffectedTablesCache = require('../cache/layergroup_affected_tables'); const SurrogateKeysCache = require('../cache/surrogate_keys_cache'); -const VarnishHttpCacheBackend = require('../cache/backend/varnish_http'); +const VarnishHttpCacheBackend = require('../cache/backend/varnish-http'); const FastlyCacheBackend = require('../cache/backend/fastly'); const NamedMapProviderCache = require('../cache/named_map_provider_cache'); const NamedMapsCacheEntry = require('../cache/model/named_maps_entry'); diff --git a/lib/cache/backend/varnish_http.js b/lib/cache/backend/varnish-http.js similarity index 100% rename from lib/cache/backend/varnish_http.js rename to lib/cache/backend/varnish-http.js From 06357fa3f948ed759ba15ca23d04d156eaede4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:51:51 +0200 Subject: [PATCH 20/37] Rename named_maps_entry -> named-maps-entry --- lib/api/api-router.js | 2 +- lib/api/middlewares/surrogate-key-header.js | 2 +- lib/cache/model/{named_maps_entry.js => named-maps-entry.js} | 0 test/acceptance/cache/surrogate_keys_invalidation.js | 3 +-- test/acceptance/named_maps_authentication.js | 2 +- test/acceptance/named_maps_stats.js | 2 +- test/acceptance/templates.js | 2 +- test/unit/cartodb/cache/model/named_maps_entry.test.js | 4 ++-- 8 files changed, 8 insertions(+), 9 deletions(-) rename lib/cache/model/{named_maps_entry.js => named-maps-entry.js} (100%) diff --git a/lib/api/api-router.js b/lib/api/api-router.js index e7acb779..8c2d5063 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -28,7 +28,7 @@ const SurrogateKeysCache = require('../cache/surrogate_keys_cache'); const VarnishHttpCacheBackend = require('../cache/backend/varnish-http'); const FastlyCacheBackend = require('../cache/backend/fastly'); const NamedMapProviderCache = require('../cache/named_map_provider_cache'); -const NamedMapsCacheEntry = require('../cache/model/named_maps_entry'); +const NamedMapsCacheEntry = require('../cache/model/named-maps-entry'); const NamedMapProviderReporter = require('../stats/reporter/named-map-provider'); const SqlWrapMapConfigAdapter = require('../models/mapconfig/adapter/sql-wrap-mapconfig-adapter'); diff --git a/lib/api/middlewares/surrogate-key-header.js b/lib/api/middlewares/surrogate-key-header.js index f616b009..b4b6c922 100644 --- a/lib/api/middlewares/surrogate-key-header.js +++ b/lib/api/middlewares/surrogate-key-header.js @@ -1,6 +1,6 @@ 'use strict'; -const NamedMapsCacheEntry = require('../../cache/model/named_maps_entry'); +const NamedMapsCacheEntry = require('../../cache/model/named-maps-entry'); const NamedMapMapConfigProvider = require('../../models/mapconfig/provider/named-map-provider'); module.exports = function setSurrogateKeyHeader ({ surrogateKeysCache }) { diff --git a/lib/cache/model/named_maps_entry.js b/lib/cache/model/named-maps-entry.js similarity index 100% rename from lib/cache/model/named_maps_entry.js rename to lib/cache/model/named-maps-entry.js diff --git a/test/acceptance/cache/surrogate_keys_invalidation.js b/test/acceptance/cache/surrogate_keys_invalidation.js index ae3e47c4..67bc64d6 100644 --- a/test/acceptance/cache/surrogate_keys_invalidation.js +++ b/test/acceptance/cache/surrogate_keys_invalidation.js @@ -6,8 +6,7 @@ var assert = require('../../support/assert'); var step = require('step'); var FastlyPurge = require('fastly-purge'); var _ = require('underscore'); - -var NamedMapsCacheEntry = require(__dirname + '/../../../lib/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../../lib/cache/model/named-maps-entry'); var CartodbWindshaft = require(__dirname + '/../../../lib/server'); var nock = require('nock'); diff --git a/test/acceptance/named_maps_authentication.js b/test/acceptance/named_maps_authentication.js index f1edf5b2..6b7aac15 100644 --- a/test/acceptance/named_maps_authentication.js +++ b/test/acceptance/named_maps_authentication.js @@ -9,7 +9,7 @@ var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require(__dirname + '/../../lib/server'); var serverOptions = require(__dirname + '/../../lib/server_options'); var TemplateMaps = require('../../lib/backends/template_maps.js'); -var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); describe('named maps authentication', function() { var server; diff --git a/test/acceptance/named_maps_stats.js b/test/acceptance/named_maps_stats.js index 1ad92772..10be0d91 100644 --- a/test/acceptance/named_maps_stats.js +++ b/test/acceptance/named_maps_stats.js @@ -9,7 +9,7 @@ var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require(__dirname + '/../../lib/server'); var serverOptions = require(__dirname + '/../../lib/server_options'); var TemplateMaps = require('../../lib/backends/template_maps.js'); -var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); describe('named maps preview stats', function() { var server; diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js index 28a76701..67901c34 100644 --- a/test/acceptance/templates.js +++ b/test/acceptance/templates.js @@ -6,7 +6,7 @@ var redis = require('redis'); var step = require('step'); var strftime = require('strftime'); var QueryTables = require('cartodb-query-tables').queryTables; -var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); var redis_stats_db = 5; // Pollute the PG environment to make sure diff --git a/test/unit/cartodb/cache/model/named_maps_entry.test.js b/test/unit/cartodb/cache/model/named_maps_entry.test.js index 35be48d1..fa6fd272 100644 --- a/test/unit/cartodb/cache/model/named_maps_entry.test.js +++ b/test/unit/cartodb/cache/model/named_maps_entry.test.js @@ -4,9 +4,9 @@ require('../../../../support/test_helper'); var assert = require('assert'); var _ = require('underscore'); -var NamedMapsCacheEntry = require('../../../../../lib/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../../../../lib/cache/model/named-maps-entry'); -describe('cache named_maps_entry', function() { +describe('cache named maps entry', function() { var namedMapOwner = 'foo', namedMapName = 'wadus_name', From 2328bb6261124957f60031c68361e7e216bd15fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:53:06 +0200 Subject: [PATCH 21/37] Rename layergroup_affected_tables -> layergroup-affected-tables --- lib/api/api-router.js | 2 +- ...ergroup_affected_tables.js => layergroup-affected-tables.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/cache/{layergroup_affected_tables.js => layergroup-affected-tables.js} (100%) diff --git a/lib/api/api-router.js b/lib/api/api-router.js index 8c2d5063..dd409b37 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -23,7 +23,7 @@ const TablesExtentBackend = require('../backends/tables-extent'); const ClusterBackend = require('../backends/cluster'); -const LayergroupAffectedTablesCache = require('../cache/layergroup_affected_tables'); +const LayergroupAffectedTablesCache = require('../cache/layergroup-affected-tables'); const SurrogateKeysCache = require('../cache/surrogate_keys_cache'); const VarnishHttpCacheBackend = require('../cache/backend/varnish-http'); const FastlyCacheBackend = require('../cache/backend/fastly'); diff --git a/lib/cache/layergroup_affected_tables.js b/lib/cache/layergroup-affected-tables.js similarity index 100% rename from lib/cache/layergroup_affected_tables.js rename to lib/cache/layergroup-affected-tables.js From 2bed034e641e0720206527df32d0f2c6286feeca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:54:54 +0200 Subject: [PATCH 22/37] Rename named_map_provider_cache -> named-map-provider-cache --- lib/api/api-router.js | 2 +- ...{named_map_provider_cache.js => named-map-provider-cache.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/cache/{named_map_provider_cache.js => named-map-provider-cache.js} (100%) diff --git a/lib/api/api-router.js b/lib/api/api-router.js index dd409b37..9e04d2c5 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -27,7 +27,7 @@ const LayergroupAffectedTablesCache = require('../cache/layergroup-affected-tabl const SurrogateKeysCache = require('../cache/surrogate_keys_cache'); const VarnishHttpCacheBackend = require('../cache/backend/varnish-http'); const FastlyCacheBackend = require('../cache/backend/fastly'); -const NamedMapProviderCache = require('../cache/named_map_provider_cache'); +const NamedMapProviderCache = require('../cache/named-map-provider-cache'); const NamedMapsCacheEntry = require('../cache/model/named-maps-entry'); const NamedMapProviderReporter = require('../stats/reporter/named-map-provider'); diff --git a/lib/cache/named_map_provider_cache.js b/lib/cache/named-map-provider-cache.js similarity index 100% rename from lib/cache/named_map_provider_cache.js rename to lib/cache/named-map-provider-cache.js From afb9b08925f507ab5587d06b3ba6ad67b52491f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:55:55 +0200 Subject: [PATCH 23/37] Rename surrogate_keys_cache -> surrogate-keys-cache --- lib/api/api-router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/api/api-router.js b/lib/api/api-router.js index 9e04d2c5..d8d11956 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -24,7 +24,7 @@ const TablesExtentBackend = require('../backends/tables-extent'); const ClusterBackend = require('../backends/cluster'); const LayergroupAffectedTablesCache = require('../cache/layergroup-affected-tables'); -const SurrogateKeysCache = require('../cache/surrogate_keys_cache'); +const SurrogateKeysCache = require('../cache/surrogate-keys-cache'); const VarnishHttpCacheBackend = require('../cache/backend/varnish-http'); const FastlyCacheBackend = require('../cache/backend/fastly'); const NamedMapProviderCache = require('../cache/named-map-provider-cache'); From 6dc8de315a4e58de6b3e0843648dce476399fd24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:56:20 +0200 Subject: [PATCH 24/37] Rename surrogate_keys_cache -> surrogate-keys-cache --- lib/cache/{surrogate_keys_cache.js => surrogate-keys-cache.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/cache/{surrogate_keys_cache.js => surrogate-keys-cache.js} (100%) diff --git a/lib/cache/surrogate_keys_cache.js b/lib/cache/surrogate-keys-cache.js similarity index 100% rename from lib/cache/surrogate_keys_cache.js rename to lib/cache/surrogate-keys-cache.js From 808718fb26cbb8194b5a7b35d74d2b3e8c5f106f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:58:21 +0200 Subject: [PATCH 25/37] Rename cdb_request -> cdb-request --- lib/api/middlewares/user.js | 2 +- lib/models/{cdb_request.js => cdb-request.js} | 0 test/unit/cartodb/cdb_request.test.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/models/{cdb_request.js => cdb-request.js} (100%) diff --git a/lib/api/middlewares/user.js b/lib/api/middlewares/user.js index 4dda75e7..17a85260 100644 --- a/lib/api/middlewares/user.js +++ b/lib/api/middlewares/user.js @@ -1,6 +1,6 @@ 'use strict'; -const CdbRequest = require('../../models/cdb_request'); +const CdbRequest = require('../../models/cdb-request'); module.exports = function user () { const cdbRequest = new CdbRequest(); diff --git a/lib/models/cdb_request.js b/lib/models/cdb-request.js similarity index 100% rename from lib/models/cdb_request.js rename to lib/models/cdb-request.js diff --git a/test/unit/cartodb/cdb_request.test.js b/test/unit/cartodb/cdb_request.test.js index 78d55761..851e150e 100644 --- a/test/unit/cartodb/cdb_request.test.js +++ b/test/unit/cartodb/cdb_request.test.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var CdbRequest = require('../../../lib/models/cdb_request'); +var CdbRequest = require('../../../lib/models/cdb-request'); describe('req2params', function() { From 8fb4f4063fe4a0c8420bbaee9a1acf2cc7819abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 09:59:54 +0200 Subject: [PATCH 26/37] Rename health_check -> health-check --- lib/monitoring/{health_check.js => health-check.js} | 0 lib/server-info-controller.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/monitoring/{health_check.js => health-check.js} (100%) diff --git a/lib/monitoring/health_check.js b/lib/monitoring/health-check.js similarity index 100% rename from lib/monitoring/health_check.js rename to lib/monitoring/health-check.js diff --git a/lib/server-info-controller.js b/lib/server-info-controller.js index 5fbabb26..fe1f1a19 100644 --- a/lib/server-info-controller.js +++ b/lib/server-info-controller.js @@ -1,6 +1,6 @@ 'use strict'; -var HealthCheck = require('./monitoring/health_check'); +var HealthCheck = require('./monitoring/health-check'); var WELCOME_MSG = "This is the CartoDB Maps API, " + "see the documentation at http://docs.cartodb.com/cartodb-platform/maps-api.html"; From 7dbac5a565bf6903ad9b33a5ef8b97d6b13303f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 10:01:18 +0200 Subject: [PATCH 27/37] Rename profiler_proxy -> profiler-proxy --- lib/api/middlewares/stats.js | 2 +- lib/stats/{profiler_proxy.js => profiler-proxy.js} | 0 test/integration/profiler.js | 2 +- test/unit/cartodb/ported/profiler.test.js | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename lib/stats/{profiler_proxy.js => profiler-proxy.js} (100%) diff --git a/lib/api/middlewares/stats.js b/lib/api/middlewares/stats.js index 51dbdf53..24facbcf 100644 --- a/lib/api/middlewares/stats.js +++ b/lib/api/middlewares/stats.js @@ -1,6 +1,6 @@ 'use strict'; -const Profiler = require('../../stats/profiler_proxy'); +const Profiler = require('../../stats/profiler-proxy'); const debug = require('debug')('windshaft:cartodb:stats'); const onHeaders = require('on-headers'); diff --git a/lib/stats/profiler_proxy.js b/lib/stats/profiler-proxy.js similarity index 100% rename from lib/stats/profiler_proxy.js rename to lib/stats/profiler-proxy.js diff --git a/test/integration/profiler.js b/test/integration/profiler.js index a4f81857..d27c4827 100644 --- a/test/integration/profiler.js +++ b/test/integration/profiler.js @@ -4,7 +4,7 @@ require('../support/test_helper'); var assert = require('assert'); var StatsClient = require('../../lib/stats/client'); -var ProfilerProxy = require('../../lib/stats/profiler_proxy'); +var ProfilerProxy = require('../../lib/stats/profiler-proxy'); describe('profiler + statsd', function() { var statsInstance; diff --git a/test/unit/cartodb/ported/profiler.test.js b/test/unit/cartodb/ported/profiler.test.js index 45c3e05f..e33163d2 100644 --- a/test/unit/cartodb/ported/profiler.test.js +++ b/test/unit/cartodb/ported/profiler.test.js @@ -3,7 +3,7 @@ require('../../../support/test_helper'); var assert = require('assert'); -var ProfilerProxy = require('../../../../lib/stats/profiler_proxy'); +var ProfilerProxy = require('../../../../lib/stats/profiler-proxy'); describe('profiler', function() { From 3acaac54031b40406112583d3b8047b8dae9562d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 10:04:39 +0200 Subject: [PATCH 28/37] Rename icu_data_env_setter -> icu-data-env-setter --- app.js | 2 +- lib/utils/{icu_data_env_setter.js => icu-data-env-setter.js} | 0 test/support/test_helper.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/utils/{icu_data_env_setter.js => icu-data-env-setter.js} (100%) diff --git a/app.js b/app.js index 5874c178..8fa20852 100755 --- a/app.js +++ b/app.js @@ -6,7 +6,7 @@ var path = require('path'); var fs = require('fs'); var _ = require('underscore'); var semver = require('semver'); -const setICUEnvVariable = require('./lib/utils/icu_data_env_setter'); +const setICUEnvVariable = require('./lib/utils/icu-data-env-setter'); // jshint undef:false var log = console.log.bind(console); diff --git a/lib/utils/icu_data_env_setter.js b/lib/utils/icu-data-env-setter.js similarity index 100% rename from lib/utils/icu_data_env_setter.js rename to lib/utils/icu-data-env-setter.js diff --git a/test/support/test_helper.js b/test/support/test_helper.js index cc5ff311..6890a79d 100644 --- a/test/support/test_helper.js +++ b/test/support/test_helper.js @@ -15,7 +15,7 @@ var lzmaWorker = new LZMA(); var redis = require('redis'); var log4js = require('log4js'); -const setICUEnvVariable = require('../../lib/utils/icu_data_env_setter'); +const setICUEnvVariable = require('../../lib/utils/icu-data-env-setter'); // set environment specific variables global.environment = require(__dirname + '/../../config/environments/test'); From 8fe0112568f08cef8649661a780c44620fdd92ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 10:06:01 +0200 Subject: [PATCH 29/37] Rename overviews_query_rewriter -> overviews-query-rewriter --- lib/backends/dataview.js | 2 +- lib/server_options.js | 2 +- ...{overviews_query_rewriter.js => overviews-query-rewriter.js} | 0 test/acceptance/ported/support/ported_server_options.js | 2 +- test/unit/cartodb/overviews_query_rewriter.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename lib/utils/{overviews_query_rewriter.js => overviews-query-rewriter.js} (100%) diff --git a/lib/backends/dataview.js b/lib/backends/dataview.js index acdf24a7..86ead292 100644 --- a/lib/backends/dataview.js +++ b/lib/backends/dataview.js @@ -6,7 +6,7 @@ var BBoxFilter = require('../models/filter/bbox'); var DataviewFactory = require('../models/dataview/factory'); var DataviewFactoryWithOverviews = require('../models/dataview/overviews/factory'); const dbParamsFromReqParams = require('../utils/database-params'); -var OverviewsQueryRewriter = require('../utils/overviews_query_rewriter'); +var OverviewsQueryRewriter = require('../utils/overviews-query-rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)' }); diff --git a/lib/server_options.js b/lib/server_options.js index 226153c5..95a3dd7d 100644 --- a/lib/server_options.js +++ b/lib/server_options.js @@ -2,7 +2,7 @@ const fqdn = require('@carto/fqdn-sync'); var _ = require('underscore'); -var OverviewsQueryRewriter = require('./utils/overviews_query_rewriter'); +var OverviewsQueryRewriter = require('./utils/overviews-query-rewriter'); var rendererConfig = _.defaults(global.environment.renderer || {}, { cache_ttl: 60000, // milliseconds diff --git a/lib/utils/overviews_query_rewriter.js b/lib/utils/overviews-query-rewriter.js similarity index 100% rename from lib/utils/overviews_query_rewriter.js rename to lib/utils/overviews-query-rewriter.js diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index db1a2ecf..6ff5cfe2 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -3,7 +3,7 @@ var _ = require('underscore'); var serverOptions = require('../../../../lib/server_options'); var mapnik = require('windshaft').mapnik; -var OverviewsQueryRewriter = require('../../../../lib/utils/overviews_query_rewriter'); +var OverviewsQueryRewriter = require('../../../../lib/utils/overviews-query-rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)' }); diff --git a/test/unit/cartodb/overviews_query_rewriter.js b/test/unit/cartodb/overviews_query_rewriter.js index 4aa74264..f77e4bb1 100644 --- a/test/unit/cartodb/overviews_query_rewriter.js +++ b/test/unit/cartodb/overviews_query_rewriter.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var OverviewsQueryRewriter = require('../../../lib/utils/overviews_query_rewriter'); +var OverviewsQueryRewriter = require('../../../lib/utils/overviews-query-rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ zoom_level: 'ZoomLevel()' }); From 5a84d7233b56eabd7c9a7d96501938d9277bc7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 10:07:25 +0200 Subject: [PATCH 30/37] Rename table_name_parser -> table-name-parser --- lib/utils/overviews-query-rewriter.js | 2 +- lib/utils/{table_name_parser.js => table-name-parser.js} | 0 test/unit/cartodb/table_name_parser.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/utils/{table_name_parser.js => table-name-parser.js} (100%) diff --git a/lib/utils/overviews-query-rewriter.js b/lib/utils/overviews-query-rewriter.js index cf61b070..82164d6d 100644 --- a/lib/utils/overviews-query-rewriter.js +++ b/lib/utils/overviews-query-rewriter.js @@ -1,7 +1,7 @@ 'use strict'; var _ = require('underscore'); -var TableNameParser = require('./table_name_parser'); +var TableNameParser = require('./table-name-parser'); var BBoxFilter = require('../models/filter/bbox'); var AnalysisFilter = require('../models/filter/analysis'); diff --git a/lib/utils/table_name_parser.js b/lib/utils/table-name-parser.js similarity index 100% rename from lib/utils/table_name_parser.js rename to lib/utils/table-name-parser.js diff --git a/test/unit/cartodb/table_name_parser.js b/test/unit/cartodb/table_name_parser.js index dd62a410..39602b4a 100644 --- a/test/unit/cartodb/table_name_parser.js +++ b/test/unit/cartodb/table_name_parser.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var TableNameParser = require('../../../lib/utils/table_name_parser'); +var TableNameParser = require('../../../lib/utils/table-name-parser'); describe('TableNameParser', function() { From a134ab3012aa79d0f686225c409dc8104e708fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 10:10:51 +0200 Subject: [PATCH 31/37] Rename server_options -> server-options --- README.md | 2 +- app.js | 2 +- lib/{server_options.js => server-options.js} | 0 test/acceptance/aggregation.js | 2 +- test/acceptance/analysis/named-maps.js | 2 +- test/acceptance/auth/authorization-basic-use-cases.js | 2 +- test/acceptance/buffer-size-format.js | 2 +- test/acceptance/cache/cache_headers.js | 2 +- test/acceptance/cache/surrogate_keys_invalidation.js | 2 +- test/acceptance/custom-middlewares.js | 2 +- test/acceptance/date-wrapping.spec.js | 2 +- test/acceptance/dynamic-styling-named-maps.js | 2 +- test/acceptance/errors-with-context.js | 2 +- test/acceptance/health_check.js | 2 +- test/acceptance/layergroup-metadata.js | 2 +- test/acceptance/multilayer.js | 2 +- test/acceptance/multilayer_server.js | 2 +- test/acceptance/mvt-regressions.js | 2 +- test/acceptance/mvt.js | 2 +- test/acceptance/named-map-cache-regressions.js | 2 +- test/acceptance/named_layers.js | 2 +- test/acceptance/named_layers_visibility.js | 2 +- test/acceptance/named_maps_authentication.js | 2 +- test/acceptance/named_maps_cache.js | 2 +- test/acceptance/named_maps_static_view.js | 2 +- test/acceptance/named_maps_stats.js | 2 +- test/acceptance/overviews_metadata.js | 2 +- test/acceptance/overviews_metadata_named_maps.js | 2 +- test/acceptance/ported/support/ported_server_options.js | 2 +- test/acceptance/rate-limit.test.js | 2 +- test/acceptance/regressions.js | 2 +- test/acceptance/server.js | 2 +- test/acceptance/stats/mapnik_stats_layergroup.js | 2 +- test/acceptance/templates.js | 2 +- test/acceptance/tilejson.js | 2 +- test/acceptance/turbo-carto/named-maps.js | 2 +- test/acceptance/user-database-timeout-limit.js | 2 +- test/acceptance/user-render-timeout-limit.js | 2 +- test/acceptance/vector-layergroup.js | 2 +- test/acceptance/widgets/named-maps.js | 2 +- test/support/test-client.js | 2 +- test/unit/cartodb/ported/windshaft_server.test.js | 2 +- test/unit/cartodb/prepare-context.test.js | 2 +- 43 files changed, 42 insertions(+), 42 deletions(-) rename lib/{server_options.js => server-options.js} (100%) diff --git a/README.md b/README.md index 79a17cbd..f6f0bdde 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Create the config/environments/.js files (there are .example files to start from). You can optionally use the ./configure script for this, see ```./configure --help``` to see available options. -Look at lib/cartodb/server_options.js for more on config +Look at lib/cartodb/server-options.js for more on config Upgrading --------- diff --git a/app.js b/app.js index 8fa20852..e8cd445b 100755 --- a/app.js +++ b/app.js @@ -106,7 +106,7 @@ global.logger = global.log4js.getLogger(); // Include cartodb_windshaft only _after_ the "global" variable is set // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28 var cartodbWindshaft = require('./lib/server'); -var serverOptions = require('./lib/server_options'); +var serverOptions = require('./lib/server-options'); var server = cartodbWindshaft(serverOptions); diff --git a/lib/server_options.js b/lib/server-options.js similarity index 100% rename from lib/server_options.js rename to lib/server-options.js diff --git a/test/acceptance/aggregation.js b/test/acceptance/aggregation.js index 347d91e8..28e3a528 100644 --- a/test/acceptance/aggregation.js +++ b/test/acceptance/aggregation.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const WebMercatorHelper = require('cartodb-query-tables').utils.webMercatorHelper; const webmercator = new WebMercatorHelper(); diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps.js index b6e5f103..2c462d28 100644 --- a/test/acceptance/analysis/named-maps.js +++ b/test/acceptance/analysis/named-maps.js @@ -5,7 +5,7 @@ var assert = require('../../support/assert'); var helper = require('../../support/test_helper'); var CartodbWindshaft = require('../../../lib/server'); -var serverOptions = require('../../../lib/server_options'); +var serverOptions = require('../../../lib/server-options'); var TestClient = require('../../support/test-client'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases.js index e86a879e..9608f3be 100644 --- a/test/acceptance/auth/authorization-basic-use-cases.js +++ b/test/acceptance/auth/authorization-basic-use-cases.js @@ -3,7 +3,7 @@ const assert = require('../../support/assert'); const testHelper = require('../../support/test_helper'); const CartodbWindshaft = require('../../../lib/server'); -const serverOptions = require('../../../lib/server_options'); +const serverOptions = require('../../../lib/server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); function singleLayergroupConfig(sql, cartocss) { diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format.js index 120bf42b..090f7f86 100644 --- a/test/acceptance/buffer-size-format.js +++ b/test/acceptance/buffer-size-format.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var fs = require('fs'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE_PER_MIL = 5; diff --git a/test/acceptance/cache/cache_headers.js b/test/acceptance/cache/cache_headers.js index 81a0dd85..36383f94 100644 --- a/test/acceptance/cache/cache_headers.js +++ b/test/acceptance/cache/cache_headers.js @@ -6,7 +6,7 @@ var assert = require('../../support/assert'); var qs = require('querystring'); var CartodbWindshaft = require('../../../lib/server'); -var serverOptions = require('../../../lib/server_options'); +var serverOptions = require('../../../lib/server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/cache/surrogate_keys_invalidation.js b/test/acceptance/cache/surrogate_keys_invalidation.js index 67bc64d6..9a8cc136 100644 --- a/test/acceptance/cache/surrogate_keys_invalidation.js +++ b/test/acceptance/cache/surrogate_keys_invalidation.js @@ -12,7 +12,7 @@ var nock = require('nock'); describe('templates surrogate keys', function() { - var serverOptions = require('../../../lib/server_options'); + var serverOptions = require('../../../lib/server-options'); // Enable Varnish purge for tests var varnishHost = serverOptions.varnish_host; diff --git a/test/acceptance/custom-middlewares.js b/test/acceptance/custom-middlewares.js index a4bb7559..cb25a495 100644 --- a/test/acceptance/custom-middlewares.js +++ b/test/acceptance/custom-middlewares.js @@ -3,7 +3,7 @@ const helper = require('../support/test_helper'); const assert = require('../support/assert'); const createServer = require('../../lib/server'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); describe('custom middlewares', function () { const RESPONSE_OK = { diff --git a/test/acceptance/date-wrapping.spec.js b/test/acceptance/date-wrapping.spec.js index a3c98261..85b56111 100644 --- a/test/acceptance/date-wrapping.spec.js +++ b/test/acceptance/date-wrapping.spec.js @@ -4,7 +4,7 @@ const assert = require('assert'); const TestClient = require('../support/test-client'); const mapConfigFactory = require('../fixtures/test_mapconfigFactory'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const usePgMvtRenderer = serverOptions.renderer.mvt.usePostGIS; const describe_mvt = !usePgMvtRenderer ? describe : describe.skip; diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js index 744bf1cd..ff3b96f3 100644 --- a/test/acceptance/dynamic-styling-named-maps.js +++ b/test/acceptance/dynamic-styling-named-maps.js @@ -5,7 +5,7 @@ var step = require('step'); var LayergroupToken = require('../../lib/models/layergroup-token'); var testHelper = require(__dirname + '/../support/test_helper'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); describe('dynamic styling for named maps', function() { var server; diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context.js index 4d07617f..25c83101 100644 --- a/test/acceptance/errors-with-context.js +++ b/test/acceptance/errors-with-context.js @@ -2,7 +2,7 @@ var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); describe('error with context', function () { var server; diff --git a/test/acceptance/health_check.js b/test/acceptance/health_check.js index b49eb03f..2c457a8a 100644 --- a/test/acceptance/health_check.js +++ b/test/acceptance/health_check.js @@ -6,7 +6,7 @@ var fs = require('fs'); var assert = require('../support/assert'); var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); describe('health checks', function () { diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata.js index 816c44b2..0a039fe4 100644 --- a/test/acceptance/layergroup-metadata.js +++ b/test/acceptance/layergroup-metadata.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); describe('layergroup metadata', function () { const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 6ccfd82f..24b2804a 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -19,7 +19,7 @@ var IMAGE_EQUALS_TOLERANCE_PER_MIL = 20; var IMAGE_EQUALS_HIGHER_TOLERANCE_PER_MIL = 25; var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); var QueryTables = require('cartodb-query-tables').queryTables; diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 9a79471f..643e8d0d 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -11,7 +11,7 @@ var LayergroupToken = require('../../lib/models/layergroup-token'); var PgQueryRunner = require('../../lib/backends/pg-query-runner'); var QueryTables = require('cartodb-query-tables').queryTables; var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); describe('tests from old api translated to multilayer', function() { var server; diff --git a/test/acceptance/mvt-regressions.js b/test/acceptance/mvt-regressions.js index c8c4ffa8..a7655e28 100644 --- a/test/acceptance/mvt-regressions.js +++ b/test/acceptance/mvt-regressions.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const suites = [ { diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 10c5cac7..9db7d7d1 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -4,7 +4,7 @@ require('../support/test_helper'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); function createMapConfig(sql = TestClient.SQL.ONE_POINT) { return { diff --git a/test/acceptance/named-map-cache-regressions.js b/test/acceptance/named-map-cache-regressions.js index 15c03f51..85594516 100644 --- a/test/acceptance/named-map-cache-regressions.js +++ b/test/acceptance/named-map-cache-regressions.js @@ -5,7 +5,7 @@ require('../support/test_helper'); const request = require('request'); const assert = require('assert'); const Server = require('../../lib/server'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const { mapnik } = require('windshaft'); const helper = require('../support/test_helper'); diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js index 4d92880f..60a7dc48 100644 --- a/test/acceptance/named_layers.js +++ b/test/acceptance/named_layers.js @@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/named_layers_visibility.js b/test/acceptance/named_layers_visibility.js index 5d1f9618..588f079c 100644 --- a/test/acceptance/named_layers_visibility.js +++ b/test/acceptance/named_layers_visibility.js @@ -5,7 +5,7 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var RedisPool = require('redis-mpool'); var TemplateMaps = require('../../lib/backends/template_maps.js'); diff --git a/test/acceptance/named_maps_authentication.js b/test/acceptance/named_maps_authentication.js index 6b7aac15..dc2163bd 100644 --- a/test/acceptance/named_maps_authentication.js +++ b/test/acceptance/named_maps_authentication.js @@ -7,7 +7,7 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var TemplateMaps = require('../../lib/backends/template_maps.js'); var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); diff --git a/test/acceptance/named_maps_cache.js b/test/acceptance/named_maps_cache.js index eb2edcd0..90969992 100644 --- a/test/acceptance/named_maps_cache.js +++ b/test/acceptance/named_maps_cache.js @@ -6,7 +6,7 @@ const helper = require('../support/test_helper'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); describe('named maps provider cache', function() { var server; diff --git a/test/acceptance/named_maps_static_view.js b/test/acceptance/named_maps_static_view.js index 1075b398..84175a38 100644 --- a/test/acceptance/named_maps_static_view.js +++ b/test/acceptance/named_maps_static_view.js @@ -7,7 +7,7 @@ var RedisPool = require('redis-mpool'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); var TemplateMaps = require('../../lib/backends/template_maps.js'); describe('named maps static view', function() { diff --git a/test/acceptance/named_maps_stats.js b/test/acceptance/named_maps_stats.js index 10be0d91..56df1169 100644 --- a/test/acceptance/named_maps_stats.js +++ b/test/acceptance/named_maps_stats.js @@ -7,7 +7,7 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var TemplateMaps = require('../../lib/backends/template_maps.js'); var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); diff --git a/test/acceptance/overviews_metadata.js b/test/acceptance/overviews_metadata.js index 2b2b25a8..74da08fa 100644 --- a/test/acceptance/overviews_metadata.js +++ b/test/acceptance/overviews_metadata.js @@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/overviews_metadata_named_maps.js b/test/acceptance/overviews_metadata_named_maps.js index e4822e0b..03afca5a 100644 --- a/test/acceptance/overviews_metadata_named_maps.js +++ b/test/acceptance/overviews_metadata_named_maps.js @@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index 6ff5cfe2..ea84a4d2 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -1,7 +1,7 @@ 'use strict'; var _ = require('underscore'); -var serverOptions = require('../../../../lib/server_options'); +var serverOptions = require('../../../../lib/server-options'); var mapnik = require('windshaft').mapnik; var OverviewsQueryRewriter = require('../../../../lib/utils/overviews-query-rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js index d9589d0b..ed6c5c1c 100644 --- a/test/acceptance/rate-limit.test.js +++ b/test/acceptance/rate-limit.test.js @@ -9,7 +9,7 @@ const cartodbRedis = require('cartodb-redis'); const TestClient = require('../support/test-client'); const UserLimitsBackend = require('../../lib/backends/user-limits'); const rateLimitMiddleware = require('../../lib/api/middlewares/rate-limit'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitMiddleware; let userLimitsApi; diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions.js index df91d910..7e6f2f63 100644 --- a/test/acceptance/regressions.js +++ b/test/acceptance/regressions.js @@ -6,7 +6,7 @@ const helper = require('../support/test_helper'); var TestClient = require('../support/test-client'); const LayergroupToken = require('../../lib/models/layergroup-token'); const CartodbWindshaft = require(__dirname + '/../../lib/server'); -const serverOptions = require(__dirname + '/../../lib/server_options'); +const serverOptions = require(__dirname + '/../../lib/server-options'); describe('regressions', function() { diff --git a/test/acceptance/server.js b/test/acceptance/server.js index 39275415..93584e04 100644 --- a/test/acceptance/server.js +++ b/test/acceptance/server.js @@ -7,7 +7,7 @@ var querystring = require('querystring'); var step = require('step'); var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); describe('server', function() { diff --git a/test/acceptance/stats/mapnik_stats_layergroup.js b/test/acceptance/stats/mapnik_stats_layergroup.js index 5395bf0c..79ba6522 100644 --- a/test/acceptance/stats/mapnik_stats_layergroup.js +++ b/test/acceptance/stats/mapnik_stats_layergroup.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); -const serverOptions = require('../../../lib/server_options'); +const serverOptions = require('../../../lib/server-options'); const suites = [ { diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js index 67901c34..ceb5596b 100644 --- a/test/acceptance/templates.js +++ b/test/acceptance/templates.js @@ -21,7 +21,7 @@ var http = require('http'); var helper = require(__dirname + '/../support/test_helper'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/tilejson.js b/test/acceptance/tilejson.js index 22db6082..ee895031 100644 --- a/test/acceptance/tilejson.js +++ b/test/acceptance/tilejson.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; diff --git a/test/acceptance/turbo-carto/named-maps.js b/test/acceptance/turbo-carto/named-maps.js index 17269442..987cc2d5 100644 --- a/test/acceptance/turbo-carto/named-maps.js +++ b/test/acceptance/turbo-carto/named-maps.js @@ -5,7 +5,7 @@ var step = require('step'); var LayergroupToken = require('../../../lib/models/layergroup-token'); var testHelper = require('../../support/test_helper'); var CartodbWindshaft = require('../../../lib/server'); -var serverOptions = require('../../../lib/server_options'); +var serverOptions = require('../../../lib/server-options'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE_PER_MIL = 10; diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit.js index 81c0161c..24752fb8 100644 --- a/test/acceptance/user-database-timeout-limit.js +++ b/test/acceptance/user-database-timeout-limit.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit.js index 6e2e1e36..d890c1f0 100644 --- a/test/acceptance/user-render-timeout-limit.js +++ b/test/acceptance/user-render-timeout-limit.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js index 781e4d3f..6161b472 100644 --- a/test/acceptance/vector-layergroup.js +++ b/test/acceptance/vector-layergroup.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const POINTS_SQL_1 = ` diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps.js index d034453a..fe507a7f 100644 --- a/test/acceptance/widgets/named-maps.js +++ b/test/acceptance/widgets/named-maps.js @@ -9,7 +9,7 @@ var queue = require('queue-async'); var helper = require('../../support/test_helper'); var CartodbWindshaft = require('../../../lib/server'); -var serverOptions = require('../../../lib/server_options'); +var serverOptions = require('../../../lib/server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/support/test-client.js b/test/support/test-client.js index b18580e4..7b58f458 100644 --- a/test/support/test-client.js +++ b/test/support/test-client.js @@ -13,7 +13,7 @@ var assert = require('./assert'); var helper = require('./test_helper'); var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); serverOptions.analysis.batch.inlineExecution = true; const MAPNIK_SUPPORTED_FORMATS = { diff --git a/test/unit/cartodb/ported/windshaft_server.test.js b/test/unit/cartodb/ported/windshaft_server.test.js index cf19f1b2..8ec43400 100644 --- a/test/unit/cartodb/ported/windshaft_server.test.js +++ b/test/unit/cartodb/ported/windshaft_server.test.js @@ -4,7 +4,7 @@ require('../../../support/test_helper.js'); var assert = require('assert'); var cartodbServer = require('../../../../lib/server'); -var serverOptions = require('../../../../lib/server_options'); +var serverOptions = require('../../../../lib/server-options'); describe('windshaft', function() { diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js index 5442db90..aaa0f2ee 100644 --- a/test/unit/cartodb/prepare-context.test.js +++ b/test/unit/cartodb/prepare-context.test.js @@ -42,7 +42,7 @@ describe('prepare-context', function() { }); - it('can be found in server_options', function(){ + it('can be found in server-options', function(){ assert.ok(_.isFunction(authorize)); assert.ok(_.isFunction(dbConnSetup)); assert.ok(_.isFunction(cleanUpQueryParams)); From f1de1b3b9125dcdf7f64e08fb86888483a7d6171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 10:44:45 +0200 Subject: [PATCH 32/37] Rename test files: stop using underscores, use hyphens instead --- test/acceptance/aggregation.js | 2 +- test/acceptance/analysis/analyses-controller.js | 2 +- test/acceptance/analysis/analyses-filters-params.js | 2 +- test/acceptance/analysis/analyses-filters.js | 2 +- test/acceptance/analysis/analysis-layers-dataviews.js | 2 +- test/acceptance/analysis/analysis-layers-use-cases.js | 2 +- test/acceptance/analysis/analysis-layers.js | 2 +- test/acceptance/analysis/error-cases.js | 2 +- test/acceptance/analysis/named-maps.js | 2 +- test/acceptance/analysis/regressions.js | 2 +- test/acceptance/auth/authorization-basic-use-cases.js | 2 +- test/acceptance/auth/authorization.js | 2 +- test/acceptance/buffer-size-format.js | 2 +- test/acceptance/cache/cache-control-header.js | 2 +- .../acceptance/cache/{cache_headers.js => cache-headers.js} | 2 +- ..._keys_invalidation.js => surrogate-keys-invalidation.js} | 2 +- test/acceptance/cluster.js | 2 +- test/acceptance/custom-middlewares.js | 2 +- test/acceptance/dataviews/aggregation.js | 2 +- test/acceptance/dataviews/error-cases.js | 2 +- test/acceptance/dataviews/formula.js | 2 +- test/acceptance/dataviews/histogram.js | 2 +- test/acceptance/dataviews/overviews.js | 2 +- test/acceptance/dynamic-styling-named-maps.js | 2 +- test/acceptance/{health_check.js => health-check.js} | 2 +- test/acceptance/label-wrap.js | 2 +- test/acceptance/layergroup-metadata.js | 2 +- test/acceptance/layers-filters.js | 2 +- test/acceptance/max-waiting-workers.js | 2 +- test/acceptance/multilayer.js | 2 +- test/acceptance/multilayer_server.js | 2 +- test/acceptance/mvt-regressions.js | 2 +- test/acceptance/mvt.js | 2 +- ...amed_layers_visibility.js => named-layers-visibility.js} | 2 +- test/acceptance/{named_layers.js => named-layers.js} | 2 +- test/acceptance/named-map-cache-regressions.js | 4 ++-- ..._maps_authentication.js => named-maps-authentication.js} | 2 +- .../acceptance/{named_maps_cache.js => named-maps-cache.js} | 4 ++-- ...{named_maps_static_view.js => named-maps-static-view.js} | 2 +- .../acceptance/{named_maps_stats.js => named-maps-stats.js} | 2 +- ...adata_named_maps.js => overviews-metadata-named-maps.js} | 2 +- .../{overviews_metadata.js => overviews-metadata.js} | 2 +- .../{overviews_queries.js => overviews-queries.js} | 6 +++--- test/acceptance/ported/attributes.js | 4 ++-- .../ported/{blend_filtering.js => blend-filtering.js} | 4 ++-- .../{blend_http_fallback.js => blend-http-fallback.js} | 4 ++-- .../ported/{blend_http_timeout.js => blend-http-timeout.js} | 6 +++--- test/acceptance/ported/blend.js | 4 ++-- .../ported/{external_resources.js => external-resources.js} | 6 +++--- test/acceptance/ported/limits.js | 6 +++--- ...{multilayer_error_cases.js => multilayer-error-cases.js} | 6 +++--- ...tilayer_interactivity.js => multilayer-interactivity.js} | 4 ++-- test/acceptance/ported/multilayer.js | 4 ++-- test/acceptance/ported/raster.js | 4 ++-- test/acceptance/ported/regressions.js | 4 ++-- test/acceptance/ported/retina.js | 4 ++-- .../ported/{server_gettile.js => server-gettile.js} | 6 +++--- .../ported/{server_png8_format.js => server-png8-format.js} | 4 ++-- test/acceptance/ported/server.js | 6 +++--- test/acceptance/ported/{static_maps.js => static-maps.js} | 4 ++-- .../{ported_server_options.js => ported-server-options.js} | 0 .../ported/support/{test_client.js => test-client.js} | 4 ++-- .../ported/{torque_boundaries.js => torque-boundaries.js} | 4 ++-- test/acceptance/ported/{torque_png.js => torque-png.js} | 4 ++-- .../ported/{torque_zero_zero.js => torque-zero-zero.js} | 4 ++-- test/acceptance/ported/torque.js | 4 ++-- test/acceptance/ported/wrap.js | 4 ++-- test/acceptance/rate-limit.test.js | 2 +- test/acceptance/regressions.js | 4 ++-- test/acceptance/server.js | 2 +- test/acceptance/special-numeric-values.js | 2 +- test/acceptance/sql-wrap.js | 2 +- ...apnik_stats_layergroup.js => mapnik-stats-layergroup.js} | 2 +- .../stats/{multilayer_stats.js => multilayer-stats.js} | 2 +- test/acceptance/templates.js | 2 +- test/acceptance/tilejson.js | 2 +- test/acceptance/turbo-carto/error-cases.js | 2 +- test/acceptance/turbo-carto/named-maps.js | 2 +- test/acceptance/turbo-carto/regressions.js | 2 +- test/acceptance/user-database-timeout-limit.js | 2 +- test/acceptance/user-render-timeout-limit.js | 2 +- test/acceptance/vector-layergroup.js | 2 +- test/acceptance/widgets/aggregation.js | 2 +- test/acceptance/widgets/histogram.js | 2 +- test/acceptance/widgets/named-maps.js | 2 +- test/acceptance/widgets/ported/aggregation.js | 2 +- test/acceptance/widgets/ported/formula.js | 2 +- test/acceptance/widgets/ported/histogram.js | 2 +- test/acceptance/widgets/regressions.js | 2 +- test/acceptance/widgets/widgets.js | 2 +- test/integration/analysis-backend-limits.js | 2 +- ...s_datasource.js => mapconfig-named-layers-datasource.js} | 2 +- ...ayers_expanded.js => mapconfig-named-layers-expanded.js} | 2 +- ..._overviews_adapter.js => mapconfig-overviews-adapter.js} | 2 +- test/integration/overviews-metadata-api.js | 2 +- test/integration/pg-query-runner.js | 2 +- test/integration/profiler.js | 2 +- test/integration/query-tables.js | 2 +- test/integration/template-maps-limits.js | 2 +- test/support/test-client.js | 2 +- test/support/{test_helper.js => test-helper.js} | 0 .../{named_maps_entry.test.js => named-maps-entry-test.js} | 2 +- .../cartodb/{cdb_request.test.js => cdb-request-test.js} | 2 +- .../{error_messages.test.js => error-messages-test.js} | 2 +- .../{error-middleware.test.js => error-middleware-test.js} | 2 +- .../{lzmaMiddleware.test.js => lzma-middleware-test.js} | 2 +- .../cartodb/mapconfig/{adapter.test.js => adapter-test.js} | 2 +- ...ts-adapter.test.js => dataviews-widgets-adapter-test.js} | 2 +- .../{coordinates.test.js => coordinates-test.js} | 0 .../filter/{bbox-filters.test.js => bbox-filters-test.js} | 2 +- .../{resource-locator.test.js => resource-locator-test.js} | 2 +- ...rviews_query_rewriter.js => overviews-query-rewriter.js} | 2 +- .../cartodb/ported/{profiler.test.js => profiler-test.js} | 2 +- .../ported/{stats_client.test.js => stats-client-test.js} | 2 +- .../{windshaft_server.test.js => windshaft-server-test.js} | 2 +- .../{prepare-context.test.js => prepare-context-test.js} | 0 ...stitution-tokens.test.js => substitution-tokens-test.js} | 0 .../cartodb/{table_name_parser.js => table-name-parser.js} | 2 +- ...emplate_maps_auth.test.js => template-maps-auth-test.js} | 2 +- ...maps_defaults.test.js => template-maps-defaults-test.js} | 2 +- .../{template_maps.test.js => template-maps-test.js} | 2 +- .../utils/{date-wrapper.test.js => date-wrapper-test.js} | 0 ...id_template_maps.test.js => valid-template-maps-test.js} | 2 +- 123 files changed, 151 insertions(+), 151 deletions(-) rename test/acceptance/cache/{cache_headers.js => cache-headers.js} (99%) rename test/acceptance/cache/{surrogate_keys_invalidation.js => surrogate-keys-invalidation.js} (99%) rename test/acceptance/{health_check.js => health-check.js} (98%) rename test/acceptance/{named_layers_visibility.js => named-layers-visibility.js} (99%) rename test/acceptance/{named_layers.js => named-layers.js} (99%) rename test/acceptance/{named_maps_authentication.js => named-maps-authentication.js} (99%) rename test/acceptance/{named_maps_cache.js => named-maps-cache.js} (98%) rename test/acceptance/{named_maps_static_view.js => named-maps-static-view.js} (99%) rename test/acceptance/{named_maps_stats.js => named-maps-stats.js} (98%) rename test/acceptance/{overviews_metadata_named_maps.js => overviews-metadata-named-maps.js} (99%) rename test/acceptance/{overviews_metadata.js => overviews-metadata.js} (99%) rename test/acceptance/{overviews_queries.js => overviews-queries.js} (92%) rename test/acceptance/ported/{blend_filtering.js => blend-filtering.js} (98%) rename test/acceptance/ported/{blend_http_fallback.js => blend-http-fallback.js} (98%) rename test/acceptance/ported/{blend_http_timeout.js => blend-http-timeout.js} (94%) rename test/acceptance/ported/{external_resources.js => external-resources.js} (96%) rename test/acceptance/ported/{multilayer_error_cases.js => multilayer-error-cases.js} (99%) rename test/acceptance/ported/{multilayer_interactivity.js => multilayer-interactivity.js} (98%) rename test/acceptance/ported/{server_gettile.js => server-gettile.js} (98%) rename test/acceptance/ported/{server_png8_format.js => server-png8-format.js} (98%) rename test/acceptance/ported/{static_maps.js => static-maps.js} (98%) rename test/acceptance/ported/support/{ported_server_options.js => ported-server-options.js} (100%) rename test/acceptance/ported/support/{test_client.js => test-client.js} (99%) rename test/acceptance/ported/{torque_boundaries.js => torque-boundaries.js} (99%) rename test/acceptance/ported/{torque_png.js => torque-png.js} (98%) rename test/acceptance/ported/{torque_zero_zero.js => torque-zero-zero.js} (96%) rename test/acceptance/stats/{mapnik_stats_layergroup.js => mapnik-stats-layergroup.js} (99%) rename test/acceptance/stats/{multilayer_stats.js => multilayer-stats.js} (99%) rename test/integration/{mapconfig_named_layers_datasource.js => mapconfig-named-layers-datasource.js} (99%) rename test/integration/{mapconfig_named_layers_expanded.js => mapconfig-named-layers-expanded.js} (99%) rename test/integration/{mapconfig_overviews_adapter.js => mapconfig-overviews-adapter.js} (99%) rename test/support/{test_helper.js => test-helper.js} (100%) rename test/unit/cartodb/cache/model/{named_maps_entry.test.js => named-maps-entry-test.js} (95%) rename test/unit/cartodb/{cdb_request.test.js => cdb-request-test.js} (98%) rename test/unit/cartodb/{error_messages.test.js => error-messages-test.js} (95%) rename test/unit/cartodb/{error-middleware.test.js => error-middleware-test.js} (99%) rename test/unit/cartodb/{lzmaMiddleware.test.js => lzma-middleware-test.js} (95%) rename test/unit/cartodb/mapconfig/{adapter.test.js => adapter-test.js} (98%) rename test/unit/cartodb/mapconfig/{dataviews-widgets-adapter.test.js => dataviews-widgets-adapter-test.js} (99%) rename test/unit/cartodb/middlewares/{coordinates.test.js => coordinates-test.js} (100%) rename test/unit/cartodb/model/filter/{bbox-filters.test.js => bbox-filters-test.js} (99%) rename test/unit/cartodb/model/{resource-locator.test.js => resource-locator-test.js} (99%) rename test/unit/cartodb/{overviews_query_rewriter.js => overviews-query-rewriter.js} (99%) rename test/unit/cartodb/ported/{profiler.test.js => profiler-test.js} (93%) rename test/unit/cartodb/ported/{stats_client.test.js => stats-client-test.js} (96%) rename test/unit/cartodb/ported/{windshaft_server.test.js => windshaft-server-test.js} (96%) rename test/unit/cartodb/{prepare-context.test.js => prepare-context-test.js} (100%) rename test/unit/cartodb/{substitution-tokens.test.js => substitution-tokens-test.js} (100%) rename test/unit/cartodb/{table_name_parser.js => table-name-parser.js} (98%) rename test/unit/cartodb/{template_maps_auth.test.js => template-maps-auth-test.js} (98%) rename test/unit/cartodb/{template_maps_defaults.test.js => template-maps-defaults-test.js} (98%) rename test/unit/cartodb/{template_maps.test.js => template-maps-test.js} (99%) rename test/unit/cartodb/utils/{date-wrapper.test.js => date-wrapper-test.js} (100%) rename test/unit/cartodb/{valid_template_maps.test.js => valid-template-maps-test.js} (98%) diff --git a/test/acceptance/aggregation.js b/test/acceptance/aggregation.js index 28e3a528..e1975f8a 100644 --- a/test/acceptance/aggregation.js +++ b/test/acceptance/aggregation.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/analysis/analyses-controller.js b/test/acceptance/analysis/analyses-controller.js index 6ed0808b..04aea78c 100644 --- a/test/acceptance/analysis/analyses-controller.js +++ b/test/acceptance/analysis/analyses-controller.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/analysis/analyses-filters-params.js b/test/acceptance/analysis/analyses-filters-params.js index 21fd8f01..342fcb4d 100644 --- a/test/acceptance/analysis/analyses-filters-params.js +++ b/test/acceptance/analysis/analyses-filters-params.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); const assert = require('../../support/assert'); const TestClient = require('../../support/test-client'); diff --git a/test/acceptance/analysis/analyses-filters.js b/test/acceptance/analysis/analyses-filters.js index ff86855f..5e8390e2 100644 --- a/test/acceptance/analysis/analyses-filters.js +++ b/test/acceptance/analysis/analyses-filters.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); const assert = require('../../support/assert'); const TestClient = require('../../support/test-client'); diff --git a/test/acceptance/analysis/analysis-layers-dataviews.js b/test/acceptance/analysis/analysis-layers-dataviews.js index 7a35607f..95436185 100644 --- a/test/acceptance/analysis/analysis-layers-dataviews.js +++ b/test/acceptance/analysis/analysis-layers-dataviews.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/analysis/analysis-layers-use-cases.js b/test/acceptance/analysis/analysis-layers-use-cases.js index cc10c7dc..d765ae4e 100644 --- a/test/acceptance/analysis/analysis-layers-use-cases.js +++ b/test/acceptance/analysis/analysis-layers-use-cases.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/analysis/analysis-layers.js b/test/acceptance/analysis/analysis-layers.js index b7eeac48..2c871a3b 100644 --- a/test/acceptance/analysis/analysis-layers.js +++ b/test/acceptance/analysis/analysis-layers.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/analysis/error-cases.js b/test/acceptance/analysis/error-cases.js index 5c610dde..eeb8d3e3 100644 --- a/test/acceptance/analysis/error-cases.js +++ b/test/acceptance/analysis/error-cases.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps.js index 2c462d28..5a092a11 100644 --- a/test/acceptance/analysis/named-maps.js +++ b/test/acceptance/analysis/named-maps.js @@ -2,7 +2,7 @@ var assert = require('../../support/assert'); -var helper = require('../../support/test_helper'); +var helper = require('../../support/test-helper'); var CartodbWindshaft = require('../../../lib/server'); var serverOptions = require('../../../lib/server-options'); diff --git a/test/acceptance/analysis/regressions.js b/test/acceptance/analysis/regressions.js index 72fd9a35..c1758a20 100644 --- a/test/acceptance/analysis/regressions.js +++ b/test/acceptance/analysis/regressions.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases.js index 9608f3be..491b81b0 100644 --- a/test/acceptance/auth/authorization-basic-use-cases.js +++ b/test/acceptance/auth/authorization-basic-use-cases.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('../../support/assert'); -const testHelper = require('../../support/test_helper'); +const testHelper = require('../../support/test-helper'); const CartodbWindshaft = require('../../../lib/server'); const serverOptions = require('../../../lib/server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/auth/authorization.js b/test/acceptance/auth/authorization.js index 7fff7aa3..62384d84 100644 --- a/test/acceptance/auth/authorization.js +++ b/test/acceptance/auth/authorization.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); const assert = require('../../support/assert'); const TestClient = require('../../support/test-client'); diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format.js index 090f7f86..62d19ccc 100644 --- a/test/acceptance/buffer-size-format.js +++ b/test/acceptance/buffer-size-format.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var fs = require('fs'); var assert = require('../support/assert'); diff --git a/test/acceptance/cache/cache-control-header.js b/test/acceptance/cache/cache-control-header.js index 5a738700..d3b89863 100644 --- a/test/acceptance/cache/cache-control-header.js +++ b/test/acceptance/cache/cache-control-header.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); const assert = require('../../support/assert'); const TestClient = require('../../support/test-client'); diff --git a/test/acceptance/cache/cache_headers.js b/test/acceptance/cache/cache-headers.js similarity index 99% rename from test/acceptance/cache/cache_headers.js rename to test/acceptance/cache/cache-headers.js index 36383f94..974a60ff 100644 --- a/test/acceptance/cache/cache_headers.js +++ b/test/acceptance/cache/cache-headers.js @@ -1,6 +1,6 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var qs = require('querystring'); diff --git a/test/acceptance/cache/surrogate_keys_invalidation.js b/test/acceptance/cache/surrogate-keys-invalidation.js similarity index 99% rename from test/acceptance/cache/surrogate_keys_invalidation.js rename to test/acceptance/cache/surrogate-keys-invalidation.js index 9a8cc136..58336275 100644 --- a/test/acceptance/cache/surrogate_keys_invalidation.js +++ b/test/acceptance/cache/surrogate-keys-invalidation.js @@ -1,6 +1,6 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var step = require('step'); diff --git a/test/acceptance/cluster.js b/test/acceptance/cluster.js index 840757a8..33ea4234 100644 --- a/test/acceptance/cluster.js +++ b/test/acceptance/cluster.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/custom-middlewares.js b/test/acceptance/custom-middlewares.js index cb25a495..7348479c 100644 --- a/test/acceptance/custom-middlewares.js +++ b/test/acceptance/custom-middlewares.js @@ -1,6 +1,6 @@ 'use strict'; -const helper = require('../support/test_helper'); +const helper = require('../support/test-helper'); const assert = require('../support/assert'); const createServer = require('../../lib/server'); const serverOptions = require('../../lib/server-options'); diff --git a/test/acceptance/dataviews/aggregation.js b/test/acceptance/dataviews/aggregation.js index c6df346b..ae357dce 100644 --- a/test/acceptance/dataviews/aggregation.js +++ b/test/acceptance/dataviews/aggregation.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/dataviews/error-cases.js b/test/acceptance/dataviews/error-cases.js index 835efa53..64af27a2 100644 --- a/test/acceptance/dataviews/error-cases.js +++ b/test/acceptance/dataviews/error-cases.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/dataviews/formula.js b/test/acceptance/dataviews/formula.js index 028b6368..9f8b2877 100644 --- a/test/acceptance/dataviews/formula.js +++ b/test/acceptance/dataviews/formula.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/dataviews/histogram.js b/test/acceptance/dataviews/histogram.js index f517a59a..945fc9dd 100644 --- a/test/acceptance/dataviews/histogram.js +++ b/test/acceptance/dataviews/histogram.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/dataviews/overviews.js b/test/acceptance/dataviews/overviews.js index 7642dc73..8df298b3 100644 --- a/test/acceptance/dataviews/overviews.js +++ b/test/acceptance/dataviews/overviews.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js index ff3b96f3..a00c4106 100644 --- a/test/acceptance/dynamic-styling-named-maps.js +++ b/test/acceptance/dynamic-styling-named-maps.js @@ -3,7 +3,7 @@ var assert = require('../support/assert'); var step = require('step'); var LayergroupToken = require('../../lib/models/layergroup-token'); -var testHelper = require(__dirname + '/../support/test_helper'); +var testHelper = require(__dirname + '/../support/test-helper'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); var serverOptions = require(__dirname + '/../../lib/server-options'); diff --git a/test/acceptance/health_check.js b/test/acceptance/health-check.js similarity index 98% rename from test/acceptance/health_check.js rename to test/acceptance/health-check.js index 2c457a8a..9bd8e502 100644 --- a/test/acceptance/health_check.js +++ b/test/acceptance/health-check.js @@ -1,6 +1,6 @@ 'use strict'; -require(__dirname + '/../support/test_helper'); +require(__dirname + '/../support/test-helper'); var fs = require('fs'); diff --git a/test/acceptance/label-wrap.js b/test/acceptance/label-wrap.js index 914b2842..2a968e61 100644 --- a/test/acceptance/label-wrap.js +++ b/test/acceptance/label-wrap.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var TestClient = require('../support/test-client'); var assert = require('../support/assert'); diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata.js index 0a039fe4..831a5b8e 100644 --- a/test/acceptance/layergroup-metadata.js +++ b/test/acceptance/layergroup-metadata.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/layers-filters.js b/test/acceptance/layers-filters.js index 2767300f..29bfb5ff 100644 --- a/test/acceptance/layers-filters.js +++ b/test/acceptance/layers-filters.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var TestClient = require('../support/test-client'); describe('layers filters', function() { diff --git a/test/acceptance/max-waiting-workers.js b/test/acceptance/max-waiting-workers.js index adf259de..576bd07b 100644 --- a/test/acceptance/max-waiting-workers.js +++ b/test/acceptance/max-waiting-workers.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 24b2804a..18a30f55 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -10,7 +10,7 @@ var redis_stats_db = 5; var mapnik = require('windshaft').mapnik; var semver = require('semver'); -var helper = require(__dirname + '/../support/test_helper'); +var helper = require(__dirname + '/../support/test-helper'); var LayergroupToken = require('../../lib/models/layergroup-token'); var windshaft_fixtures = __dirname + '/../../node_modules/windshaft/test/fixtures'; diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 643e8d0d..7a7b7e72 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -1,6 +1,6 @@ 'use strict'; -var testHelper = require('../support/test_helper'); +var testHelper = require('../support/test-helper'); var assert = require('../support/assert'); diff --git a/test/acceptance/mvt-regressions.js b/test/acceptance/mvt-regressions.js index a7655e28..56c7ff0e 100644 --- a/test/acceptance/mvt-regressions.js +++ b/test/acceptance/mvt-regressions.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 9db7d7d1..15e28297 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); diff --git a/test/acceptance/named_layers_visibility.js b/test/acceptance/named-layers-visibility.js similarity index 99% rename from test/acceptance/named_layers_visibility.js rename to test/acceptance/named-layers-visibility.js index 588f079c..ceead7ba 100644 --- a/test/acceptance/named_layers_visibility.js +++ b/test/acceptance/named-layers-visibility.js @@ -1,7 +1,7 @@ 'use strict'; var step = require('step'); -var test_helper = require('../support/test_helper'); +var test_helper = require('../support/test-helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); diff --git a/test/acceptance/named_layers.js b/test/acceptance/named-layers.js similarity index 99% rename from test/acceptance/named_layers.js rename to test/acceptance/named-layers.js index 60a7dc48..747b9010 100644 --- a/test/acceptance/named_layers.js +++ b/test/acceptance/named-layers.js @@ -1,6 +1,6 @@ 'use strict'; -var test_helper = require('../support/test_helper'); +var test_helper = require('../support/test-helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); diff --git a/test/acceptance/named-map-cache-regressions.js b/test/acceptance/named-map-cache-regressions.js index 85594516..d8089cf5 100644 --- a/test/acceptance/named-map-cache-regressions.js +++ b/test/acceptance/named-map-cache-regressions.js @@ -1,13 +1,13 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const request = require('request'); const assert = require('assert'); const Server = require('../../lib/server'); const serverOptions = require('../../lib/server-options'); const { mapnik } = require('windshaft'); -const helper = require('../support/test_helper'); +const helper = require('../support/test-helper'); const namedTileUrlTemplate = (ctx) => { return `http://${ctx.address}/api/v1/map/static/named/${ctx.templateId}/256/256.png?api_key=${ctx.apiKey}`; diff --git a/test/acceptance/named_maps_authentication.js b/test/acceptance/named-maps-authentication.js similarity index 99% rename from test/acceptance/named_maps_authentication.js rename to test/acceptance/named-maps-authentication.js index dc2163bd..3a5c41bf 100644 --- a/test/acceptance/named_maps_authentication.js +++ b/test/acceptance/named-maps-authentication.js @@ -1,6 +1,6 @@ 'use strict'; -var test_helper = require('../support/test_helper'); +var test_helper = require('../support/test-helper'); var RedisPool = require('redis-mpool'); var querystring = require('querystring'); diff --git a/test/acceptance/named_maps_cache.js b/test/acceptance/named-maps-cache.js similarity index 98% rename from test/acceptance/named_maps_cache.js rename to test/acceptance/named-maps-cache.js index 90969992..c369dc0e 100644 --- a/test/acceptance/named_maps_cache.js +++ b/test/acceptance/named-maps-cache.js @@ -1,8 +1,8 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); -const helper = require('../support/test_helper'); +const helper = require('../support/test-helper'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require('../../lib/server'); diff --git a/test/acceptance/named_maps_static_view.js b/test/acceptance/named-maps-static-view.js similarity index 99% rename from test/acceptance/named_maps_static_view.js rename to test/acceptance/named-maps-static-view.js index 84175a38..7da7a606 100644 --- a/test/acceptance/named_maps_static_view.js +++ b/test/acceptance/named-maps-static-view.js @@ -1,7 +1,7 @@ 'use strict'; var qs = require('querystring'); -var testHelper = require('../support/test_helper'); +var testHelper = require('../support/test-helper'); var RedisPool = require('redis-mpool'); var assert = require('../support/assert'); diff --git a/test/acceptance/named_maps_stats.js b/test/acceptance/named-maps-stats.js similarity index 98% rename from test/acceptance/named_maps_stats.js rename to test/acceptance/named-maps-stats.js index 56df1169..04481700 100644 --- a/test/acceptance/named_maps_stats.js +++ b/test/acceptance/named-maps-stats.js @@ -1,6 +1,6 @@ 'use strict'; -var test_helper = require('../support/test_helper'); +var test_helper = require('../support/test-helper'); var RedisPool = require('redis-mpool'); var querystring = require('querystring'); diff --git a/test/acceptance/overviews_metadata_named_maps.js b/test/acceptance/overviews-metadata-named-maps.js similarity index 99% rename from test/acceptance/overviews_metadata_named_maps.js rename to test/acceptance/overviews-metadata-named-maps.js index 03afca5a..2ef51358 100644 --- a/test/acceptance/overviews_metadata_named_maps.js +++ b/test/acceptance/overviews-metadata-named-maps.js @@ -1,6 +1,6 @@ 'use strict'; -var test_helper = require('../support/test_helper'); +var test_helper = require('../support/test-helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); diff --git a/test/acceptance/overviews_metadata.js b/test/acceptance/overviews-metadata.js similarity index 99% rename from test/acceptance/overviews_metadata.js rename to test/acceptance/overviews-metadata.js index 74da08fa..2d6d828a 100644 --- a/test/acceptance/overviews_metadata.js +++ b/test/acceptance/overviews-metadata.js @@ -1,6 +1,6 @@ 'use strict'; -var test_helper = require('../support/test_helper'); +var test_helper = require('../support/test-helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); diff --git a/test/acceptance/overviews_queries.js b/test/acceptance/overviews-queries.js similarity index 92% rename from test/acceptance/overviews_queries.js rename to test/acceptance/overviews-queries.js index ade842c9..b89b3660 100644 --- a/test/acceptance/overviews_queries.js +++ b/test/acceptance/overviews-queries.js @@ -1,11 +1,11 @@ 'use strict'; -var testHelper = require('../support/test_helper'); +var testHelper = require('../support/test-helper'); var assert = require('../support/assert'); var cartodbServer = require('../../lib/server'); -var ServerOptions = require('./ported/support/ported_server_options'); -var testClient = require('./ported/support/test_client'); +var ServerOptions = require('./ported/support/ported-server-options'); +var testClient = require('./ported/support/test-client'); describe('overviews_queries', function() { var server; diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes.js index b77dfbbb..86527e2f 100644 --- a/test/acceptance/ported/attributes.js +++ b/test/acceptance/ported/attributes.js @@ -1,11 +1,11 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var step = require('step'); var cartodbServer = require('../../../lib/server'); -var PortedServerOptions = require('./support/ported_server_options'); +var PortedServerOptions = require('./support/ported-server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('attributes', function() { diff --git a/test/acceptance/ported/blend_filtering.js b/test/acceptance/ported/blend-filtering.js similarity index 98% rename from test/acceptance/ported/blend_filtering.js rename to test/acceptance/ported/blend-filtering.js index fcb0d41f..2bb5ca9e 100644 --- a/test/acceptance/ported/blend_filtering.js +++ b/test/acceptance/ported/blend-filtering.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); var fs = require('fs'); var http = require('http'); diff --git a/test/acceptance/ported/blend_http_fallback.js b/test/acceptance/ported/blend-http-fallback.js similarity index 98% rename from test/acceptance/ported/blend_http_fallback.js rename to test/acceptance/ported/blend-http-fallback.js index 13fac245..f2dc1d8b 100644 --- a/test/acceptance/ported/blend_http_fallback.js +++ b/test/acceptance/ported/blend-http-fallback.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); var fs = require('fs'); var http = require('http'); diff --git a/test/acceptance/ported/blend_http_timeout.js b/test/acceptance/ported/blend-http-timeout.js similarity index 94% rename from test/acceptance/ported/blend_http_timeout.js rename to test/acceptance/ported/blend-http-timeout.js index 7edd8996..d71c6868 100644 --- a/test/acceptance/ported/blend_http_timeout.js +++ b/test/acceptance/ported/blend-http-timeout.js @@ -1,10 +1,10 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); -var serverOptions = require('./support/ported_server_options'); +var testClient = require('./support/test-client'); +var serverOptions = require('./support/ported-server-options'); var fs = require('fs'); var http = require('http'); diff --git a/test/acceptance/ported/blend.js b/test/acceptance/ported/blend.js index 2f4a8714..269b35fd 100644 --- a/test/acceptance/ported/blend.js +++ b/test/acceptance/ported/blend.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); describe('blend png renderer', function() { var IMAGE_TOLERANCE_PER_MIL = 20; diff --git a/test/acceptance/ported/external_resources.js b/test/acceptance/ported/external-resources.js similarity index 96% rename from test/acceptance/ported/external_resources.js rename to test/acceptance/ported/external-resources.js index 6f4f13b3..6ac05df1 100644 --- a/test/acceptance/ported/external_resources.js +++ b/test/acceptance/ported/external-resources.js @@ -1,12 +1,12 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var fs = require('fs'); -var PortedServerOptions = require('./support/ported_server_options'); +var PortedServerOptions = require('./support/ported-server-options'); var http = require('http'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); var nock = require('nock'); describe('external resources', function() { diff --git a/test/acceptance/ported/limits.js b/test/acceptance/ported/limits.js index ea549fa3..1ee70123 100644 --- a/test/acceptance/ported/limits.js +++ b/test/acceptance/ported/limits.js @@ -1,12 +1,12 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var fs = require('fs'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); -var serverOptions = require('./support/ported_server_options'); +var testClient = require('./support/test-client'); +var serverOptions = require('./support/ported-server-options'); describe.skip('render limits', function() { diff --git a/test/acceptance/ported/multilayer_error_cases.js b/test/acceptance/ported/multilayer-error-cases.js similarity index 99% rename from test/acceptance/ported/multilayer_error_cases.js rename to test/acceptance/ported/multilayer-error-cases.js index a05976a6..b4f9a9be 100644 --- a/test/acceptance/ported/multilayer_error_cases.js +++ b/test/acceptance/ported/multilayer-error-cases.js @@ -1,12 +1,12 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var step = require('step'); var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); -var testClient = require('./support/test_client'); +var ServerOptions = require('./support/ported-server-options'); +var testClient = require('./support/test-client'); var TestClient = require('../../support/test-client'); describe('multilayer error cases', function() { diff --git a/test/acceptance/ported/multilayer_interactivity.js b/test/acceptance/ported/multilayer-interactivity.js similarity index 98% rename from test/acceptance/ported/multilayer_interactivity.js rename to test/acceptance/ported/multilayer-interactivity.js index 4dd3fa69..48e1d007 100644 --- a/test/acceptance/ported/multilayer_interactivity.js +++ b/test/acceptance/ported/multilayer-interactivity.js @@ -1,12 +1,12 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var _ = require('underscore'); var cartodbServer = require('../../../lib/server'); var getLayerTypeFn = require('windshaft').model.MapConfig.prototype.getType; -var PortedServerOptions = require('./support/ported_server_options'); +var PortedServerOptions = require('./support/ported-server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('multilayer interactivity and layers order', function() { diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer.js index 9ecbbf48..1ff22011 100644 --- a/test/acceptance/ported/multilayer.js +++ b/test/acceptance/ported/multilayer.js @@ -1,6 +1,6 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var _ = require('underscore'); @@ -8,7 +8,7 @@ var querystring = require('querystring'); var step = require('step'); var mapnik = require('windshaft').mapnik; var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); +var ServerOptions = require('./support/ported-server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('multilayer', function() { diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster.js index ec206e1b..313bca02 100644 --- a/test/acceptance/ported/raster.js +++ b/test/acceptance/ported/raster.js @@ -1,11 +1,11 @@ 'use strict'; -var testHelper =require('../../support/test_helper'); +var testHelper =require('../../support/test-helper'); var assert = require('../../support/assert'); var step = require('step'); var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); +var ServerOptions = require('./support/ported-server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('raster', function() { diff --git a/test/acceptance/ported/regressions.js b/test/acceptance/ported/regressions.js index 5e6a6293..1533d400 100644 --- a/test/acceptance/ported/regressions.js +++ b/test/acceptance/ported/regressions.js @@ -1,9 +1,9 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); describe('regressions', function() { after(function() { diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina.js index 8c29a9f5..ceca71a9 100644 --- a/test/acceptance/ported/retina.js +++ b/test/acceptance/ported/retina.js @@ -1,11 +1,11 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var mapnik = require('windshaft').mapnik; var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); +var ServerOptions = require('./support/ported-server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/ported/server_gettile.js b/test/acceptance/ported/server-gettile.js similarity index 98% rename from test/acceptance/ported/server_gettile.js rename to test/acceptance/ported/server-gettile.js index 98a19659..1d75a536 100644 --- a/test/acceptance/ported/server_gettile.js +++ b/test/acceptance/ported/server-gettile.js @@ -1,13 +1,13 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var mapnik = require('windshaft').mapnik; var semver = require('semver'); var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); -var testClient = require('./support/test_client'); +var ServerOptions = require('./support/ported-server-options'); +var testClient = require('./support/test-client'); describe('server_gettile', function() { var server; diff --git a/test/acceptance/ported/server_png8_format.js b/test/acceptance/ported/server-png8-format.js similarity index 98% rename from test/acceptance/ported/server_png8_format.js rename to test/acceptance/ported/server-png8-format.js index f9a0624a..66a4c820 100644 --- a/test/acceptance/ported/server_png8_format.js +++ b/test/acceptance/ported/server-png8-format.js @@ -1,12 +1,12 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var _ = require('underscore'); var fs = require('fs'); var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); +var ServerOptions = require('./support/ported-server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/ported/server.js b/test/acceptance/ported/server.js index 28eb9340..9bd0e7e5 100644 --- a/test/acceptance/ported/server.js +++ b/test/acceptance/ported/server.js @@ -1,11 +1,11 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); -var testClient = require('./support/test_client'); +var ServerOptions = require('./support/ported-server-options'); +var testClient = require('./support/test-client'); describe('server', function() { var server; diff --git a/test/acceptance/ported/static_maps.js b/test/acceptance/ported/static-maps.js similarity index 98% rename from test/acceptance/ported/static_maps.js rename to test/acceptance/ported/static-maps.js index ce3721f0..f5458a76 100644 --- a/test/acceptance/ported/static_maps.js +++ b/test/acceptance/ported/static-maps.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); var http = require('http'); var fs = require('fs'); diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported-server-options.js similarity index 100% rename from test/acceptance/ported/support/ported_server_options.js rename to test/acceptance/ported/support/ported-server-options.js diff --git a/test/acceptance/ported/support/test_client.js b/test/acceptance/ported/support/test-client.js similarity index 99% rename from test/acceptance/ported/support/test_client.js rename to test/acceptance/ported/support/test-client.js index 6b19d3c4..e6328527 100644 --- a/test/acceptance/ported/support/test_client.js +++ b/test/acceptance/ported/support/test-client.js @@ -1,6 +1,6 @@ 'use strict'; -var testHelper = require('../../../support/test_helper'); +var testHelper = require('../../../support/test-helper'); var LayergroupToken = require('../../../../lib/models/layergroup-token'); var step = require('step'); @@ -9,7 +9,7 @@ var _ = require('underscore'); var querystring = require('querystring'); var mapnik = require('windshaft').mapnik; var CartodbServer = require('../../../../lib/server'); -var PortedServerOptions = require('./ported_server_options'); +var PortedServerOptions = require('./ported-server-options'); var DEFAULT_POINT_STYLE = [ '#layer {', diff --git a/test/acceptance/ported/torque_boundaries.js b/test/acceptance/ported/torque-boundaries.js similarity index 99% rename from test/acceptance/ported/torque_boundaries.js rename to test/acceptance/ported/torque-boundaries.js index b3d09e91..e4854ac7 100644 --- a/test/acceptance/ported/torque_boundaries.js +++ b/test/acceptance/ported/torque-boundaries.js @@ -1,10 +1,10 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); +var ServerOptions = require('./support/ported-server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/ported/torque_png.js b/test/acceptance/ported/torque-png.js similarity index 98% rename from test/acceptance/ported/torque_png.js rename to test/acceptance/ported/torque-png.js index 9c8480bd..1b0fed8e 100644 --- a/test/acceptance/ported/torque_png.js +++ b/test/acceptance/ported/torque-png.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); describe('torque png renderer', function() { var IMAGE_TOLERANCE_PER_MIL = 20; diff --git a/test/acceptance/ported/torque_zero_zero.js b/test/acceptance/ported/torque-zero-zero.js similarity index 96% rename from test/acceptance/ported/torque_zero_zero.js rename to test/acceptance/ported/torque-zero-zero.js index 2d81f517..9b76183e 100644 --- a/test/acceptance/ported/torque_zero_zero.js +++ b/test/acceptance/ported/torque-zero-zero.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); describe('torque tiles at 0,0 point', function() { /* diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque.js index 528885d8..b40650cc 100644 --- a/test/acceptance/ported/torque.js +++ b/test/acceptance/ported/torque.js @@ -1,12 +1,12 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('../../support/assert'); var _ = require('underscore'); var step = require('step'); var cartodbServer = require('../../../lib/server'); -var ServerOptions = require('./support/ported_server_options'); +var ServerOptions = require('./support/ported-server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/ported/wrap.js b/test/acceptance/ported/wrap.js index 6434d6fa..cafa2ea3 100644 --- a/test/acceptance/ported/wrap.js +++ b/test/acceptance/ported/wrap.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); -var testClient = require('./support/test_client'); +var testClient = require('./support/test-client'); describe('wrap x coordinate', function() { describe('renders correct tile', function() { diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js index ed6c5c1c..4560fd57 100644 --- a/test/acceptance/rate-limit.test.js +++ b/test/acceptance/rate-limit.test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const redis = require('redis'); diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions.js index 7e6f2f63..35227e24 100644 --- a/test/acceptance/regressions.js +++ b/test/acceptance/regressions.js @@ -1,8 +1,8 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('../support/assert'); -const helper = require('../support/test_helper'); +const helper = require('../support/test-helper'); var TestClient = require('../support/test-client'); const LayergroupToken = require('../../lib/models/layergroup-token'); const CartodbWindshaft = require(__dirname + '/../../lib/server'); diff --git a/test/acceptance/server.js b/test/acceptance/server.js index 93584e04..976066a7 100644 --- a/test/acceptance/server.js +++ b/test/acceptance/server.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('../support/assert'); var querystring = require('querystring'); diff --git a/test/acceptance/special-numeric-values.js b/test/acceptance/special-numeric-values.js index 6b328286..0ac183fd 100644 --- a/test/acceptance/special-numeric-values.js +++ b/test/acceptance/special-numeric-values.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); diff --git a/test/acceptance/sql-wrap.js b/test/acceptance/sql-wrap.js index 7b2f9d57..87eb705f 100644 --- a/test/acceptance/sql-wrap.js +++ b/test/acceptance/sql-wrap.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); diff --git a/test/acceptance/stats/mapnik_stats_layergroup.js b/test/acceptance/stats/mapnik-stats-layergroup.js similarity index 99% rename from test/acceptance/stats/mapnik_stats_layergroup.js rename to test/acceptance/stats/mapnik-stats-layergroup.js index 79ba6522..0071a3ae 100644 --- a/test/acceptance/stats/mapnik_stats_layergroup.js +++ b/test/acceptance/stats/mapnik-stats-layergroup.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/stats/multilayer_stats.js b/test/acceptance/stats/multilayer-stats.js similarity index 99% rename from test/acceptance/stats/multilayer_stats.js rename to test/acceptance/stats/multilayer-stats.js index dcf9b402..17b3fe14 100644 --- a/test/acceptance/stats/multilayer_stats.js +++ b/test/acceptance/stats/multilayer-stats.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js index ceb5596b..da25c771 100644 --- a/test/acceptance/templates.js +++ b/test/acceptance/templates.js @@ -18,7 +18,7 @@ process.env.PGHOST = 'fake'; var fs = require('fs'); var http = require('http'); -var helper = require(__dirname + '/../support/test_helper'); +var helper = require(__dirname + '/../support/test-helper'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); var serverOptions = require(__dirname + '/../../lib/server-options'); diff --git a/test/acceptance/tilejson.js b/test/acceptance/tilejson.js index ee895031..1c0ea21b 100644 --- a/test/acceptance/tilejson.js +++ b/test/acceptance/tilejson.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/turbo-carto/error-cases.js b/test/acceptance/turbo-carto/error-cases.js index 94b07fe0..5b7df33c 100644 --- a/test/acceptance/turbo-carto/error-cases.js +++ b/test/acceptance/turbo-carto/error-cases.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/turbo-carto/named-maps.js b/test/acceptance/turbo-carto/named-maps.js index 987cc2d5..c8e389a8 100644 --- a/test/acceptance/turbo-carto/named-maps.js +++ b/test/acceptance/turbo-carto/named-maps.js @@ -3,7 +3,7 @@ var assert = require('../../support/assert'); var step = require('step'); var LayergroupToken = require('../../../lib/models/layergroup-token'); -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var CartodbWindshaft = require('../../../lib/server'); var serverOptions = require('../../../lib/server-options'); var mapnik = require('windshaft').mapnik; diff --git a/test/acceptance/turbo-carto/regressions.js b/test/acceptance/turbo-carto/regressions.js index 40dec6de..66769da1 100644 --- a/test/acceptance/turbo-carto/regressions.js +++ b/test/acceptance/turbo-carto/regressions.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit.js index 24752fb8..747ef2c2 100644 --- a/test/acceptance/user-database-timeout-limit.js +++ b/test/acceptance/user-database-timeout-limit.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit.js index d890c1f0..37083752 100644 --- a/test/acceptance/user-render-timeout-limit.js +++ b/test/acceptance/user-render-timeout-limit.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js index 6161b472..47fdf1be 100644 --- a/test/acceptance/vector-layergroup.js +++ b/test/acceptance/vector-layergroup.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); diff --git a/test/acceptance/widgets/aggregation.js b/test/acceptance/widgets/aggregation.js index 8977ef19..dbca2c82 100644 --- a/test/acceptance/widgets/aggregation.js +++ b/test/acceptance/widgets/aggregation.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/widgets/histogram.js b/test/acceptance/widgets/histogram.js index 503218e9..dafed514 100644 --- a/test/acceptance/widgets/histogram.js +++ b/test/acceptance/widgets/histogram.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps.js index fe507a7f..622b7bc0 100644 --- a/test/acceptance/widgets/named-maps.js +++ b/test/acceptance/widgets/named-maps.js @@ -6,7 +6,7 @@ var step = require('step'); var url = require('url'); var queue = require('queue-async'); -var helper = require('../../support/test_helper'); +var helper = require('../../support/test-helper'); var CartodbWindshaft = require('../../../lib/server'); var serverOptions = require('../../../lib/server-options'); diff --git a/test/acceptance/widgets/ported/aggregation.js b/test/acceptance/widgets/ported/aggregation.js index 2f36d3bb..d16faad2 100644 --- a/test/acceptance/widgets/ported/aggregation.js +++ b/test/acceptance/widgets/ported/aggregation.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../support/test_helper'); +require('../../../support/test-helper'); var assert = require('../../../support/assert'); var TestClient = require('../../../support/test-client'); diff --git a/test/acceptance/widgets/ported/formula.js b/test/acceptance/widgets/ported/formula.js index c3ca2bc6..546c86d3 100644 --- a/test/acceptance/widgets/ported/formula.js +++ b/test/acceptance/widgets/ported/formula.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../support/test_helper'); +require('../../../support/test-helper'); var assert = require('../../../support/assert'); var TestClient = require('../../../support/test-client'); diff --git a/test/acceptance/widgets/ported/histogram.js b/test/acceptance/widgets/ported/histogram.js index 510feb9e..587a7fef 100644 --- a/test/acceptance/widgets/ported/histogram.js +++ b/test/acceptance/widgets/ported/histogram.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../support/test_helper'); +require('../../../support/test-helper'); var assert = require('../../../support/assert'); var TestClient = require('../../../support/test-client'); diff --git a/test/acceptance/widgets/regressions.js b/test/acceptance/widgets/regressions.js index 755e2a96..6b67a138 100644 --- a/test/acceptance/widgets/regressions.js +++ b/test/acceptance/widgets/regressions.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/widgets/widgets.js b/test/acceptance/widgets/widgets.js index 94ecb0a2..a760a5c4 100644 --- a/test/acceptance/widgets/widgets.js +++ b/test/acceptance/widgets/widgets.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); diff --git a/test/integration/analysis-backend-limits.js b/test/integration/analysis-backend-limits.js index 2bc94f15..be16ef90 100644 --- a/test/integration/analysis-backend-limits.js +++ b/test/integration/analysis-backend-limits.js @@ -1,6 +1,6 @@ 'use strict'; -var testHelper = require('../support/test_helper'); +var testHelper = require('../support/test-helper'); var assert = require('assert'); var redis = require('redis'); diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig-named-layers-datasource.js similarity index 99% rename from test/integration/mapconfig_named_layers_datasource.js rename to test/integration/mapconfig-named-layers-datasource.js index ff208a3a..878f97f4 100644 --- a/test/integration/mapconfig_named_layers_datasource.js +++ b/test/integration/mapconfig-named-layers-datasource.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig-named-layers-expanded.js similarity index 99% rename from test/integration/mapconfig_named_layers_expanded.js rename to test/integration/mapconfig-named-layers-expanded.js index 558f8852..765c396a 100644 --- a/test/integration/mapconfig_named_layers_expanded.js +++ b/test/integration/mapconfig-named-layers-expanded.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig-overviews-adapter.js similarity index 99% rename from test/integration/mapconfig_overviews_adapter.js rename to test/integration/mapconfig-overviews-adapter.js index 1fe93b47..e1bb932a 100644 --- a/test/integration/mapconfig_overviews_adapter.js +++ b/test/integration/mapconfig-overviews-adapter.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api.js index f8eb34c2..237fb2f9 100644 --- a/test/integration/overviews-metadata-api.js +++ b/test/integration/overviews-metadata-api.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('assert'); diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner.js index ad6f4443..e7f403f4 100644 --- a/test/integration/pg-query-runner.js +++ b/test/integration/pg-query-runner.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('assert'); diff --git a/test/integration/profiler.js b/test/integration/profiler.js index d27c4827..2db98261 100644 --- a/test/integration/profiler.js +++ b/test/integration/profiler.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('assert'); var StatsClient = require('../../lib/stats/client'); diff --git a/test/integration/query-tables.js b/test/integration/query-tables.js index 341b722b..e44d66b9 100644 --- a/test/integration/query-tables.js +++ b/test/integration/query-tables.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('assert'); diff --git a/test/integration/template-maps-limits.js b/test/integration/template-maps-limits.js index d8b7d8e2..4ff8bcc8 100644 --- a/test/integration/template-maps-limits.js +++ b/test/integration/template-maps-limits.js @@ -1,6 +1,6 @@ 'use strict'; -require('../support/test_helper'); +require('../support/test-helper'); var assert = require('assert'); var redis = require('redis'); diff --git a/test/support/test-client.js b/test/support/test-client.js index 7b58f458..0483f0ce 100644 --- a/test/support/test-client.js +++ b/test/support/test-client.js @@ -10,7 +10,7 @@ var mapnik = require('windshaft').mapnik; var LayergroupToken = require('../../lib/models/layergroup-token'); var assert = require('./assert'); -var helper = require('./test_helper'); +var helper = require('./test-helper'); var CartodbWindshaft = require('../../lib/server'); var serverOptions = require('../../lib/server-options'); diff --git a/test/support/test_helper.js b/test/support/test-helper.js similarity index 100% rename from test/support/test_helper.js rename to test/support/test-helper.js diff --git a/test/unit/cartodb/cache/model/named_maps_entry.test.js b/test/unit/cartodb/cache/model/named-maps-entry-test.js similarity index 95% rename from test/unit/cartodb/cache/model/named_maps_entry.test.js rename to test/unit/cartodb/cache/model/named-maps-entry-test.js index fa6fd272..e8e7ccc0 100644 --- a/test/unit/cartodb/cache/model/named_maps_entry.test.js +++ b/test/unit/cartodb/cache/model/named-maps-entry-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../../support/test_helper'); +require('../../../../support/test-helper'); var assert = require('assert'); var _ = require('underscore'); diff --git a/test/unit/cartodb/cdb_request.test.js b/test/unit/cartodb/cdb-request-test.js similarity index 98% rename from test/unit/cartodb/cdb_request.test.js rename to test/unit/cartodb/cdb-request-test.js index 851e150e..8a9e8278 100644 --- a/test/unit/cartodb/cdb_request.test.js +++ b/test/unit/cartodb/cdb-request-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('assert'); var CdbRequest = require('../../../lib/models/cdb-request'); diff --git a/test/unit/cartodb/error_messages.test.js b/test/unit/cartodb/error-messages-test.js similarity index 95% rename from test/unit/cartodb/error_messages.test.js rename to test/unit/cartodb/error-messages-test.js index 981b0a21..f29422f1 100644 --- a/test/unit/cartodb/error_messages.test.js +++ b/test/unit/cartodb/error-messages-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('assert'); diff --git a/test/unit/cartodb/error-middleware.test.js b/test/unit/cartodb/error-middleware-test.js similarity index 99% rename from test/unit/cartodb/error-middleware.test.js rename to test/unit/cartodb/error-middleware-test.js index 1645d422..5333b6c3 100644 --- a/test/unit/cartodb/error-middleware.test.js +++ b/test/unit/cartodb/error-middleware-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper.js'); +require('../../support/test-helper'); var assert = require('assert'); var errorMiddleware = require('../../../lib/api/middlewares/error-middleware'); diff --git a/test/unit/cartodb/lzmaMiddleware.test.js b/test/unit/cartodb/lzma-middleware-test.js similarity index 95% rename from test/unit/cartodb/lzmaMiddleware.test.js rename to test/unit/cartodb/lzma-middleware-test.js index 6d9c214e..99229528 100644 --- a/test/unit/cartodb/lzmaMiddleware.test.js +++ b/test/unit/cartodb/lzma-middleware-test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var lzmaMiddleware = require('../../../lib/api/middlewares/lzma'); diff --git a/test/unit/cartodb/mapconfig/adapter.test.js b/test/unit/cartodb/mapconfig/adapter-test.js similarity index 98% rename from test/unit/cartodb/mapconfig/adapter.test.js rename to test/unit/cartodb/mapconfig/adapter-test.js index b82237f1..c748ee14 100644 --- a/test/unit/cartodb/mapconfig/adapter.test.js +++ b/test/unit/cartodb/mapconfig/adapter-test.js @@ -1,6 +1,6 @@ 'use strict'; -//require('../../../support/test_helper'); +//require('../../../support/test-helper'); var assert = require('assert'); var MapConfigAdapter = require('../../../../lib/models/mapconfig/adapter'); diff --git a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js b/test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js similarity index 99% rename from test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js rename to test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js index 5cf94175..87f4fabe 100644 --- a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js +++ b/test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js @@ -1,6 +1,6 @@ 'use strict'; -//require('../../../support/test_helper'); +//require('../../../support/test-helper'); var assert = require('assert'); var DataviewsMapConfigAdapter = require('../../../../lib/models/mapconfig/adapter/dataviews-widgets-adapter'); diff --git a/test/unit/cartodb/middlewares/coordinates.test.js b/test/unit/cartodb/middlewares/coordinates-test.js similarity index 100% rename from test/unit/cartodb/middlewares/coordinates.test.js rename to test/unit/cartodb/middlewares/coordinates-test.js diff --git a/test/unit/cartodb/model/filter/bbox-filters.test.js b/test/unit/cartodb/model/filter/bbox-filters-test.js similarity index 99% rename from test/unit/cartodb/model/filter/bbox-filters.test.js rename to test/unit/cartodb/model/filter/bbox-filters-test.js index 03b90b96..c281c384 100644 --- a/test/unit/cartodb/model/filter/bbox-filters.test.js +++ b/test/unit/cartodb/model/filter/bbox-filters-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../../support/test_helper'); +require('../../../../support/test-helper'); var util = require('util'); var assert = require('../../../../support/assert'); diff --git a/test/unit/cartodb/model/resource-locator.test.js b/test/unit/cartodb/model/resource-locator-test.js similarity index 99% rename from test/unit/cartodb/model/resource-locator.test.js rename to test/unit/cartodb/model/resource-locator-test.js index 332fa886..3ff4995c 100644 --- a/test/unit/cartodb/model/resource-locator.test.js +++ b/test/unit/cartodb/model/resource-locator-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../support/test_helper'); +require('../../../support/test-helper'); var assert = require('../../../support/assert'); var ResourceLocator = require('../../../../lib/models/resource-locator'); diff --git a/test/unit/cartodb/overviews_query_rewriter.js b/test/unit/cartodb/overviews-query-rewriter.js similarity index 99% rename from test/unit/cartodb/overviews_query_rewriter.js rename to test/unit/cartodb/overviews-query-rewriter.js index f77e4bb1..ff06297f 100644 --- a/test/unit/cartodb/overviews_query_rewriter.js +++ b/test/unit/cartodb/overviews-query-rewriter.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('assert'); var OverviewsQueryRewriter = require('../../../lib/utils/overviews-query-rewriter'); diff --git a/test/unit/cartodb/ported/profiler.test.js b/test/unit/cartodb/ported/profiler-test.js similarity index 93% rename from test/unit/cartodb/ported/profiler.test.js rename to test/unit/cartodb/ported/profiler-test.js index e33163d2..e7161cb7 100644 --- a/test/unit/cartodb/ported/profiler.test.js +++ b/test/unit/cartodb/ported/profiler-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../support/test_helper'); +require('../../../support/test-helper'); var assert = require('assert'); var ProfilerProxy = require('../../../../lib/stats/profiler-proxy'); diff --git a/test/unit/cartodb/ported/stats_client.test.js b/test/unit/cartodb/ported/stats-client-test.js similarity index 96% rename from test/unit/cartodb/ported/stats_client.test.js rename to test/unit/cartodb/ported/stats-client-test.js index 5e21da8e..2b0d48d9 100644 --- a/test/unit/cartodb/ported/stats_client.test.js +++ b/test/unit/cartodb/ported/stats-client-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../support/test_helper'); +require('../../../support/test-helper'); var assert = require('assert'); diff --git a/test/unit/cartodb/ported/windshaft_server.test.js b/test/unit/cartodb/ported/windshaft-server-test.js similarity index 96% rename from test/unit/cartodb/ported/windshaft_server.test.js rename to test/unit/cartodb/ported/windshaft-server-test.js index 8ec43400..7cebcdae 100644 --- a/test/unit/cartodb/ported/windshaft_server.test.js +++ b/test/unit/cartodb/ported/windshaft-server-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../../support/test_helper.js'); +require('../../../support/test-helper'); var assert = require('assert'); var cartodbServer = require('../../../../lib/server'); diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context-test.js similarity index 100% rename from test/unit/cartodb/prepare-context.test.js rename to test/unit/cartodb/prepare-context-test.js diff --git a/test/unit/cartodb/substitution-tokens.test.js b/test/unit/cartodb/substitution-tokens-test.js similarity index 100% rename from test/unit/cartodb/substitution-tokens.test.js rename to test/unit/cartodb/substitution-tokens-test.js diff --git a/test/unit/cartodb/table_name_parser.js b/test/unit/cartodb/table-name-parser.js similarity index 98% rename from test/unit/cartodb/table_name_parser.js rename to test/unit/cartodb/table-name-parser.js index 39602b4a..fb279bf8 100644 --- a/test/unit/cartodb/table_name_parser.js +++ b/test/unit/cartodb/table-name-parser.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('assert'); var TableNameParser = require('../../../lib/utils/table-name-parser'); diff --git a/test/unit/cartodb/template_maps_auth.test.js b/test/unit/cartodb/template-maps-auth-test.js similarity index 98% rename from test/unit/cartodb/template_maps_auth.test.js rename to test/unit/cartodb/template-maps-auth-test.js index 5b96b538..d31abca7 100644 --- a/test/unit/cartodb/template_maps_auth.test.js +++ b/test/unit/cartodb/template-maps-auth-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); diff --git a/test/unit/cartodb/template_maps_defaults.test.js b/test/unit/cartodb/template-maps-defaults-test.js similarity index 98% rename from test/unit/cartodb/template_maps_defaults.test.js rename to test/unit/cartodb/template-maps-defaults-test.js index 1a3e6e7b..188e1ca1 100644 --- a/test/unit/cartodb/template_maps_defaults.test.js +++ b/test/unit/cartodb/template-maps-defaults-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); diff --git a/test/unit/cartodb/template_maps.test.js b/test/unit/cartodb/template-maps-test.js similarity index 99% rename from test/unit/cartodb/template_maps.test.js rename to test/unit/cartodb/template-maps-test.js index 555a327d..b4cc0162 100644 --- a/test/unit/cartodb/template_maps.test.js +++ b/test/unit/cartodb/template-maps-test.js @@ -1,6 +1,6 @@ 'use strict'; -var testHelper = require('../../support/test_helper'); +var testHelper = require('../../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); diff --git a/test/unit/cartodb/utils/date-wrapper.test.js b/test/unit/cartodb/utils/date-wrapper-test.js similarity index 100% rename from test/unit/cartodb/utils/date-wrapper.test.js rename to test/unit/cartodb/utils/date-wrapper-test.js diff --git a/test/unit/cartodb/valid_template_maps.test.js b/test/unit/cartodb/valid-template-maps-test.js similarity index 98% rename from test/unit/cartodb/valid_template_maps.test.js rename to test/unit/cartodb/valid-template-maps-test.js index 1b07f161..d1171f14 100644 --- a/test/unit/cartodb/valid_template_maps.test.js +++ b/test/unit/cartodb/valid-template-maps-test.js @@ -1,6 +1,6 @@ 'use strict'; -require('../../support/test_helper'); +require('../../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); From e8cff194fc7f8269d1c8f42113de5a2df447f3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 10:50:14 +0200 Subject: [PATCH 33/37] Rename template_maps -> template-maps --- lib/api/api-router.js | 2 +- lib/api/template/admin-template-controller.js | 2 +- lib/backends/{template_maps.js => template-maps.js} | 0 lib/cache/named-map-provider-cache.js | 2 +- lib/models/mapconfig/provider/named-map-provider.js | 2 +- test/acceptance/named-layers-visibility.js | 2 +- test/acceptance/named-layers.js | 2 +- test/acceptance/named-maps-authentication.js | 2 +- test/acceptance/named-maps-static-view.js | 2 +- test/acceptance/named-maps-stats.js | 2 +- test/integration/mapconfig-named-layers-datasource.js | 2 +- test/integration/mapconfig-named-layers-expanded.js | 2 +- test/integration/template-maps-limits.js | 2 +- test/unit/cartodb/prepare-context-test.js | 2 +- test/unit/cartodb/template-maps-auth-test.js | 2 +- test/unit/cartodb/template-maps-defaults-test.js | 2 +- test/unit/cartodb/template-maps-test.js | 2 +- test/unit/cartodb/valid-template-maps-test.js | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename lib/backends/{template_maps.js => template-maps.js} (100%) diff --git a/lib/api/api-router.js b/lib/api/api-router.js index d8d11956..9349a515 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -11,7 +11,7 @@ const PgConnection = require('../backends/pg-connection'); const AnalysisBackend = require('../backends/analysis'); const AnalysisStatusBackend = require('../backends/analysis-status'); const DataviewBackend = require('../backends/dataview'); -const TemplateMaps = require('../backends/template_maps.js'); +const TemplateMaps = require('../backends/template-maps'); const PgQueryRunner = require('../backends/pg-query-runner'); const StatsBackend = require('../backends/stats'); const AuthBackend = require('../backends/auth'); diff --git a/lib/api/template/admin-template-controller.js b/lib/api/template/admin-template-controller.js index 2416afe2..082d4f34 100644 --- a/lib/api/template/admin-template-controller.js +++ b/lib/api/template/admin-template-controller.js @@ -1,6 +1,6 @@ 'use strict'; -const { templateName } = require('../../backends/template_maps'); +const { templateName } = require('../../backends/template-maps'); const credentials = require('../middlewares/credentials'); const rateLimit = require('../middlewares/rate-limit'); const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit; diff --git a/lib/backends/template_maps.js b/lib/backends/template-maps.js similarity index 100% rename from lib/backends/template_maps.js rename to lib/backends/template-maps.js diff --git a/lib/cache/named-map-provider-cache.js b/lib/cache/named-map-provider-cache.js index ea24f2f5..844a2038 100644 --- a/lib/cache/named-map-provider-cache.js +++ b/lib/cache/named-map-provider-cache.js @@ -3,7 +3,7 @@ const LruCache = require('lru-cache'); const NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider'); -const { templateName } = require('../backends/template_maps'); +const { templateName } = require('../backends/template-maps'); const TEN_MINUTES_IN_MILLISECONDS = 1000 * 60 * 10; const ACTIONS = ['update', 'delete']; diff --git a/lib/models/mapconfig/provider/named-map-provider.js b/lib/models/mapconfig/provider/named-map-provider.js index 292e5dcb..4b235986 100644 --- a/lib/models/mapconfig/provider/named-map-provider.js +++ b/lib/models/mapconfig/provider/named-map-provider.js @@ -4,7 +4,7 @@ const BaseMapConfigProvider = require('./base-mapconfig-adapter'); const crypto = require('crypto'); const dot = require('dot'); const MapConfig = require('windshaft').model.MapConfig; -const templateName = require('../../../backends/template_maps').templateName; +const templateName = require('../../../backends/template-maps').templateName; // Configure bases for cache keys suitable for string interpolation const baseKey = '{{=it.dbname}}:{{=it.user}}:{{=it.templateName}}'; diff --git a/test/acceptance/named-layers-visibility.js b/test/acceptance/named-layers-visibility.js index ceead7ba..cdf08aaf 100644 --- a/test/acceptance/named-layers-visibility.js +++ b/test/acceptance/named-layers-visibility.js @@ -8,7 +8,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/server'); var serverOptions = require(__dirname + '/../../lib/server-options'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template-maps'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE = 20; diff --git a/test/acceptance/named-layers.js b/test/acceptance/named-layers.js index 747b9010..79c33f83 100644 --- a/test/acceptance/named-layers.js +++ b/test/acceptance/named-layers.js @@ -9,7 +9,7 @@ var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template-maps'); var step = require('step'); diff --git a/test/acceptance/named-maps-authentication.js b/test/acceptance/named-maps-authentication.js index 3a5c41bf..4648458b 100644 --- a/test/acceptance/named-maps-authentication.js +++ b/test/acceptance/named-maps-authentication.js @@ -8,7 +8,7 @@ var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require(__dirname + '/../../lib/server'); var serverOptions = require(__dirname + '/../../lib/server-options'); -var TemplateMaps = require('../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template-maps'); var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); describe('named maps authentication', function() { diff --git a/test/acceptance/named-maps-static-view.js b/test/acceptance/named-maps-static-view.js index 7da7a606..e6e54195 100644 --- a/test/acceptance/named-maps-static-view.js +++ b/test/acceptance/named-maps-static-view.js @@ -8,7 +8,7 @@ var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require('../../lib/server'); var serverOptions = require('../../lib/server-options'); -var TemplateMaps = require('../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template-maps'); describe('named maps static view', function() { // configure redis pool instance to use in tests diff --git a/test/acceptance/named-maps-stats.js b/test/acceptance/named-maps-stats.js index 04481700..fc596bcb 100644 --- a/test/acceptance/named-maps-stats.js +++ b/test/acceptance/named-maps-stats.js @@ -8,7 +8,7 @@ var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require(__dirname + '/../../lib/server'); var serverOptions = require(__dirname + '/../../lib/server-options'); -var TemplateMaps = require('../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template-maps'); var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); describe('named maps preview stats', function() { diff --git a/test/integration/mapconfig-named-layers-datasource.js b/test/integration/mapconfig-named-layers-datasource.js index 878f97f4..261069cb 100644 --- a/test/integration/mapconfig-named-layers-datasource.js +++ b/test/integration/mapconfig-named-layers-datasource.js @@ -4,7 +4,7 @@ require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template-maps'); var PgConnection = require('../../lib/backends/pg-connection'); var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter'); diff --git a/test/integration/mapconfig-named-layers-expanded.js b/test/integration/mapconfig-named-layers-expanded.js index 765c396a..b0d2ea22 100644 --- a/test/integration/mapconfig-named-layers-expanded.js +++ b/test/integration/mapconfig-named-layers-expanded.js @@ -4,7 +4,7 @@ require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template-maps'); var PgConnection = require('../../lib/backends/pg-connection'); var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter'); diff --git a/test/integration/template-maps-limits.js b/test/integration/template-maps-limits.js index 4ff8bcc8..95bcc410 100644 --- a/test/integration/template-maps-limits.js +++ b/test/integration/template-maps-limits.js @@ -5,7 +5,7 @@ require('../support/test-helper'); var assert = require('assert'); var redis = require('redis'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/backends/template_maps'); +var TemplateMaps = require('../../lib/backends/template-maps'); describe('TemplateMaps limits', function() { diff --git a/test/unit/cartodb/prepare-context-test.js b/test/unit/cartodb/prepare-context-test.js index aaa0f2ee..7c91332e 100644 --- a/test/unit/cartodb/prepare-context-test.js +++ b/test/unit/cartodb/prepare-context-test.js @@ -7,7 +7,7 @@ var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); var PgConnection = require('../../../lib/backends/pg-connection'); var AuthBackend = require('../../../lib/backends/auth'); -var TemplateMaps = require('../../../lib/backends/template_maps'); +var TemplateMaps = require('../../../lib/backends/template-maps'); const cleanUpQueryParamsMiddleware = require('../../../lib/api/middlewares/clean-up-query-params'); const authorizeMiddleware = require('../../../lib/api/middlewares/authorize'); diff --git a/test/unit/cartodb/template-maps-auth-test.js b/test/unit/cartodb/template-maps-auth-test.js index d31abca7..df073324 100644 --- a/test/unit/cartodb/template-maps-auth-test.js +++ b/test/unit/cartodb/template-maps-auth-test.js @@ -5,7 +5,7 @@ require('../../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/backends/template_maps'); +var TemplateMaps = require('../../../lib/backends/template-maps'); describe('template_maps_auth', function() { diff --git a/test/unit/cartodb/template-maps-defaults-test.js b/test/unit/cartodb/template-maps-defaults-test.js index 188e1ca1..fe0d35c0 100644 --- a/test/unit/cartodb/template-maps-defaults-test.js +++ b/test/unit/cartodb/template-maps-defaults-test.js @@ -4,7 +4,7 @@ require('../../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template-maps'); var _ = require('underscore'); describe('template_maps', function() { diff --git a/test/unit/cartodb/template-maps-test.js b/test/unit/cartodb/template-maps-test.js index b4cc0162..e8124be9 100644 --- a/test/unit/cartodb/template-maps-test.js +++ b/test/unit/cartodb/template-maps-test.js @@ -4,7 +4,7 @@ var testHelper = require('../../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template-maps'); var step = require('step'); var _ = require('underscore'); diff --git a/test/unit/cartodb/valid-template-maps-test.js b/test/unit/cartodb/valid-template-maps-test.js index d1171f14..8b84291e 100644 --- a/test/unit/cartodb/valid-template-maps-test.js +++ b/test/unit/cartodb/valid-template-maps-test.js @@ -4,7 +4,7 @@ require('../../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template-maps'); var _ = require('underscore'); describe('template_maps', function() { From 98f3e8159e918bd066f7e4d6e92b3c47ac767f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 10:55:26 +0200 Subject: [PATCH 34/37] Stop using __dirname in requires --- test/acceptance/cache/surrogate-keys-invalidation.js | 2 +- test/acceptance/dynamic-styling-named-maps.js | 6 +++--- test/acceptance/errors-with-context.js | 4 ++-- test/acceptance/health-check.js | 2 +- test/acceptance/multilayer.js | 2 +- test/acceptance/named-layers-visibility.js | 4 ++-- test/acceptance/named-layers.js | 4 ++-- test/acceptance/named-maps-authentication.js | 4 ++-- test/acceptance/named-maps-stats.js | 4 ++-- test/acceptance/overviews-metadata-named-maps.js | 4 ++-- test/acceptance/overviews-metadata.js | 4 ++-- test/acceptance/regressions.js | 4 ++-- test/acceptance/templates.js | 6 +++--- test/support/test-helper.js | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/acceptance/cache/surrogate-keys-invalidation.js b/test/acceptance/cache/surrogate-keys-invalidation.js index 58336275..f884b07c 100644 --- a/test/acceptance/cache/surrogate-keys-invalidation.js +++ b/test/acceptance/cache/surrogate-keys-invalidation.js @@ -7,7 +7,7 @@ var step = require('step'); var FastlyPurge = require('fastly-purge'); var _ = require('underscore'); var NamedMapsCacheEntry = require('../../../lib/cache/model/named-maps-entry'); -var CartodbWindshaft = require(__dirname + '/../../../lib/server'); +var CartodbWindshaft = require('../../../lib/server'); var nock = require('nock'); describe('templates surrogate keys', function() { diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js index a00c4106..988b2a0e 100644 --- a/test/acceptance/dynamic-styling-named-maps.js +++ b/test/acceptance/dynamic-styling-named-maps.js @@ -3,9 +3,9 @@ var assert = require('../support/assert'); var step = require('step'); var LayergroupToken = require('../../lib/models/layergroup-token'); -var testHelper = require(__dirname + '/../support/test-helper'); -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var testHelper = require('../support/test-helper'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); describe('dynamic styling for named maps', function() { var server; diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context.js index 25c83101..4d58b57a 100644 --- a/test/acceptance/errors-with-context.js +++ b/test/acceptance/errors-with-context.js @@ -1,8 +1,8 @@ 'use strict'; var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); describe('error with context', function () { var server; diff --git a/test/acceptance/health-check.js b/test/acceptance/health-check.js index 9bd8e502..cff4b41e 100644 --- a/test/acceptance/health-check.js +++ b/test/acceptance/health-check.js @@ -1,6 +1,6 @@ 'use strict'; -require(__dirname + '/../support/test-helper'); +require('../support/test-helper'); var fs = require('fs'); diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 18a30f55..10fb4451 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -10,7 +10,7 @@ var redis_stats_db = 5; var mapnik = require('windshaft').mapnik; var semver = require('semver'); -var helper = require(__dirname + '/../support/test-helper'); +var helper = require('../support/test-helper'); var LayergroupToken = require('../../lib/models/layergroup-token'); var windshaft_fixtures = __dirname + '/../../node_modules/windshaft/test/fixtures'; diff --git a/test/acceptance/named-layers-visibility.js b/test/acceptance/named-layers-visibility.js index cdf08aaf..a68314fe 100644 --- a/test/acceptance/named-layers-visibility.js +++ b/test/acceptance/named-layers-visibility.js @@ -4,8 +4,8 @@ var step = require('step'); var test_helper = require('../support/test-helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); var RedisPool = require('redis-mpool'); var TemplateMaps = require('../../lib/backends/template-maps'); diff --git a/test/acceptance/named-layers.js b/test/acceptance/named-layers.js index 79c33f83..a7da4e86 100644 --- a/test/acceptance/named-layers.js +++ b/test/acceptance/named-layers.js @@ -3,8 +3,8 @@ var test_helper = require('../support/test-helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/named-maps-authentication.js b/test/acceptance/named-maps-authentication.js index 4648458b..ac898c5e 100644 --- a/test/acceptance/named-maps-authentication.js +++ b/test/acceptance/named-maps-authentication.js @@ -6,8 +6,8 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); var TemplateMaps = require('../../lib/backends/template-maps'); var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); diff --git a/test/acceptance/named-maps-stats.js b/test/acceptance/named-maps-stats.js index fc596bcb..a41644ba 100644 --- a/test/acceptance/named-maps-stats.js +++ b/test/acceptance/named-maps-stats.js @@ -6,8 +6,8 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); var TemplateMaps = require('../../lib/backends/template-maps'); var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); diff --git a/test/acceptance/overviews-metadata-named-maps.js b/test/acceptance/overviews-metadata-named-maps.js index 2ef51358..5dc11240 100644 --- a/test/acceptance/overviews-metadata-named-maps.js +++ b/test/acceptance/overviews-metadata-named-maps.js @@ -3,8 +3,8 @@ var test_helper = require('../support/test-helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/overviews-metadata.js b/test/acceptance/overviews-metadata.js index 2d6d828a..92ab562a 100644 --- a/test/acceptance/overviews-metadata.js +++ b/test/acceptance/overviews-metadata.js @@ -3,8 +3,8 @@ var test_helper = require('../support/test-helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions.js index 35227e24..8ac63a83 100644 --- a/test/acceptance/regressions.js +++ b/test/acceptance/regressions.js @@ -5,8 +5,8 @@ var assert = require('../support/assert'); const helper = require('../support/test-helper'); var TestClient = require('../support/test-client'); const LayergroupToken = require('../../lib/models/layergroup-token'); -const CartodbWindshaft = require(__dirname + '/../../lib/server'); -const serverOptions = require(__dirname + '/../../lib/server-options'); +const CartodbWindshaft = require('../../lib/server'); +const serverOptions = require('../../lib/server-options'); describe('regressions', function() { diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js index da25c771..b9c36b63 100644 --- a/test/acceptance/templates.js +++ b/test/acceptance/templates.js @@ -18,10 +18,10 @@ process.env.PGHOST = 'fake'; var fs = require('fs'); var http = require('http'); -var helper = require(__dirname + '/../support/test-helper'); +var helper = require('../support/test-helper'); -var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server-options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/support/test-helper.js b/test/support/test-helper.js index 6890a79d..1ae8d77d 100644 --- a/test/support/test-helper.js +++ b/test/support/test-helper.js @@ -18,7 +18,7 @@ var log4js = require('log4js'); const setICUEnvVariable = require('../../lib/utils/icu-data-env-setter'); // set environment specific variables -global.environment = require(__dirname + '/../../config/environments/test'); +global.environment = require('../../config/environments/test'); global.environment.name = 'test'; process.env.NODE_ENV = 'test'; From 73e1659378155fb803c9c0c597aa392276dd3991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 11:16:48 +0200 Subject: [PATCH 35/37] Add suffix '-test' to every test-suite file --- test/acceptance/{aggregation.js => aggregation-test.js} | 0 .../{analyses-controller.js => analyses-controller-test.js} | 0 ...analyses-filters-params.js => analyses-filters-params-test.js} | 0 .../analysis/{analyses-filters.js => analyses-filters-test.js} | 0 ...ysis-layers-dataviews.js => analysis-layers-dataviews-test.js} | 0 .../analysis/{analysis-layers.js => analysis-layers-test.js} | 0 ...ysis-layers-use-cases.js => analysis-layers-use-cases-test.js} | 0 test/acceptance/analysis/{error-cases.js => error-cases-test.js} | 0 test/acceptance/analysis/{named-maps.js => named-maps-test.js} | 0 test/acceptance/analysis/{regressions.js => regressions-test.js} | 0 ...n-basic-use-cases.js => authorization-basic-use-cases-test.js} | 0 test/acceptance/auth/{authorization.js => authorization-test.js} | 0 .../{buffer-size-format.js => buffer-size-format-test.js} | 0 .../{cache-control-header.js => cache-control-header-test.js} | 0 test/acceptance/cache/{cache-headers.js => cache-headers-test.js} | 0 ...e-keys-invalidation.js => surrogate-keys-invalidation-test.js} | 0 test/acceptance/{cluster.js => cluster-test.js} | 0 .../{custom-middlewares.js => custom-middlewares-test.js} | 0 test/acceptance/dataviews/{aggregation.js => aggregation-test.js} | 0 test/acceptance/dataviews/{error-cases.js => error-cases-test.js} | 0 test/acceptance/dataviews/{formula.js => formula-test.js} | 0 test/acceptance/dataviews/{histogram.js => histogram-test.js} | 0 test/acceptance/dataviews/{overviews.js => overviews-test.js} | 0 test/acceptance/{date-wrapping.spec.js => date-wrapping-test.js} | 0 ...c-styling-named-maps.js => dynamic-styling-named-maps-test.js} | 0 test/acceptance/{error-middleware.js => error-middleware-test.js} | 0 .../{errors-with-context.js => errors-with-context-test.js} | 0 test/acceptance/{health-check.js => health-check-test.js} | 0 test/acceptance/{label-wrap.js => label-wrap-test.js} | 0 .../{layergroup-metadata.js => layergroup-metadata-test.js} | 0 test/acceptance/{layers-filters.js => layers-filters-test.js} | 0 .../{max-waiting-workers.js => max-waiting-workers-test.js} | 0 .../{multilayer_server.js => multilayer-server-test.js} | 0 test/acceptance/{multilayer.js => multilayer-test.js} | 0 test/acceptance/{mvt-regressions.js => mvt-regressions-test.js} | 0 test/acceptance/{mvt.js => mvt-test.js} | 0 test/acceptance/{named-layers.js => named-layers-test.js} | 0 ...named-layers-visibility.js => named-layers-visibility-test.js} | 0 ...p-cache-regressions.js => named-map-cache-regressions-test.js} | 0 ...d-maps-authentication.js => named-maps-authentication-test.js} | 0 test/acceptance/{named-maps-cache.js => named-maps-cache-test.js} | 0 .../{named-maps-static-view.js => named-maps-static-view-test.js} | 0 test/acceptance/{named-maps-stats.js => named-maps-stats-test.js} | 0 ...tadata-named-maps.js => overviews-metadata-named-maps-test.js} | 0 .../{overviews-metadata.js => overviews-metadata-test.js} | 0 .../{overviews-queries.js => overviews-queries-test.js} | 0 test/acceptance/ported/{attributes.js => attributes-test.js} | 0 .../ported/{blend-filtering.js => blend-filtering-test.js} | 0 .../{blend-http-fallback.js => blend-http-fallback-test.js} | 0 .../ported/{blend-http-timeout.js => blend-http-timeout-test.js} | 0 test/acceptance/ported/{blend.js => blend-test.js} | 0 .../ported/{external-resources.js => external-resources-test.js} | 0 test/acceptance/ported/{limits.js => limits-test.js} | 0 .../{multilayer-error-cases.js => multilayer-error-cases-test.js} | 0 ...ltilayer-interactivity.js => multilayer-interactivity-test.js} | 0 test/acceptance/ported/{multilayer.js => multilayer-test.js} | 0 test/acceptance/ported/{raster.js => raster-test.js} | 0 test/acceptance/ported/{regressions.js => regressions-test.js} | 0 test/acceptance/ported/{retina.js => retina-test.js} | 0 .../ported/{server-gettile.js => server-gettile-test.js} | 0 .../ported/{server-png8-format.js => server-png8-format-test.js} | 0 test/acceptance/ported/{server.js => server-test.js} | 0 test/acceptance/ported/{static-maps.js => static-maps-test.js} | 0 .../ported/{torque-boundaries.js => torque-boundaries-test.js} | 0 test/acceptance/ported/{torque-png.js => torque-png-test.js} | 0 test/acceptance/ported/{torque.js => torque-test.js} | 0 .../ported/{torque-zero-zero.js => torque-zero-zero-test.js} | 0 test/acceptance/ported/{wrap.js => wrap-test.js} | 0 test/acceptance/{rate-limit.test.js => rate-limit-test.js} | 0 test/acceptance/{regressions.js => regressions-test.js} | 0 test/acceptance/{server.js => server-test.js} | 0 .../{special-numeric-values.js => special-numeric-values-test.js} | 0 test/acceptance/{sql-wrap.js => sql-wrap-test.js} | 0 ...mapnik-stats-layergroup.js => mapnik-stats-layergroup-test.js} | 0 .../stats/{multilayer-stats.js => multilayer-stats-test.js} | 0 test/acceptance/{templates.js => templates-test.js} | 0 test/acceptance/{tilejson.js => tilejson-test.js} | 0 .../turbo-carto/{anonymous-maps.js => anonymous-maps-test.js} | 0 .../turbo-carto/{error-cases.js => error-cases-test.js} | 0 test/acceptance/turbo-carto/{named-maps.js => named-maps-test.js} | 0 .../turbo-carto/{regressions.js => regressions-test.js} | 0 ...abase-timeout-limit.js => user-database-timeout-limit-test.js} | 0 ...-render-timeout-limit.js => user-render-timeout-limit-test.js} | 0 .../{vector-layergroup.js => vector-layergroup-test.js} | 0 test/acceptance/widgets/{aggregation.js => aggregation-test.js} | 0 test/acceptance/widgets/{histogram.js => histogram-test.js} | 0 test/acceptance/widgets/{named-maps.js => named-maps-test.js} | 0 .../widgets/ported/{aggregation.js => aggregation-test.js} | 0 test/acceptance/widgets/ported/{formula.js => formula-test.js} | 0 .../acceptance/widgets/ported/{histogram.js => histogram-test.js} | 0 test/acceptance/widgets/{regressions.js => regressions-test.js} | 0 test/acceptance/widgets/{widgets.js => widgets-test.js} | 0 ...analysis-backend-limits.js => analysis-backend-limits-test.js} | 0 ...rs-datasource.js => mapconfig-named-layers-datasource-test.js} | 0 ...layers-expanded.js => mapconfig-named-layers-expanded-test.js} | 0 ...g-overviews-adapter.js => mapconfig-overviews-adapter-test.js} | 0 .../{overviews-metadata-api.js => overviews-metadata-api-test.js} | 0 test/integration/{pg-query-runner.js => pg-query-runner-test.js} | 0 test/integration/{profiler.js => profiler-test.js} | 0 test/integration/{query-tables.js => query-tables-test.js} | 0 .../{template-maps-limits.js => template-maps-limits-test.js} | 0 .../{mapnik-layer-stats.js => mapnik-layer-stats-test.js} | 0 .../{torque-layer-stats.js => torque-layer-stats-test.js} | 0 ...gres-datasource.js => turbo-carto-postgres-datasource-test.js} | 0 ...erviews-query-rewriter.js => overviews-query-rewriter-test.js} | 0 .../{named-map-provider.js => named-map-provider-test.js} | 0 .../cartodb/{table-name-parser.js => table-name-parser-test.js} | 0 107 files changed, 0 insertions(+), 0 deletions(-) rename test/acceptance/{aggregation.js => aggregation-test.js} (100%) rename test/acceptance/analysis/{analyses-controller.js => analyses-controller-test.js} (100%) rename test/acceptance/analysis/{analyses-filters-params.js => analyses-filters-params-test.js} (100%) rename test/acceptance/analysis/{analyses-filters.js => analyses-filters-test.js} (100%) rename test/acceptance/analysis/{analysis-layers-dataviews.js => analysis-layers-dataviews-test.js} (100%) rename test/acceptance/analysis/{analysis-layers.js => analysis-layers-test.js} (100%) rename test/acceptance/analysis/{analysis-layers-use-cases.js => analysis-layers-use-cases-test.js} (100%) rename test/acceptance/analysis/{error-cases.js => error-cases-test.js} (100%) rename test/acceptance/analysis/{named-maps.js => named-maps-test.js} (100%) rename test/acceptance/analysis/{regressions.js => regressions-test.js} (100%) rename test/acceptance/auth/{authorization-basic-use-cases.js => authorization-basic-use-cases-test.js} (100%) rename test/acceptance/auth/{authorization.js => authorization-test.js} (100%) rename test/acceptance/{buffer-size-format.js => buffer-size-format-test.js} (100%) rename test/acceptance/cache/{cache-control-header.js => cache-control-header-test.js} (100%) rename test/acceptance/cache/{cache-headers.js => cache-headers-test.js} (100%) rename test/acceptance/cache/{surrogate-keys-invalidation.js => surrogate-keys-invalidation-test.js} (100%) rename test/acceptance/{cluster.js => cluster-test.js} (100%) rename test/acceptance/{custom-middlewares.js => custom-middlewares-test.js} (100%) rename test/acceptance/dataviews/{aggregation.js => aggregation-test.js} (100%) rename test/acceptance/dataviews/{error-cases.js => error-cases-test.js} (100%) rename test/acceptance/dataviews/{formula.js => formula-test.js} (100%) rename test/acceptance/dataviews/{histogram.js => histogram-test.js} (100%) rename test/acceptance/dataviews/{overviews.js => overviews-test.js} (100%) rename test/acceptance/{date-wrapping.spec.js => date-wrapping-test.js} (100%) rename test/acceptance/{dynamic-styling-named-maps.js => dynamic-styling-named-maps-test.js} (100%) rename test/acceptance/{error-middleware.js => error-middleware-test.js} (100%) rename test/acceptance/{errors-with-context.js => errors-with-context-test.js} (100%) rename test/acceptance/{health-check.js => health-check-test.js} (100%) rename test/acceptance/{label-wrap.js => label-wrap-test.js} (100%) rename test/acceptance/{layergroup-metadata.js => layergroup-metadata-test.js} (100%) rename test/acceptance/{layers-filters.js => layers-filters-test.js} (100%) rename test/acceptance/{max-waiting-workers.js => max-waiting-workers-test.js} (100%) rename test/acceptance/{multilayer_server.js => multilayer-server-test.js} (100%) rename test/acceptance/{multilayer.js => multilayer-test.js} (100%) rename test/acceptance/{mvt-regressions.js => mvt-regressions-test.js} (100%) rename test/acceptance/{mvt.js => mvt-test.js} (100%) rename test/acceptance/{named-layers.js => named-layers-test.js} (100%) rename test/acceptance/{named-layers-visibility.js => named-layers-visibility-test.js} (100%) rename test/acceptance/{named-map-cache-regressions.js => named-map-cache-regressions-test.js} (100%) rename test/acceptance/{named-maps-authentication.js => named-maps-authentication-test.js} (100%) rename test/acceptance/{named-maps-cache.js => named-maps-cache-test.js} (100%) rename test/acceptance/{named-maps-static-view.js => named-maps-static-view-test.js} (100%) rename test/acceptance/{named-maps-stats.js => named-maps-stats-test.js} (100%) rename test/acceptance/{overviews-metadata-named-maps.js => overviews-metadata-named-maps-test.js} (100%) rename test/acceptance/{overviews-metadata.js => overviews-metadata-test.js} (100%) rename test/acceptance/{overviews-queries.js => overviews-queries-test.js} (100%) rename test/acceptance/ported/{attributes.js => attributes-test.js} (100%) rename test/acceptance/ported/{blend-filtering.js => blend-filtering-test.js} (100%) rename test/acceptance/ported/{blend-http-fallback.js => blend-http-fallback-test.js} (100%) rename test/acceptance/ported/{blend-http-timeout.js => blend-http-timeout-test.js} (100%) rename test/acceptance/ported/{blend.js => blend-test.js} (100%) rename test/acceptance/ported/{external-resources.js => external-resources-test.js} (100%) rename test/acceptance/ported/{limits.js => limits-test.js} (100%) rename test/acceptance/ported/{multilayer-error-cases.js => multilayer-error-cases-test.js} (100%) rename test/acceptance/ported/{multilayer-interactivity.js => multilayer-interactivity-test.js} (100%) rename test/acceptance/ported/{multilayer.js => multilayer-test.js} (100%) rename test/acceptance/ported/{raster.js => raster-test.js} (100%) rename test/acceptance/ported/{regressions.js => regressions-test.js} (100%) rename test/acceptance/ported/{retina.js => retina-test.js} (100%) rename test/acceptance/ported/{server-gettile.js => server-gettile-test.js} (100%) rename test/acceptance/ported/{server-png8-format.js => server-png8-format-test.js} (100%) rename test/acceptance/ported/{server.js => server-test.js} (100%) rename test/acceptance/ported/{static-maps.js => static-maps-test.js} (100%) rename test/acceptance/ported/{torque-boundaries.js => torque-boundaries-test.js} (100%) rename test/acceptance/ported/{torque-png.js => torque-png-test.js} (100%) rename test/acceptance/ported/{torque.js => torque-test.js} (100%) rename test/acceptance/ported/{torque-zero-zero.js => torque-zero-zero-test.js} (100%) rename test/acceptance/ported/{wrap.js => wrap-test.js} (100%) rename test/acceptance/{rate-limit.test.js => rate-limit-test.js} (100%) rename test/acceptance/{regressions.js => regressions-test.js} (100%) rename test/acceptance/{server.js => server-test.js} (100%) rename test/acceptance/{special-numeric-values.js => special-numeric-values-test.js} (100%) rename test/acceptance/{sql-wrap.js => sql-wrap-test.js} (100%) rename test/acceptance/stats/{mapnik-stats-layergroup.js => mapnik-stats-layergroup-test.js} (100%) rename test/acceptance/stats/{multilayer-stats.js => multilayer-stats-test.js} (100%) rename test/acceptance/{templates.js => templates-test.js} (100%) rename test/acceptance/{tilejson.js => tilejson-test.js} (100%) rename test/acceptance/turbo-carto/{anonymous-maps.js => anonymous-maps-test.js} (100%) rename test/acceptance/turbo-carto/{error-cases.js => error-cases-test.js} (100%) rename test/acceptance/turbo-carto/{named-maps.js => named-maps-test.js} (100%) rename test/acceptance/turbo-carto/{regressions.js => regressions-test.js} (100%) rename test/acceptance/{user-database-timeout-limit.js => user-database-timeout-limit-test.js} (100%) rename test/acceptance/{user-render-timeout-limit.js => user-render-timeout-limit-test.js} (100%) rename test/acceptance/{vector-layergroup.js => vector-layergroup-test.js} (100%) rename test/acceptance/widgets/{aggregation.js => aggregation-test.js} (100%) rename test/acceptance/widgets/{histogram.js => histogram-test.js} (100%) rename test/acceptance/widgets/{named-maps.js => named-maps-test.js} (100%) rename test/acceptance/widgets/ported/{aggregation.js => aggregation-test.js} (100%) rename test/acceptance/widgets/ported/{formula.js => formula-test.js} (100%) rename test/acceptance/widgets/ported/{histogram.js => histogram-test.js} (100%) rename test/acceptance/widgets/{regressions.js => regressions-test.js} (100%) rename test/acceptance/widgets/{widgets.js => widgets-test.js} (100%) rename test/integration/{analysis-backend-limits.js => analysis-backend-limits-test.js} (100%) rename test/integration/{mapconfig-named-layers-datasource.js => mapconfig-named-layers-datasource-test.js} (100%) rename test/integration/{mapconfig-named-layers-expanded.js => mapconfig-named-layers-expanded-test.js} (100%) rename test/integration/{mapconfig-overviews-adapter.js => mapconfig-overviews-adapter-test.js} (100%) rename test/integration/{overviews-metadata-api.js => overviews-metadata-api-test.js} (100%) rename test/integration/{pg-query-runner.js => pg-query-runner-test.js} (100%) rename test/integration/{profiler.js => profiler-test.js} (100%) rename test/integration/{query-tables.js => query-tables-test.js} (100%) rename test/integration/{template-maps-limits.js => template-maps-limits-test.js} (100%) rename test/unit/cartodb/backends/layer-stats/{mapnik-layer-stats.js => mapnik-layer-stats-test.js} (100%) rename test/unit/cartodb/backends/layer-stats/{torque-layer-stats.js => torque-layer-stats-test.js} (100%) rename test/unit/cartodb/backends/{turbo-carto-postgres-datasource.js => turbo-carto-postgres-datasource-test.js} (100%) rename test/unit/cartodb/{overviews-query-rewriter.js => overviews-query-rewriter-test.js} (100%) rename test/unit/cartodb/stats/reporter/{named-map-provider.js => named-map-provider-test.js} (100%) rename test/unit/cartodb/{table-name-parser.js => table-name-parser-test.js} (100%) diff --git a/test/acceptance/aggregation.js b/test/acceptance/aggregation-test.js similarity index 100% rename from test/acceptance/aggregation.js rename to test/acceptance/aggregation-test.js diff --git a/test/acceptance/analysis/analyses-controller.js b/test/acceptance/analysis/analyses-controller-test.js similarity index 100% rename from test/acceptance/analysis/analyses-controller.js rename to test/acceptance/analysis/analyses-controller-test.js diff --git a/test/acceptance/analysis/analyses-filters-params.js b/test/acceptance/analysis/analyses-filters-params-test.js similarity index 100% rename from test/acceptance/analysis/analyses-filters-params.js rename to test/acceptance/analysis/analyses-filters-params-test.js diff --git a/test/acceptance/analysis/analyses-filters.js b/test/acceptance/analysis/analyses-filters-test.js similarity index 100% rename from test/acceptance/analysis/analyses-filters.js rename to test/acceptance/analysis/analyses-filters-test.js diff --git a/test/acceptance/analysis/analysis-layers-dataviews.js b/test/acceptance/analysis/analysis-layers-dataviews-test.js similarity index 100% rename from test/acceptance/analysis/analysis-layers-dataviews.js rename to test/acceptance/analysis/analysis-layers-dataviews-test.js diff --git a/test/acceptance/analysis/analysis-layers.js b/test/acceptance/analysis/analysis-layers-test.js similarity index 100% rename from test/acceptance/analysis/analysis-layers.js rename to test/acceptance/analysis/analysis-layers-test.js diff --git a/test/acceptance/analysis/analysis-layers-use-cases.js b/test/acceptance/analysis/analysis-layers-use-cases-test.js similarity index 100% rename from test/acceptance/analysis/analysis-layers-use-cases.js rename to test/acceptance/analysis/analysis-layers-use-cases-test.js diff --git a/test/acceptance/analysis/error-cases.js b/test/acceptance/analysis/error-cases-test.js similarity index 100% rename from test/acceptance/analysis/error-cases.js rename to test/acceptance/analysis/error-cases-test.js diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps-test.js similarity index 100% rename from test/acceptance/analysis/named-maps.js rename to test/acceptance/analysis/named-maps-test.js diff --git a/test/acceptance/analysis/regressions.js b/test/acceptance/analysis/regressions-test.js similarity index 100% rename from test/acceptance/analysis/regressions.js rename to test/acceptance/analysis/regressions-test.js diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases-test.js similarity index 100% rename from test/acceptance/auth/authorization-basic-use-cases.js rename to test/acceptance/auth/authorization-basic-use-cases-test.js diff --git a/test/acceptance/auth/authorization.js b/test/acceptance/auth/authorization-test.js similarity index 100% rename from test/acceptance/auth/authorization.js rename to test/acceptance/auth/authorization-test.js diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format-test.js similarity index 100% rename from test/acceptance/buffer-size-format.js rename to test/acceptance/buffer-size-format-test.js diff --git a/test/acceptance/cache/cache-control-header.js b/test/acceptance/cache/cache-control-header-test.js similarity index 100% rename from test/acceptance/cache/cache-control-header.js rename to test/acceptance/cache/cache-control-header-test.js diff --git a/test/acceptance/cache/cache-headers.js b/test/acceptance/cache/cache-headers-test.js similarity index 100% rename from test/acceptance/cache/cache-headers.js rename to test/acceptance/cache/cache-headers-test.js diff --git a/test/acceptance/cache/surrogate-keys-invalidation.js b/test/acceptance/cache/surrogate-keys-invalidation-test.js similarity index 100% rename from test/acceptance/cache/surrogate-keys-invalidation.js rename to test/acceptance/cache/surrogate-keys-invalidation-test.js diff --git a/test/acceptance/cluster.js b/test/acceptance/cluster-test.js similarity index 100% rename from test/acceptance/cluster.js rename to test/acceptance/cluster-test.js diff --git a/test/acceptance/custom-middlewares.js b/test/acceptance/custom-middlewares-test.js similarity index 100% rename from test/acceptance/custom-middlewares.js rename to test/acceptance/custom-middlewares-test.js diff --git a/test/acceptance/dataviews/aggregation.js b/test/acceptance/dataviews/aggregation-test.js similarity index 100% rename from test/acceptance/dataviews/aggregation.js rename to test/acceptance/dataviews/aggregation-test.js diff --git a/test/acceptance/dataviews/error-cases.js b/test/acceptance/dataviews/error-cases-test.js similarity index 100% rename from test/acceptance/dataviews/error-cases.js rename to test/acceptance/dataviews/error-cases-test.js diff --git a/test/acceptance/dataviews/formula.js b/test/acceptance/dataviews/formula-test.js similarity index 100% rename from test/acceptance/dataviews/formula.js rename to test/acceptance/dataviews/formula-test.js diff --git a/test/acceptance/dataviews/histogram.js b/test/acceptance/dataviews/histogram-test.js similarity index 100% rename from test/acceptance/dataviews/histogram.js rename to test/acceptance/dataviews/histogram-test.js diff --git a/test/acceptance/dataviews/overviews.js b/test/acceptance/dataviews/overviews-test.js similarity index 100% rename from test/acceptance/dataviews/overviews.js rename to test/acceptance/dataviews/overviews-test.js diff --git a/test/acceptance/date-wrapping.spec.js b/test/acceptance/date-wrapping-test.js similarity index 100% rename from test/acceptance/date-wrapping.spec.js rename to test/acceptance/date-wrapping-test.js diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps-test.js similarity index 100% rename from test/acceptance/dynamic-styling-named-maps.js rename to test/acceptance/dynamic-styling-named-maps-test.js diff --git a/test/acceptance/error-middleware.js b/test/acceptance/error-middleware-test.js similarity index 100% rename from test/acceptance/error-middleware.js rename to test/acceptance/error-middleware-test.js diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context-test.js similarity index 100% rename from test/acceptance/errors-with-context.js rename to test/acceptance/errors-with-context-test.js diff --git a/test/acceptance/health-check.js b/test/acceptance/health-check-test.js similarity index 100% rename from test/acceptance/health-check.js rename to test/acceptance/health-check-test.js diff --git a/test/acceptance/label-wrap.js b/test/acceptance/label-wrap-test.js similarity index 100% rename from test/acceptance/label-wrap.js rename to test/acceptance/label-wrap-test.js diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata-test.js similarity index 100% rename from test/acceptance/layergroup-metadata.js rename to test/acceptance/layergroup-metadata-test.js diff --git a/test/acceptance/layers-filters.js b/test/acceptance/layers-filters-test.js similarity index 100% rename from test/acceptance/layers-filters.js rename to test/acceptance/layers-filters-test.js diff --git a/test/acceptance/max-waiting-workers.js b/test/acceptance/max-waiting-workers-test.js similarity index 100% rename from test/acceptance/max-waiting-workers.js rename to test/acceptance/max-waiting-workers-test.js diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer-server-test.js similarity index 100% rename from test/acceptance/multilayer_server.js rename to test/acceptance/multilayer-server-test.js diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer-test.js similarity index 100% rename from test/acceptance/multilayer.js rename to test/acceptance/multilayer-test.js diff --git a/test/acceptance/mvt-regressions.js b/test/acceptance/mvt-regressions-test.js similarity index 100% rename from test/acceptance/mvt-regressions.js rename to test/acceptance/mvt-regressions-test.js diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt-test.js similarity index 100% rename from test/acceptance/mvt.js rename to test/acceptance/mvt-test.js diff --git a/test/acceptance/named-layers.js b/test/acceptance/named-layers-test.js similarity index 100% rename from test/acceptance/named-layers.js rename to test/acceptance/named-layers-test.js diff --git a/test/acceptance/named-layers-visibility.js b/test/acceptance/named-layers-visibility-test.js similarity index 100% rename from test/acceptance/named-layers-visibility.js rename to test/acceptance/named-layers-visibility-test.js diff --git a/test/acceptance/named-map-cache-regressions.js b/test/acceptance/named-map-cache-regressions-test.js similarity index 100% rename from test/acceptance/named-map-cache-regressions.js rename to test/acceptance/named-map-cache-regressions-test.js diff --git a/test/acceptance/named-maps-authentication.js b/test/acceptance/named-maps-authentication-test.js similarity index 100% rename from test/acceptance/named-maps-authentication.js rename to test/acceptance/named-maps-authentication-test.js diff --git a/test/acceptance/named-maps-cache.js b/test/acceptance/named-maps-cache-test.js similarity index 100% rename from test/acceptance/named-maps-cache.js rename to test/acceptance/named-maps-cache-test.js diff --git a/test/acceptance/named-maps-static-view.js b/test/acceptance/named-maps-static-view-test.js similarity index 100% rename from test/acceptance/named-maps-static-view.js rename to test/acceptance/named-maps-static-view-test.js diff --git a/test/acceptance/named-maps-stats.js b/test/acceptance/named-maps-stats-test.js similarity index 100% rename from test/acceptance/named-maps-stats.js rename to test/acceptance/named-maps-stats-test.js diff --git a/test/acceptance/overviews-metadata-named-maps.js b/test/acceptance/overviews-metadata-named-maps-test.js similarity index 100% rename from test/acceptance/overviews-metadata-named-maps.js rename to test/acceptance/overviews-metadata-named-maps-test.js diff --git a/test/acceptance/overviews-metadata.js b/test/acceptance/overviews-metadata-test.js similarity index 100% rename from test/acceptance/overviews-metadata.js rename to test/acceptance/overviews-metadata-test.js diff --git a/test/acceptance/overviews-queries.js b/test/acceptance/overviews-queries-test.js similarity index 100% rename from test/acceptance/overviews-queries.js rename to test/acceptance/overviews-queries-test.js diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes-test.js similarity index 100% rename from test/acceptance/ported/attributes.js rename to test/acceptance/ported/attributes-test.js diff --git a/test/acceptance/ported/blend-filtering.js b/test/acceptance/ported/blend-filtering-test.js similarity index 100% rename from test/acceptance/ported/blend-filtering.js rename to test/acceptance/ported/blend-filtering-test.js diff --git a/test/acceptance/ported/blend-http-fallback.js b/test/acceptance/ported/blend-http-fallback-test.js similarity index 100% rename from test/acceptance/ported/blend-http-fallback.js rename to test/acceptance/ported/blend-http-fallback-test.js diff --git a/test/acceptance/ported/blend-http-timeout.js b/test/acceptance/ported/blend-http-timeout-test.js similarity index 100% rename from test/acceptance/ported/blend-http-timeout.js rename to test/acceptance/ported/blend-http-timeout-test.js diff --git a/test/acceptance/ported/blend.js b/test/acceptance/ported/blend-test.js similarity index 100% rename from test/acceptance/ported/blend.js rename to test/acceptance/ported/blend-test.js diff --git a/test/acceptance/ported/external-resources.js b/test/acceptance/ported/external-resources-test.js similarity index 100% rename from test/acceptance/ported/external-resources.js rename to test/acceptance/ported/external-resources-test.js diff --git a/test/acceptance/ported/limits.js b/test/acceptance/ported/limits-test.js similarity index 100% rename from test/acceptance/ported/limits.js rename to test/acceptance/ported/limits-test.js diff --git a/test/acceptance/ported/multilayer-error-cases.js b/test/acceptance/ported/multilayer-error-cases-test.js similarity index 100% rename from test/acceptance/ported/multilayer-error-cases.js rename to test/acceptance/ported/multilayer-error-cases-test.js diff --git a/test/acceptance/ported/multilayer-interactivity.js b/test/acceptance/ported/multilayer-interactivity-test.js similarity index 100% rename from test/acceptance/ported/multilayer-interactivity.js rename to test/acceptance/ported/multilayer-interactivity-test.js diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer-test.js similarity index 100% rename from test/acceptance/ported/multilayer.js rename to test/acceptance/ported/multilayer-test.js diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster-test.js similarity index 100% rename from test/acceptance/ported/raster.js rename to test/acceptance/ported/raster-test.js diff --git a/test/acceptance/ported/regressions.js b/test/acceptance/ported/regressions-test.js similarity index 100% rename from test/acceptance/ported/regressions.js rename to test/acceptance/ported/regressions-test.js diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina-test.js similarity index 100% rename from test/acceptance/ported/retina.js rename to test/acceptance/ported/retina-test.js diff --git a/test/acceptance/ported/server-gettile.js b/test/acceptance/ported/server-gettile-test.js similarity index 100% rename from test/acceptance/ported/server-gettile.js rename to test/acceptance/ported/server-gettile-test.js diff --git a/test/acceptance/ported/server-png8-format.js b/test/acceptance/ported/server-png8-format-test.js similarity index 100% rename from test/acceptance/ported/server-png8-format.js rename to test/acceptance/ported/server-png8-format-test.js diff --git a/test/acceptance/ported/server.js b/test/acceptance/ported/server-test.js similarity index 100% rename from test/acceptance/ported/server.js rename to test/acceptance/ported/server-test.js diff --git a/test/acceptance/ported/static-maps.js b/test/acceptance/ported/static-maps-test.js similarity index 100% rename from test/acceptance/ported/static-maps.js rename to test/acceptance/ported/static-maps-test.js diff --git a/test/acceptance/ported/torque-boundaries.js b/test/acceptance/ported/torque-boundaries-test.js similarity index 100% rename from test/acceptance/ported/torque-boundaries.js rename to test/acceptance/ported/torque-boundaries-test.js diff --git a/test/acceptance/ported/torque-png.js b/test/acceptance/ported/torque-png-test.js similarity index 100% rename from test/acceptance/ported/torque-png.js rename to test/acceptance/ported/torque-png-test.js diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque-test.js similarity index 100% rename from test/acceptance/ported/torque.js rename to test/acceptance/ported/torque-test.js diff --git a/test/acceptance/ported/torque-zero-zero.js b/test/acceptance/ported/torque-zero-zero-test.js similarity index 100% rename from test/acceptance/ported/torque-zero-zero.js rename to test/acceptance/ported/torque-zero-zero-test.js diff --git a/test/acceptance/ported/wrap.js b/test/acceptance/ported/wrap-test.js similarity index 100% rename from test/acceptance/ported/wrap.js rename to test/acceptance/ported/wrap-test.js diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit-test.js similarity index 100% rename from test/acceptance/rate-limit.test.js rename to test/acceptance/rate-limit-test.js diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions-test.js similarity index 100% rename from test/acceptance/regressions.js rename to test/acceptance/regressions-test.js diff --git a/test/acceptance/server.js b/test/acceptance/server-test.js similarity index 100% rename from test/acceptance/server.js rename to test/acceptance/server-test.js diff --git a/test/acceptance/special-numeric-values.js b/test/acceptance/special-numeric-values-test.js similarity index 100% rename from test/acceptance/special-numeric-values.js rename to test/acceptance/special-numeric-values-test.js diff --git a/test/acceptance/sql-wrap.js b/test/acceptance/sql-wrap-test.js similarity index 100% rename from test/acceptance/sql-wrap.js rename to test/acceptance/sql-wrap-test.js diff --git a/test/acceptance/stats/mapnik-stats-layergroup.js b/test/acceptance/stats/mapnik-stats-layergroup-test.js similarity index 100% rename from test/acceptance/stats/mapnik-stats-layergroup.js rename to test/acceptance/stats/mapnik-stats-layergroup-test.js diff --git a/test/acceptance/stats/multilayer-stats.js b/test/acceptance/stats/multilayer-stats-test.js similarity index 100% rename from test/acceptance/stats/multilayer-stats.js rename to test/acceptance/stats/multilayer-stats-test.js diff --git a/test/acceptance/templates.js b/test/acceptance/templates-test.js similarity index 100% rename from test/acceptance/templates.js rename to test/acceptance/templates-test.js diff --git a/test/acceptance/tilejson.js b/test/acceptance/tilejson-test.js similarity index 100% rename from test/acceptance/tilejson.js rename to test/acceptance/tilejson-test.js diff --git a/test/acceptance/turbo-carto/anonymous-maps.js b/test/acceptance/turbo-carto/anonymous-maps-test.js similarity index 100% rename from test/acceptance/turbo-carto/anonymous-maps.js rename to test/acceptance/turbo-carto/anonymous-maps-test.js diff --git a/test/acceptance/turbo-carto/error-cases.js b/test/acceptance/turbo-carto/error-cases-test.js similarity index 100% rename from test/acceptance/turbo-carto/error-cases.js rename to test/acceptance/turbo-carto/error-cases-test.js diff --git a/test/acceptance/turbo-carto/named-maps.js b/test/acceptance/turbo-carto/named-maps-test.js similarity index 100% rename from test/acceptance/turbo-carto/named-maps.js rename to test/acceptance/turbo-carto/named-maps-test.js diff --git a/test/acceptance/turbo-carto/regressions.js b/test/acceptance/turbo-carto/regressions-test.js similarity index 100% rename from test/acceptance/turbo-carto/regressions.js rename to test/acceptance/turbo-carto/regressions-test.js diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit-test.js similarity index 100% rename from test/acceptance/user-database-timeout-limit.js rename to test/acceptance/user-database-timeout-limit-test.js diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit-test.js similarity index 100% rename from test/acceptance/user-render-timeout-limit.js rename to test/acceptance/user-render-timeout-limit-test.js diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup-test.js similarity index 100% rename from test/acceptance/vector-layergroup.js rename to test/acceptance/vector-layergroup-test.js diff --git a/test/acceptance/widgets/aggregation.js b/test/acceptance/widgets/aggregation-test.js similarity index 100% rename from test/acceptance/widgets/aggregation.js rename to test/acceptance/widgets/aggregation-test.js diff --git a/test/acceptance/widgets/histogram.js b/test/acceptance/widgets/histogram-test.js similarity index 100% rename from test/acceptance/widgets/histogram.js rename to test/acceptance/widgets/histogram-test.js diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps-test.js similarity index 100% rename from test/acceptance/widgets/named-maps.js rename to test/acceptance/widgets/named-maps-test.js diff --git a/test/acceptance/widgets/ported/aggregation.js b/test/acceptance/widgets/ported/aggregation-test.js similarity index 100% rename from test/acceptance/widgets/ported/aggregation.js rename to test/acceptance/widgets/ported/aggregation-test.js diff --git a/test/acceptance/widgets/ported/formula.js b/test/acceptance/widgets/ported/formula-test.js similarity index 100% rename from test/acceptance/widgets/ported/formula.js rename to test/acceptance/widgets/ported/formula-test.js diff --git a/test/acceptance/widgets/ported/histogram.js b/test/acceptance/widgets/ported/histogram-test.js similarity index 100% rename from test/acceptance/widgets/ported/histogram.js rename to test/acceptance/widgets/ported/histogram-test.js diff --git a/test/acceptance/widgets/regressions.js b/test/acceptance/widgets/regressions-test.js similarity index 100% rename from test/acceptance/widgets/regressions.js rename to test/acceptance/widgets/regressions-test.js diff --git a/test/acceptance/widgets/widgets.js b/test/acceptance/widgets/widgets-test.js similarity index 100% rename from test/acceptance/widgets/widgets.js rename to test/acceptance/widgets/widgets-test.js diff --git a/test/integration/analysis-backend-limits.js b/test/integration/analysis-backend-limits-test.js similarity index 100% rename from test/integration/analysis-backend-limits.js rename to test/integration/analysis-backend-limits-test.js diff --git a/test/integration/mapconfig-named-layers-datasource.js b/test/integration/mapconfig-named-layers-datasource-test.js similarity index 100% rename from test/integration/mapconfig-named-layers-datasource.js rename to test/integration/mapconfig-named-layers-datasource-test.js diff --git a/test/integration/mapconfig-named-layers-expanded.js b/test/integration/mapconfig-named-layers-expanded-test.js similarity index 100% rename from test/integration/mapconfig-named-layers-expanded.js rename to test/integration/mapconfig-named-layers-expanded-test.js diff --git a/test/integration/mapconfig-overviews-adapter.js b/test/integration/mapconfig-overviews-adapter-test.js similarity index 100% rename from test/integration/mapconfig-overviews-adapter.js rename to test/integration/mapconfig-overviews-adapter-test.js diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api-test.js similarity index 100% rename from test/integration/overviews-metadata-api.js rename to test/integration/overviews-metadata-api-test.js diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner-test.js similarity index 100% rename from test/integration/pg-query-runner.js rename to test/integration/pg-query-runner-test.js diff --git a/test/integration/profiler.js b/test/integration/profiler-test.js similarity index 100% rename from test/integration/profiler.js rename to test/integration/profiler-test.js diff --git a/test/integration/query-tables.js b/test/integration/query-tables-test.js similarity index 100% rename from test/integration/query-tables.js rename to test/integration/query-tables-test.js diff --git a/test/integration/template-maps-limits.js b/test/integration/template-maps-limits-test.js similarity index 100% rename from test/integration/template-maps-limits.js rename to test/integration/template-maps-limits-test.js diff --git a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js similarity index 100% rename from test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js rename to test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js diff --git a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js b/test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js similarity index 100% rename from test/unit/cartodb/backends/layer-stats/torque-layer-stats.js rename to test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js diff --git a/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js b/test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js similarity index 100% rename from test/unit/cartodb/backends/turbo-carto-postgres-datasource.js rename to test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js diff --git a/test/unit/cartodb/overviews-query-rewriter.js b/test/unit/cartodb/overviews-query-rewriter-test.js similarity index 100% rename from test/unit/cartodb/overviews-query-rewriter.js rename to test/unit/cartodb/overviews-query-rewriter-test.js diff --git a/test/unit/cartodb/stats/reporter/named-map-provider.js b/test/unit/cartodb/stats/reporter/named-map-provider-test.js similarity index 100% rename from test/unit/cartodb/stats/reporter/named-map-provider.js rename to test/unit/cartodb/stats/reporter/named-map-provider-test.js diff --git a/test/unit/cartodb/table-name-parser.js b/test/unit/cartodb/table-name-parser-test.js similarity index 100% rename from test/unit/cartodb/table-name-parser.js rename to test/unit/cartodb/table-name-parser-test.js From 55aad4254cebaa0561bfaeb830c959027ccededa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 11:29:07 +0200 Subject: [PATCH 36/37] Remove cartodb folder in unit test --- .../layer-stats/mapnik-layer-stats-test.js | 2 +- .../layer-stats/torque-layer-stats-test.js | 2 +- .../turbo-carto-postgres-datasource-test.js | 2 +- .../cache/model/named-maps-entry-test.js | 4 ++-- test/unit/{cartodb => }/cdb-request-test.js | 4 ++-- test/unit/{cartodb => }/error-messages-test.js | 4 ++-- test/unit/{cartodb => }/error-middleware-test.js | 4 ++-- test/unit/{cartodb => }/lzma-middleware-test.js | 4 ++-- test/unit/{cartodb => }/mapconfig/adapter-test.js | 2 +- .../mapconfig/dataviews-widgets-adapter-test.js | 2 +- .../{cartodb => }/middlewares/coordinates-test.js | 2 +- .../model/filter/bbox-filters-test.js | 6 +++--- .../{cartodb => }/model/resource-locator-test.js | 6 +++--- .../{cartodb => }/overviews-query-rewriter-test.js | 4 ++-- test/unit/{cartodb => }/ported/profiler-test.js | 4 ++-- .../unit/{cartodb => }/ported/stats-client-test.js | 4 ++-- .../{cartodb => }/ported/windshaft-server-test.js | 6 +++--- test/unit/{cartodb => }/prepare-context-test.js | 14 +++++++------- .../stats/reporter/named-map-provider-test.js | 2 +- .../unit/{cartodb => }/substitution-tokens-test.js | 2 +- test/unit/{cartodb => }/table-name-parser-test.js | 4 ++-- test/unit/{cartodb => }/template-maps-auth-test.js | 4 ++-- .../{cartodb => }/template-maps-defaults-test.js | 4 ++-- test/unit/{cartodb => }/template-maps-test.js | 4 ++-- test/unit/{cartodb => }/utils/date-wrapper-test.js | 2 +- .../unit/{cartodb => }/valid-template-maps-test.js | 4 ++-- 26 files changed, 51 insertions(+), 51 deletions(-) rename test/unit/{cartodb => }/backends/layer-stats/mapnik-layer-stats-test.js (98%) rename test/unit/{cartodb => }/backends/layer-stats/torque-layer-stats-test.js (91%) rename test/unit/{cartodb => }/backends/turbo-carto-postgres-datasource-test.js (94%) rename test/unit/{cartodb => }/cache/model/named-maps-entry-test.js (86%) rename test/unit/{cartodb => }/cdb-request-test.js (96%) rename test/unit/{cartodb => }/error-messages-test.js (86%) rename test/unit/{cartodb => }/error-middleware-test.js (97%) rename test/unit/{cartodb => }/lzma-middleware-test.js (89%) rename test/unit/{cartodb => }/mapconfig/adapter-test.js (97%) rename test/unit/{cartodb => }/mapconfig/dataviews-widgets-adapter-test.js (98%) rename test/unit/{cartodb => }/middlewares/coordinates-test.js (98%) rename test/unit/{cartodb => }/model/filter/bbox-filters-test.js (96%) rename test/unit/{cartodb => }/model/resource-locator-test.js (98%) rename test/unit/{cartodb => }/overviews-query-rewriter-test.js (99%) rename test/unit/{cartodb => }/ported/profiler-test.js (82%) rename test/unit/{cartodb => }/ported/stats-client-test.js (92%) rename test/unit/{cartodb => }/ported/windshaft-server-test.js (85%) rename test/unit/{cartodb => }/prepare-context-test.js (93%) rename test/unit/{cartodb => }/stats/reporter/named-map-provider-test.js (94%) rename test/unit/{cartodb => }/substitution-tokens-test.js (95%) rename test/unit/{cartodb => }/table-name-parser-test.js (95%) rename test/unit/{cartodb => }/template-maps-auth-test.js (96%) rename test/unit/{cartodb => }/template-maps-defaults-test.js (96%) rename test/unit/{cartodb => }/template-maps-test.js (99%) rename test/unit/{cartodb => }/utils/date-wrapper-test.js (87%) rename test/unit/{cartodb => }/valid-template-maps-test.js (96%) diff --git a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js b/test/unit/backends/layer-stats/mapnik-layer-stats-test.js similarity index 98% rename from test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js rename to test/unit/backends/layer-stats/mapnik-layer-stats-test.js index 7106e60f..6860a781 100644 --- a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js +++ b/test/unit/backends/layer-stats/mapnik-layer-stats-test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var MapnikLayerStats = require('../../../../../lib/backends/layer-stats/mapnik-layer-stats'); +var MapnikLayerStats = require('../../../../lib/backends/layer-stats/mapnik-layer-stats'); var MapConfig = require('windshaft').model.MapConfig; function getDbConnectionMock () { diff --git a/test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js b/test/unit/backends/layer-stats/torque-layer-stats-test.js similarity index 91% rename from test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js rename to test/unit/backends/layer-stats/torque-layer-stats-test.js index a6638610..6156bbe6 100644 --- a/test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js +++ b/test/unit/backends/layer-stats/torque-layer-stats-test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var TorqueLayerStats = require('../../../../../lib/backends/layer-stats/torque-layer-stats'); +var TorqueLayerStats = require('../../../../lib/backends/layer-stats/torque-layer-stats'); var MapConfig = require('windshaft').model.MapConfig; describe('torque-layer-stats', function () { diff --git a/test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js b/test/unit/backends/turbo-carto-postgres-datasource-test.js similarity index 94% rename from test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js rename to test/unit/backends/turbo-carto-postgres-datasource-test.js index 420edf7f..303517e1 100644 --- a/test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js +++ b/test/unit/backends/turbo-carto-postgres-datasource-test.js @@ -1,6 +1,6 @@ 'use strict'; -var PostgresDatasource = require('../../../../lib/backends/turbo-carto-postgres-datasource'); +var PostgresDatasource = require('../../../lib/backends/turbo-carto-postgres-datasource'); var PSQL = require('cartodb-psql'); var _ = require('underscore'); var assert = require('assert'); diff --git a/test/unit/cartodb/cache/model/named-maps-entry-test.js b/test/unit/cache/model/named-maps-entry-test.js similarity index 86% rename from test/unit/cartodb/cache/model/named-maps-entry-test.js rename to test/unit/cache/model/named-maps-entry-test.js index e8e7ccc0..69ba81b2 100644 --- a/test/unit/cartodb/cache/model/named-maps-entry-test.js +++ b/test/unit/cache/model/named-maps-entry-test.js @@ -1,10 +1,10 @@ 'use strict'; -require('../../../../support/test-helper'); +require('../../../support/test-helper'); var assert = require('assert'); var _ = require('underscore'); -var NamedMapsCacheEntry = require('../../../../../lib/cache/model/named-maps-entry'); +var NamedMapsCacheEntry = require('../../../../lib/cache/model/named-maps-entry'); describe('cache named maps entry', function() { diff --git a/test/unit/cartodb/cdb-request-test.js b/test/unit/cdb-request-test.js similarity index 96% rename from test/unit/cartodb/cdb-request-test.js rename to test/unit/cdb-request-test.js index 8a9e8278..49b1253b 100644 --- a/test/unit/cartodb/cdb-request-test.js +++ b/test/unit/cdb-request-test.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test-helper'); +require('../support/test-helper'); var assert = require('assert'); -var CdbRequest = require('../../../lib/models/cdb-request'); +var CdbRequest = require('../../lib/models/cdb-request'); describe('req2params', function() { diff --git a/test/unit/cartodb/error-messages-test.js b/test/unit/error-messages-test.js similarity index 86% rename from test/unit/cartodb/error-messages-test.js rename to test/unit/error-messages-test.js index f29422f1..86b3b43a 100644 --- a/test/unit/cartodb/error-messages-test.js +++ b/test/unit/error-messages-test.js @@ -1,10 +1,10 @@ 'use strict'; -require('../../support/test-helper'); +require('../support/test-helper'); var assert = require('assert'); -var errorMiddleware = require('../../../lib/api/middlewares/error-middleware'); +var errorMiddleware = require('../../lib/api/middlewares/error-middleware'); describe('error messages clean up', function() { diff --git a/test/unit/cartodb/error-middleware-test.js b/test/unit/error-middleware-test.js similarity index 97% rename from test/unit/cartodb/error-middleware-test.js rename to test/unit/error-middleware-test.js index 5333b6c3..d7670c6a 100644 --- a/test/unit/cartodb/error-middleware-test.js +++ b/test/unit/error-middleware-test.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test-helper'); +require('../support/test-helper'); var assert = require('assert'); -var errorMiddleware = require('../../../lib/api/middlewares/error-middleware'); +var errorMiddleware = require('../../lib/api/middlewares/error-middleware'); describe('error-middleware', function() { diff --git a/test/unit/cartodb/lzma-middleware-test.js b/test/unit/lzma-middleware-test.js similarity index 89% rename from test/unit/cartodb/lzma-middleware-test.js rename to test/unit/lzma-middleware-test.js index 99229528..b176a207 100644 --- a/test/unit/cartodb/lzma-middleware-test.js +++ b/test/unit/lzma-middleware-test.js @@ -1,9 +1,9 @@ 'use strict'; var assert = require('assert'); -var testHelper = require('../../support/test-helper'); +var testHelper = require('../support/test-helper'); -var lzmaMiddleware = require('../../../lib/api/middlewares/lzma'); +var lzmaMiddleware = require('../../lib/api/middlewares/lzma'); describe('lzma-middleware', function() { diff --git a/test/unit/cartodb/mapconfig/adapter-test.js b/test/unit/mapconfig/adapter-test.js similarity index 97% rename from test/unit/cartodb/mapconfig/adapter-test.js rename to test/unit/mapconfig/adapter-test.js index c748ee14..5adeb4a5 100644 --- a/test/unit/cartodb/mapconfig/adapter-test.js +++ b/test/unit/mapconfig/adapter-test.js @@ -3,7 +3,7 @@ //require('../../../support/test-helper'); var assert = require('assert'); -var MapConfigAdapter = require('../../../../lib/models/mapconfig/adapter'); +var MapConfigAdapter = require('../../../lib/models/mapconfig/adapter'); describe('MapConfigAdapter', function() { var user = 'wadus'; diff --git a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js b/test/unit/mapconfig/dataviews-widgets-adapter-test.js similarity index 98% rename from test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js rename to test/unit/mapconfig/dataviews-widgets-adapter-test.js index 87f4fabe..1b1e657b 100644 --- a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js +++ b/test/unit/mapconfig/dataviews-widgets-adapter-test.js @@ -3,7 +3,7 @@ //require('../../../support/test-helper'); var assert = require('assert'); -var DataviewsMapConfigAdapter = require('../../../../lib/models/mapconfig/adapter/dataviews-widgets-adapter'); +var DataviewsMapConfigAdapter = require('../../../lib/models/mapconfig/adapter/dataviews-widgets-adapter'); describe('dataviews-widgets-adapter', function() { diff --git a/test/unit/cartodb/middlewares/coordinates-test.js b/test/unit/middlewares/coordinates-test.js similarity index 98% rename from test/unit/cartodb/middlewares/coordinates-test.js rename to test/unit/middlewares/coordinates-test.js index ca13d6a3..f2f94357 100644 --- a/test/unit/cartodb/middlewares/coordinates-test.js +++ b/test/unit/middlewares/coordinates-test.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('assert'); -const coordinates = require('../../../../lib/api/middlewares/coordinates'); +const coordinates = require('../../../lib/api/middlewares/coordinates'); describe('coordinates middleware', function () { it('should return error: invalid zoom paramenter (-1)', function (done) { diff --git a/test/unit/cartodb/model/filter/bbox-filters-test.js b/test/unit/model/filter/bbox-filters-test.js similarity index 96% rename from test/unit/cartodb/model/filter/bbox-filters-test.js rename to test/unit/model/filter/bbox-filters-test.js index c281c384..6e5100a6 100644 --- a/test/unit/cartodb/model/filter/bbox-filters-test.js +++ b/test/unit/model/filter/bbox-filters-test.js @@ -1,10 +1,10 @@ 'use strict'; -require('../../../../support/test-helper'); +require('../../../support/test-helper'); var util = require('util'); -var assert = require('../../../../support/assert'); -var BboxFilter = require('../../../../../lib/models/filter/bbox'); +var assert = require('../../../support/assert'); +var BboxFilter = require('../../../../lib/models/filter/bbox'); var MAX_EXTENT_MERCATOR_REF = [ -BboxFilter.LONGITUDE_MAX_VALUE, diff --git a/test/unit/cartodb/model/resource-locator-test.js b/test/unit/model/resource-locator-test.js similarity index 98% rename from test/unit/cartodb/model/resource-locator-test.js rename to test/unit/model/resource-locator-test.js index 3ff4995c..b26ebf54 100644 --- a/test/unit/cartodb/model/resource-locator-test.js +++ b/test/unit/model/resource-locator-test.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../../support/test-helper'); +require('../../support/test-helper'); -var assert = require('../../../support/assert'); -var ResourceLocator = require('../../../../lib/models/resource-locator'); +var assert = require('../../support/assert'); +var ResourceLocator = require('../../../lib/models/resource-locator'); describe('ResourceLocator', function() { var USERNAME = 'username'; diff --git a/test/unit/cartodb/overviews-query-rewriter-test.js b/test/unit/overviews-query-rewriter-test.js similarity index 99% rename from test/unit/cartodb/overviews-query-rewriter-test.js rename to test/unit/overviews-query-rewriter-test.js index ff06297f..4b54d426 100644 --- a/test/unit/cartodb/overviews-query-rewriter-test.js +++ b/test/unit/overviews-query-rewriter-test.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test-helper'); +require('../support/test-helper'); var assert = require('assert'); -var OverviewsQueryRewriter = require('../../../lib/utils/overviews-query-rewriter'); +var OverviewsQueryRewriter = require('../../lib/utils/overviews-query-rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ zoom_level: 'ZoomLevel()' }); diff --git a/test/unit/cartodb/ported/profiler-test.js b/test/unit/ported/profiler-test.js similarity index 82% rename from test/unit/cartodb/ported/profiler-test.js rename to test/unit/ported/profiler-test.js index e7161cb7..5dcedf9a 100644 --- a/test/unit/cartodb/ported/profiler-test.js +++ b/test/unit/ported/profiler-test.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../../support/test-helper'); +require('../../support/test-helper'); var assert = require('assert'); -var ProfilerProxy = require('../../../../lib/stats/profiler-proxy'); +var ProfilerProxy = require('../../../lib/stats/profiler-proxy'); describe('profiler', function() { diff --git a/test/unit/cartodb/ported/stats-client-test.js b/test/unit/ported/stats-client-test.js similarity index 92% rename from test/unit/cartodb/ported/stats-client-test.js rename to test/unit/ported/stats-client-test.js index 2b0d48d9..dba123b5 100644 --- a/test/unit/cartodb/ported/stats-client-test.js +++ b/test/unit/ported/stats-client-test.js @@ -1,10 +1,10 @@ 'use strict'; -require('../../../support/test-helper'); +require('../../support/test-helper'); var assert = require('assert'); -var StatsClient = require('../../../../lib/stats/client'); +var StatsClient = require('../../../lib/stats/client'); describe('stats client', function() { var statsInstance; diff --git a/test/unit/cartodb/ported/windshaft-server-test.js b/test/unit/ported/windshaft-server-test.js similarity index 85% rename from test/unit/cartodb/ported/windshaft-server-test.js rename to test/unit/ported/windshaft-server-test.js index 7cebcdae..3085c266 100644 --- a/test/unit/cartodb/ported/windshaft-server-test.js +++ b/test/unit/ported/windshaft-server-test.js @@ -1,10 +1,10 @@ 'use strict'; -require('../../../support/test-helper'); +require('../../support/test-helper'); var assert = require('assert'); -var cartodbServer = require('../../../../lib/server'); -var serverOptions = require('../../../../lib/server-options'); +var cartodbServer = require('../../../lib/server'); +var serverOptions = require('../../../lib/server-options'); describe('windshaft', function() { diff --git a/test/unit/cartodb/prepare-context-test.js b/test/unit/prepare-context-test.js similarity index 93% rename from test/unit/cartodb/prepare-context-test.js rename to test/unit/prepare-context-test.js index 7c91332e..b8675f99 100644 --- a/test/unit/cartodb/prepare-context-test.js +++ b/test/unit/prepare-context-test.js @@ -5,14 +5,14 @@ var _ = require('underscore'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../../lib/backends/pg-connection'); -var AuthBackend = require('../../../lib/backends/auth'); -var TemplateMaps = require('../../../lib/backends/template-maps'); +var PgConnection = require('../../lib/backends/pg-connection'); +var AuthBackend = require('../../lib/backends/auth'); +var TemplateMaps = require('../../lib/backends/template-maps'); -const cleanUpQueryParamsMiddleware = require('../../../lib/api/middlewares/clean-up-query-params'); -const authorizeMiddleware = require('../../../lib/api/middlewares/authorize'); -const dbConnSetupMiddleware = require('../../../lib/api/middlewares/db-conn-setup'); -const credentialsMiddleware = require('../../../lib/api/middlewares/credentials'); +const cleanUpQueryParamsMiddleware = require('../../lib/api/middlewares/clean-up-query-params'); +const authorizeMiddleware = require('../../lib/api/middlewares/authorize'); +const dbConnSetupMiddleware = require('../../lib/api/middlewares/db-conn-setup'); +const credentialsMiddleware = require('../../lib/api/middlewares/credentials'); var windshaft = require('windshaft'); diff --git a/test/unit/cartodb/stats/reporter/named-map-provider-test.js b/test/unit/stats/reporter/named-map-provider-test.js similarity index 94% rename from test/unit/cartodb/stats/reporter/named-map-provider-test.js rename to test/unit/stats/reporter/named-map-provider-test.js index eefa9816..48712be4 100644 --- a/test/unit/cartodb/stats/reporter/named-map-provider-test.js +++ b/test/unit/stats/reporter/named-map-provider-test.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('assert'); -const NamedMapProviderReporter = require('../../../../../lib/stats/reporter/named-map-provider'); +const NamedMapProviderReporter = require('../../../../lib/stats/reporter/named-map-provider'); describe('named-map-provider-reporter', function () { it('should report metrics every 100 ms', function (done) { diff --git a/test/unit/cartodb/substitution-tokens-test.js b/test/unit/substitution-tokens-test.js similarity index 95% rename from test/unit/cartodb/substitution-tokens-test.js rename to test/unit/substitution-tokens-test.js index f092e22e..7a9e5cda 100644 --- a/test/unit/cartodb/substitution-tokens-test.js +++ b/test/unit/substitution-tokens-test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var SubstitutionTokens = require('../../../lib/utils/substitution-tokens'); +var SubstitutionTokens = require('../../lib/utils/substitution-tokens'); describe('SubstitutionTokens', function() { diff --git a/test/unit/cartodb/table-name-parser-test.js b/test/unit/table-name-parser-test.js similarity index 95% rename from test/unit/cartodb/table-name-parser-test.js rename to test/unit/table-name-parser-test.js index fb279bf8..e5cb73fa 100644 --- a/test/unit/cartodb/table-name-parser-test.js +++ b/test/unit/table-name-parser-test.js @@ -1,9 +1,9 @@ 'use strict'; -require('../../support/test-helper'); +require('../support/test-helper'); var assert = require('assert'); -var TableNameParser = require('../../../lib/utils/table-name-parser'); +var TableNameParser = require('../../lib/utils/table-name-parser'); describe('TableNameParser', function() { diff --git a/test/unit/cartodb/template-maps-auth-test.js b/test/unit/template-maps-auth-test.js similarity index 96% rename from test/unit/cartodb/template-maps-auth-test.js rename to test/unit/template-maps-auth-test.js index df073324..4b7ff943 100644 --- a/test/unit/cartodb/template-maps-auth-test.js +++ b/test/unit/template-maps-auth-test.js @@ -1,11 +1,11 @@ 'use strict'; -require('../../support/test-helper'); +require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/backends/template-maps'); +var TemplateMaps = require('../../lib/backends/template-maps'); describe('template_maps_auth', function() { diff --git a/test/unit/cartodb/template-maps-defaults-test.js b/test/unit/template-maps-defaults-test.js similarity index 96% rename from test/unit/cartodb/template-maps-defaults-test.js rename to test/unit/template-maps-defaults-test.js index fe0d35c0..3c98e77d 100644 --- a/test/unit/cartodb/template-maps-defaults-test.js +++ b/test/unit/template-maps-defaults-test.js @@ -1,10 +1,10 @@ 'use strict'; -require('../../support/test-helper'); +require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/backends/template-maps'); +var TemplateMaps = require('../../lib/backends/template-maps'); var _ = require('underscore'); describe('template_maps', function() { diff --git a/test/unit/cartodb/template-maps-test.js b/test/unit/template-maps-test.js similarity index 99% rename from test/unit/cartodb/template-maps-test.js rename to test/unit/template-maps-test.js index e8124be9..f4aa376b 100644 --- a/test/unit/cartodb/template-maps-test.js +++ b/test/unit/template-maps-test.js @@ -1,10 +1,10 @@ 'use strict'; -var testHelper = require('../../support/test-helper'); +var testHelper = require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/backends/template-maps'); +var TemplateMaps = require('../../lib/backends/template-maps'); var step = require('step'); var _ = require('underscore'); diff --git a/test/unit/cartodb/utils/date-wrapper-test.js b/test/unit/utils/date-wrapper-test.js similarity index 87% rename from test/unit/cartodb/utils/date-wrapper-test.js rename to test/unit/utils/date-wrapper-test.js index 3cb05743..a76d0792 100644 --- a/test/unit/cartodb/utils/date-wrapper-test.js +++ b/test/unit/utils/date-wrapper-test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var dateWrapper = require('../../../../lib/utils/date-wrapper'); +var dateWrapper = require('../../../lib/utils/date-wrapper'); describe('date-wrapper', function() { diff --git a/test/unit/cartodb/valid-template-maps-test.js b/test/unit/valid-template-maps-test.js similarity index 96% rename from test/unit/cartodb/valid-template-maps-test.js rename to test/unit/valid-template-maps-test.js index 8b84291e..e38d9488 100644 --- a/test/unit/cartodb/valid-template-maps-test.js +++ b/test/unit/valid-template-maps-test.js @@ -1,10 +1,10 @@ 'use strict'; -require('../../support/test-helper'); +require('../support/test-helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/backends/template-maps'); +var TemplateMaps = require('../../lib/backends/template-maps'); var _ = require('underscore'); describe('template_maps', function() { From ea6e064e4248b4b3c4ecf7f653d271691d475058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 7 Oct 2019 14:08:59 +0200 Subject: [PATCH 37/37] Convert from v1 to api in routes config --- lib/server-options.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/server-options.js b/lib/server-options.js index 95a3dd7d..5dc7b72d 100644 --- a/lib/server-options.js +++ b/lib/server-options.js @@ -81,7 +81,12 @@ const routesConfig = global.environment.routes || { }] }; -if (!Array.isArray(routesConfig.api)) { +if (routesConfig.v1 && !Array.isArray(routesConfig.v1)) { + routesConfig.api = [ routesConfig.v1 ]; + delete routesConfig.v1; +} + +if (routesConfig.api && !Array.isArray(routesConfig.api)) { routesConfig.api = [ routesConfig.api ]; }