From c372d69e9874f426222187c14cd3e7c3f568b4f6 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 23 May 2016 13:01:23 +0200 Subject: [PATCH] LayergroupToken only makes sense at testing environment --- test/acceptance/analysis/named-maps.js | 2 +- test/acceptance/dynamic-styling-named-maps.js | 2 +- test/acceptance/limits.js | 2 +- test/acceptance/multilayer.js | 2 +- test/acceptance/multilayer_server.js | 2 +- test/acceptance/named_layers.js | 2 +- test/acceptance/overviews_metadata.js | 2 +- test/acceptance/overviews_metadata_named_maps.js | 2 +- test/acceptance/ported/attributes.js | 2 +- test/acceptance/ported/multilayer.js | 2 +- test/acceptance/ported/multilayer_interactivity.js | 2 +- test/acceptance/ported/raster.js | 2 +- test/acceptance/ported/retina.js | 2 +- test/acceptance/ported/server_png8_format.js | 2 +- test/acceptance/ported/support/ported_server_options.js | 2 +- test/acceptance/ported/support/test_client.js | 2 +- test/acceptance/ported/torque.js | 2 +- test/acceptance/ported/torque_boundaries.js | 2 +- test/acceptance/templates.js | 2 +- test/acceptance/turbo-cartocss/named-maps.js | 2 +- test/acceptance/widgets/named-maps.js | 2 +- test/acceptance/x_cache_channel.js | 2 +- .../layergroup_token.js => test/support/layergroup-token.js | 0 test/support/test-client.js | 2 +- 24 files changed, 23 insertions(+), 23 deletions(-) rename lib/cartodb/models/layergroup_token.js => test/support/layergroup-token.js (100%) diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps.js index 26341a0a..bab87ee4 100644 --- a/test/acceptance/analysis/named-maps.js +++ b/test/acceptance/analysis/named-maps.js @@ -7,7 +7,7 @@ var serverOptions = require('../../../lib/cartodb/server_options'); var server = new CartodbWindshaft(serverOptions); var TestClient = require('../../support/test-client'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); describe('named-maps analysis', function() { diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js index 934ddbcb..5fe2db3c 100644 --- a/test/acceptance/dynamic-styling-named-maps.js +++ b/test/acceptance/dynamic-styling-named-maps.js @@ -1,6 +1,6 @@ var assert = require('../support/assert'); var step = require('step'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/layergroup-token'); var testHelper = require(__dirname + '/../support/test_helper'); var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); diff --git a/test/acceptance/limits.js b/test/acceptance/limits.js index ef91dac4..30a4e739 100644 --- a/test/acceptance/limits.js +++ b/test/acceptance/limits.js @@ -7,7 +7,7 @@ var redis = require('redis'); var CartodbWindshaft = require('../../lib/cartodb/server'); var serverOptions = require('../../lib/cartodb/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/layergroup-token'); describe('render limits', function() { diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 2dbfbbbd..7095f4c5 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -6,7 +6,7 @@ var strftime = require('strftime'); var redis_stats_db = 5; var helper = require(__dirname + '/../support/test_helper'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/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 e443f3aa..251ecc38 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -4,7 +4,7 @@ var assert = require('../support/assert'); var _ = require('underscore'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/layergroup-token'); var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); var QueryTables = require('cartodb-query-tables'); diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js index eeb74bc2..8788e5a6 100644 --- a/test/acceptance/named_layers.js +++ b/test/acceptance/named_layers.js @@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); var server = new CartodbWindshaft(serverOptions); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/layergroup-token'); var RedisPool = require('redis-mpool'); var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); diff --git a/test/acceptance/overviews_metadata.js b/test/acceptance/overviews_metadata.js index 0822cfe8..ad0f23e5 100644 --- a/test/acceptance/overviews_metadata.js +++ b/test/acceptance/overviews_metadata.js @@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); var server = new CartodbWindshaft(serverOptions); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/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 4f0ff6e7..8e9720ec 100644 --- a/test/acceptance/overviews_metadata_named_maps.js +++ b/test/acceptance/overviews_metadata_named_maps.js @@ -5,7 +5,7 @@ var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); var server = new CartodbWindshaft(serverOptions); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/layergroup-token'); var RedisPool = require('redis-mpool'); diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes.js index 1c8f3983..5151cc09 100644 --- a/test/acceptance/ported/attributes.js +++ b/test/acceptance/ported/attributes.js @@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server'); var PortedServerOptions = require('./support/ported_server_options'); var BaseController = require('../../../lib/cartodb/controllers/base'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); describe('attributes', function() { diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer.js index eb337070..fa6648f4 100644 --- a/test/acceptance/ported/multilayer.js +++ b/test/acceptance/ported/multilayer.js @@ -7,7 +7,7 @@ var step = require('step'); var mapnik = require('windshaft').mapnik; var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); var BaseController = require('../../../lib/cartodb/controllers/base'); describe('multilayer', function() { diff --git a/test/acceptance/ported/multilayer_interactivity.js b/test/acceptance/ported/multilayer_interactivity.js index 44b54d4f..3f3f12b1 100644 --- a/test/acceptance/ported/multilayer_interactivity.js +++ b/test/acceptance/ported/multilayer_interactivity.js @@ -5,7 +5,7 @@ var _ = require('underscore'); var cartodbServer = require('../../../lib/cartodb/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('../../support/layergroup-token'); var BaseController = require('../../../lib/cartodb/controllers/base'); diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster.js index cd3d43b9..2cea4bf4 100644 --- a/test/acceptance/ported/raster.js +++ b/test/acceptance/ported/raster.js @@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); var BaseController = require('../../../lib/cartodb/controllers/base'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); describe('raster', function() { diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina.js index b13d0fe4..1c4b16f1 100644 --- a/test/acceptance/ported/retina.js +++ b/test/acceptance/ported/retina.js @@ -6,7 +6,7 @@ var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); var BaseController = require('../../../lib/cartodb/controllers/base'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); describe('retina support', function() { diff --git a/test/acceptance/ported/server_png8_format.js b/test/acceptance/ported/server_png8_format.js index 39c89c66..30b5f2bc 100644 --- a/test/acceptance/ported/server_png8_format.js +++ b/test/acceptance/ported/server_png8_format.js @@ -7,7 +7,7 @@ var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); var BaseController = require('../../../lib/cartodb/controllers/base'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/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 1cc5331f..875d42dc 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -1,6 +1,6 @@ var _ = require('underscore'); var serverOptions = require('../../../../lib/cartodb/server_options'); -var LayergroupToken = require('../../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../../support/layergroup-token'); var mapnik = require('windshaft').mapnik; var OverviewsQueryRewriter = require('../../../../lib/cartodb/utils/overviews_query_rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ diff --git a/test/acceptance/ported/support/test_client.js b/test/acceptance/ported/support/test_client.js index 54893755..dad3ff3e 100644 --- a/test/acceptance/ported/support/test_client.js +++ b/test/acceptance/ported/support/test_client.js @@ -1,5 +1,5 @@ var testHelper = require('../../../support/test_helper'); -var LayergroupToken = require('../../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../../support/layergroup-token'); var step = require('step'); var assert = require('../../../support/assert'); diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque.js index 84846ae1..b7a8c36f 100644 --- a/test/acceptance/ported/torque.js +++ b/test/acceptance/ported/torque.js @@ -7,7 +7,7 @@ var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); var BaseController = require('../../../lib/cartodb/controllers/base'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); describe('torque', function() { diff --git a/test/acceptance/ported/torque_boundaries.js b/test/acceptance/ported/torque_boundaries.js index f605570b..fb88be52 100644 --- a/test/acceptance/ported/torque_boundaries.js +++ b/test/acceptance/ported/torque_boundaries.js @@ -5,7 +5,7 @@ var cartodbServer = require('../../../lib/cartodb/server'); var ServerOptions = require('./support/ported_server_options'); var BaseController = require('../../../lib/cartodb/controllers/base'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); describe('torque boundary points', function() { diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js index ae997ca8..e8e0a2ca 100644 --- a/test/acceptance/templates.js +++ b/test/acceptance/templates.js @@ -23,7 +23,7 @@ var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); var server = new CartodbWindshaft(serverOptions); server.setMaxListeners(0); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/layergroup-token'); describe('template_api', function() { server.layergroupAffectedTablesCache.cache.reset(); diff --git a/test/acceptance/turbo-cartocss/named-maps.js b/test/acceptance/turbo-cartocss/named-maps.js index 9c88b6db..35dc8cd8 100644 --- a/test/acceptance/turbo-cartocss/named-maps.js +++ b/test/acceptance/turbo-cartocss/named-maps.js @@ -1,6 +1,6 @@ var assert = require('../../support/assert'); var step = require('step'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); var testHelper = require('../../support/test_helper'); var CartodbWindshaft = require('../../../lib/cartodb/server'); var serverOptions = require('../../../lib/cartodb/server_options'); diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps.js index cc603d72..eb5a0d29 100644 --- a/test/acceptance/widgets/named-maps.js +++ b/test/acceptance/widgets/named-maps.js @@ -10,7 +10,7 @@ var CartodbWindshaft = require('../../../lib/cartodb/server'); var serverOptions = require('../../../lib/cartodb/server_options'); var server = new CartodbWindshaft(serverOptions); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../../support/layergroup-token'); describe('named-maps widgets', function() { diff --git a/test/acceptance/x_cache_channel.js b/test/acceptance/x_cache_channel.js index 8f536e1f..4ebb45e8 100644 --- a/test/acceptance/x_cache_channel.js +++ b/test/acceptance/x_cache_channel.js @@ -8,7 +8,7 @@ var serverOptions = require('../../lib/cartodb/server_options'); var server = new CartodbWindshaft(serverOptions); server.setMaxListeners(0); -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('../support/layergroup-token'); describe('get requests x-cache-channel', function() { diff --git a/lib/cartodb/models/layergroup_token.js b/test/support/layergroup-token.js similarity index 100% rename from lib/cartodb/models/layergroup_token.js rename to test/support/layergroup-token.js diff --git a/test/support/test-client.js b/test/support/test-client.js index a9ec5bee..e0fadeee 100644 --- a/test/support/test-client.js +++ b/test/support/test-client.js @@ -6,7 +6,7 @@ var urlParser = require('url'); var mapnik = require('windshaft').mapnik; -var LayergroupToken = require('../../lib/cartodb/models/layergroup_token'); +var LayergroupToken = require('./layergroup-token'); var assert = require('./assert'); var helper = require('./test_helper');