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');