diff --git a/Makefile b/Makefile index 98454b25..236a6749 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ jshint: @echo "***jshint***" @./node_modules/.bin/jshint lib/ test/ app.js -test-all: jshint test +test-all: test jshint coverage: @RUNTESTFLAGS=--with-coverage make test diff --git a/lib/cartodb/backends/dataview.js b/lib/cartodb/backends/dataview.js index b7bb6d0b..f6b78acd 100644 --- a/lib/cartodb/backends/dataview.js +++ b/lib/cartodb/backends/dataview.js @@ -123,7 +123,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param var queryRewriteData = layer && layer.options.query_rewrite_data; if ( queryRewriteData ) { if ( node.type === 'source' ) { - var filters = node.filters; // TODO: node.getFilters() when available in camshaft + var filters = node.getFilters(); var filters_disabler = Object.keys(filters).reduce( function(disabler, filter_id){ disabler[filter_id] = false; return disabler; }, {} diff --git a/lib/cartodb/cache/named_map_provider_cache.js b/lib/cartodb/cache/named_map_provider_cache.js index 9adb29b9..dac98b21 100644 --- a/lib/cartodb/cache/named_map_provider_cache.js +++ b/lib/cartodb/cache/named_map_provider_cache.js @@ -1,8 +1,8 @@ var _ = require('underscore'); var dot = require('dot'); -var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider'); -var MapConfigNamedLayersAdapter = require('../models/mapconfig_named_layers_adapter'); -var AnalysisMapConfigAdapter = require('../models/analysis-mapconfig-adapter'); +var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider'); +var MapConfigNamedLayersAdapter = require('../models/mapconfig/adapter/mapconfig-named-layers-adapter'); +var AnalysisMapConfigAdapter = require('../models/mapconfig/adapter/analysis-mapconfig-adapter'); var templateName = require('../backends/template_maps').templateName; var queue = require('queue-async'); diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js index 1c79e47a..8c426c7c 100644 --- a/lib/cartodb/controllers/layergroup.js +++ b/lib/cartodb/controllers/layergroup.js @@ -10,7 +10,7 @@ var userMiddleware = require('../middleware/user'); var DataviewBackend = require('../backends/dataview'); var AnalysisStatusBackend = require('../backends/analysis-status'); -var MapStoreMapConfigProvider = require('../models/mapconfig/map_store_provider'); +var MapStoreMapConfigProvider = require('../models/mapconfig/provider/map-store-provider'); var QueryTables = require('cartodb-query-tables'); diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index 1f8f25bb..8e68e9fd 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -15,10 +15,10 @@ var Datasource = windshaft.model.Datasource; var NamedMapsCacheEntry = require('../cache/model/named_maps_entry'); -var MapConfigNamedLayersAdapter = require('../models/mapconfig_named_layers_adapter'); -var AnalysisMapConfigAdapter = require('../models/analysis-mapconfig-adapter'); -var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider'); -var CreateLayergroupMapConfigProvider = require('../models/mapconfig/create_layergroup_provider'); +var MapConfigNamedLayersAdapter = require('../models/mapconfig/adapter/mapconfig-named-layers-adapter'); +var AnalysisMapConfigAdapter = require('../models/mapconfig/adapter/analysis-mapconfig-adapter'); +var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider'); +var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider'); var SqlWrapMapConfigAdapter = require('../models/mapconfig/adapter/sql-wrap-mapconfig-adapter'); /** diff --git a/lib/cartodb/models/analysis-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/analysis-mapconfig-adapter.js rename to lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig_named_layers_adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig_named_layers_adapter.js rename to lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js diff --git a/lib/cartodb/models/mapconfig_overviews_adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js similarity index 97% rename from lib/cartodb/models/mapconfig_overviews_adapter.js rename to lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js index f5cfde9e..3b8d54a2 100644 --- a/lib/cartodb/models/mapconfig_overviews_adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js @@ -35,7 +35,7 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy var node = _.find(analysesResults, function(a){ return a.rootNode.params.id === sourceId; }); if ( node ) { node = node.rootNode; - filters = node.filters; // TODO: node.getFilters() when available in camshaft + filters = node.getFilters(); var filters_disabler = Object.keys(filters).reduce( function(disabler, filter_id){ disabler[filter_id] = false; return disabler; }, {} diff --git a/lib/cartodb/models/mapconfig/create_layergroup_provider.js b/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js similarity index 95% rename from lib/cartodb/models/mapconfig/create_layergroup_provider.js rename to lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js index 409d9bda..af5a775b 100644 --- a/lib/cartodb/models/mapconfig/create_layergroup_provider.js +++ b/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js @@ -1,7 +1,7 @@ var assert = require('assert'); var step = require('step'); -var MapStoreMapConfigProvider = require('./map_store_provider'); +var MapStoreMapConfigProvider = require('./map-store-provider'); /** * @param {MapConfig} mapConfig diff --git a/lib/cartodb/models/mapconfig/map_store_provider.js b/lib/cartodb/models/mapconfig/provider/map-store-provider.js similarity index 100% rename from lib/cartodb/models/mapconfig/map_store_provider.js rename to lib/cartodb/models/mapconfig/provider/map-store-provider.js diff --git a/lib/cartodb/models/mapconfig/named_map_provider.js b/lib/cartodb/models/mapconfig/provider/named-map-provider.js similarity index 98% rename from lib/cartodb/models/mapconfig/named_map_provider.js rename to lib/cartodb/models/mapconfig/provider/named-map-provider.js index e1ad6fea..e05998e1 100644 --- a/lib/cartodb/models/mapconfig/named_map_provider.js +++ b/lib/cartodb/models/mapconfig/provider/named-map-provider.js @@ -4,9 +4,9 @@ var crypto = require('crypto'); var dot = require('dot'); var step = require('step'); var MapConfig = require('windshaft').model.MapConfig; -var templateName = require('../../backends/template_maps').templateName; +var templateName = require('../../../backends/template_maps').templateName; var QueryTables = require('cartodb-query-tables'); -var SqlWrapMapConfigAdapter = require('./adapter/sql-wrap-mapconfig-adapter'); +var SqlWrapMapConfigAdapter = require('./../adapter/sql-wrap-mapconfig-adapter'); /** * @constructor diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index 8117d208..88cf61b6 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -34,7 +34,7 @@ var AnalysisBackend = require('./backends/analysis'); var timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png'; var timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null}); -var MapConfigOverviewsAdapter = require('./models/mapconfig_overviews_adapter'); +var MapConfigOverviewsAdapter = require('./models/mapconfig/adapter/mapconfig-overviews-adapter'); var TurboCartoParser = require('./utils/style/turbo-carto-parser'); var TurboCartoAdapter = require('./utils/style/turbo-carto-adapter'); diff --git a/lib/cartodb/utils/style/postgres-datasource.js b/lib/cartodb/utils/style/postgres-datasource.js index 447c9143..16e7ed86 100644 --- a/lib/cartodb/utils/style/postgres-datasource.js +++ b/lib/cartodb/utils/style/postgres-datasource.js @@ -23,8 +23,35 @@ var methodTemplates = Object.keys(methods).reduce(function(methodTemplates, meth return methodTemplates; }, {}); +methodTemplates.category = dot.template([ + 'WITH', + 'categories AS (', + ' SELECT {{=it._column}} AS category, count(1) AS value, row_number() OVER (ORDER BY count(1) desc) as rank', + ' FROM ({{=it._sql}}) _cdb_aggregation_all', + ' GROUP BY {{=it._column}}', + ' ORDER BY 2 DESC', + '),', + 'agg_categories AS (', + ' SELECT \'__other\' category', + ' FROM categories', + ' WHERE rank >= {{=it._buckets}}', + ' GROUP BY 1', + ' UNION ALL', + ' SELECT CAST(category AS text)', + ' FROM categories', + ' WHERE rank < {{=it._buckets}}', + ')', + 'SELECT array_agg(category) AS category FROM agg_categories' +].join('\n')); + +var STRATEGY = { + SPLIT: 'split', + EXACT: 'exact' +}; + var method2strategy = { - headtails: 'split' + headtails: STRATEGY.SPLIT, + category: STRATEGY.EXACT }; function PostgresDatasource (pgQueryRunner, username, query) { @@ -53,11 +80,15 @@ PostgresDatasource.prototype.getRamp = function (column, buckets, method, callba return callback(err); } - var ramp = result[0][methodName].sort(function(a, b) { - return a - b; - }); + var strategy = method2strategy[methodName]; + var ramp = result[0][methodName]; + if (strategy !== STRATEGY.EXACT) { + ramp = ramp.sort(function(a, b) { + return a - b; + }); + } - return callback(null, { ramp: ramp, strategy: method2strategy[methodName] }); + return callback(null, { ramp: ramp, strategy: strategy }); }); }; 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/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js index e312b7b3..39d19359 100644 --- a/test/integration/mapconfig_named_layers_datasource.js +++ b/test/integration/mapconfig_named_layers_datasource.js @@ -4,7 +4,7 @@ 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_named_layers_adapter'); +var MapConfigNamedLayersAdapter = require('../../lib/cartodb/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 d78726c9..b7aae20e 100644 --- a/test/integration/mapconfig_named_layers_expanded.js +++ b/test/integration/mapconfig_named_layers_expanded.js @@ -4,9 +4,9 @@ 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_named_layers_adapter'); +var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter'); -describe('mapconfig_named_layers_adapter', function() { +describe('mapconfig-named-layers-adapter', function() { // configure redis pool instance to use in tests var redisPool = new RedisPool(global.environment.redis); diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js index d168c02f..adb444f2 100644 --- a/test/integration/mapconfig_overviews_adapter.js +++ b/test/integration/mapconfig_overviews_adapter.js @@ -7,11 +7,7 @@ var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connectio var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); var OverviewsMetadataApi = require('../../lib/cartodb/api/overviews_metadata_api'); var FilterStatsApi = require('../../lib/cartodb/api/filter_stats_api'); -var MapConfigOverviewsAdapter = require('../../lib/cartodb/models/mapconfig_overviews_adapter'); - -// configure redis pool instance to use in tests -var redisPool = new RedisPool(global.environment.redis); -var pgConnection = new PgConnection(require('cartodb-redis')({ pool: redisPool })); +var MapConfigOverviewsAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter'); var redisPool = new RedisPool(global.environment.redis); var metadataBackend = cartodbRedis({pool: redisPool}); 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');