diff --git a/README.md b/README.md index 79a17cbd..f6f0bdde 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Create the config/environments/.js files (there are .example files to start from). You can optionally use the ./configure script for this, see ```./configure --help``` to see available options. -Look at lib/cartodb/server_options.js for more on config +Look at lib/cartodb/server-options.js for more on config Upgrading --------- diff --git a/app.js b/app.js index 8fa20852..e8cd445b 100755 --- a/app.js +++ b/app.js @@ -106,7 +106,7 @@ global.logger = global.log4js.getLogger(); // Include cartodb_windshaft only _after_ the "global" variable is set // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28 var cartodbWindshaft = require('./lib/server'); -var serverOptions = require('./lib/server_options'); +var serverOptions = require('./lib/server-options'); var server = cartodbWindshaft(serverOptions); diff --git a/lib/server_options.js b/lib/server-options.js similarity index 100% rename from lib/server_options.js rename to lib/server-options.js diff --git a/test/acceptance/aggregation.js b/test/acceptance/aggregation.js index 347d91e8..28e3a528 100644 --- a/test/acceptance/aggregation.js +++ b/test/acceptance/aggregation.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const WebMercatorHelper = require('cartodb-query-tables').utils.webMercatorHelper; const webmercator = new WebMercatorHelper(); diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps.js index b6e5f103..2c462d28 100644 --- a/test/acceptance/analysis/named-maps.js +++ b/test/acceptance/analysis/named-maps.js @@ -5,7 +5,7 @@ var assert = require('../../support/assert'); var helper = require('../../support/test_helper'); var CartodbWindshaft = require('../../../lib/server'); -var serverOptions = require('../../../lib/server_options'); +var serverOptions = require('../../../lib/server-options'); var TestClient = require('../../support/test-client'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases.js index e86a879e..9608f3be 100644 --- a/test/acceptance/auth/authorization-basic-use-cases.js +++ b/test/acceptance/auth/authorization-basic-use-cases.js @@ -3,7 +3,7 @@ const assert = require('../../support/assert'); const testHelper = require('../../support/test_helper'); const CartodbWindshaft = require('../../../lib/server'); -const serverOptions = require('../../../lib/server_options'); +const serverOptions = require('../../../lib/server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); function singleLayergroupConfig(sql, cartocss) { diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format.js index 120bf42b..090f7f86 100644 --- a/test/acceptance/buffer-size-format.js +++ b/test/acceptance/buffer-size-format.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var fs = require('fs'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE_PER_MIL = 5; diff --git a/test/acceptance/cache/cache_headers.js b/test/acceptance/cache/cache_headers.js index 81a0dd85..36383f94 100644 --- a/test/acceptance/cache/cache_headers.js +++ b/test/acceptance/cache/cache_headers.js @@ -6,7 +6,7 @@ var assert = require('../../support/assert'); var qs = require('querystring'); var CartodbWindshaft = require('../../../lib/server'); -var serverOptions = require('../../../lib/server_options'); +var serverOptions = require('../../../lib/server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/acceptance/cache/surrogate_keys_invalidation.js b/test/acceptance/cache/surrogate_keys_invalidation.js index 67bc64d6..9a8cc136 100644 --- a/test/acceptance/cache/surrogate_keys_invalidation.js +++ b/test/acceptance/cache/surrogate_keys_invalidation.js @@ -12,7 +12,7 @@ var nock = require('nock'); describe('templates surrogate keys', function() { - var serverOptions = require('../../../lib/server_options'); + var serverOptions = require('../../../lib/server-options'); // Enable Varnish purge for tests var varnishHost = serverOptions.varnish_host; diff --git a/test/acceptance/custom-middlewares.js b/test/acceptance/custom-middlewares.js index a4bb7559..cb25a495 100644 --- a/test/acceptance/custom-middlewares.js +++ b/test/acceptance/custom-middlewares.js @@ -3,7 +3,7 @@ const helper = require('../support/test_helper'); const assert = require('../support/assert'); const createServer = require('../../lib/server'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); describe('custom middlewares', function () { const RESPONSE_OK = { diff --git a/test/acceptance/date-wrapping.spec.js b/test/acceptance/date-wrapping.spec.js index a3c98261..85b56111 100644 --- a/test/acceptance/date-wrapping.spec.js +++ b/test/acceptance/date-wrapping.spec.js @@ -4,7 +4,7 @@ const assert = require('assert'); const TestClient = require('../support/test-client'); const mapConfigFactory = require('../fixtures/test_mapconfigFactory'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const usePgMvtRenderer = serverOptions.renderer.mvt.usePostGIS; const describe_mvt = !usePgMvtRenderer ? describe : describe.skip; diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js index 744bf1cd..ff3b96f3 100644 --- a/test/acceptance/dynamic-styling-named-maps.js +++ b/test/acceptance/dynamic-styling-named-maps.js @@ -5,7 +5,7 @@ var step = require('step'); var LayergroupToken = require('../../lib/models/layergroup-token'); var testHelper = require(__dirname + '/../support/test_helper'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); describe('dynamic styling for named maps', function() { var server; diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context.js index 4d07617f..25c83101 100644 --- a/test/acceptance/errors-with-context.js +++ b/test/acceptance/errors-with-context.js @@ -2,7 +2,7 @@ var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); describe('error with context', function () { var server; diff --git a/test/acceptance/health_check.js b/test/acceptance/health_check.js index b49eb03f..2c457a8a 100644 --- a/test/acceptance/health_check.js +++ b/test/acceptance/health_check.js @@ -6,7 +6,7 @@ var fs = require('fs'); var assert = require('../support/assert'); var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); describe('health checks', function () { diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata.js index 816c44b2..0a039fe4 100644 --- a/test/acceptance/layergroup-metadata.js +++ b/test/acceptance/layergroup-metadata.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); describe('layergroup metadata', function () { const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 6ccfd82f..24b2804a 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -19,7 +19,7 @@ var IMAGE_EQUALS_TOLERANCE_PER_MIL = 20; var IMAGE_EQUALS_HIGHER_TOLERANCE_PER_MIL = 25; var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); var QueryTables = require('cartodb-query-tables').queryTables; diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 9a79471f..643e8d0d 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -11,7 +11,7 @@ var LayergroupToken = require('../../lib/models/layergroup-token'); var PgQueryRunner = require('../../lib/backends/pg-query-runner'); var QueryTables = require('cartodb-query-tables').queryTables; var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); describe('tests from old api translated to multilayer', function() { var server; diff --git a/test/acceptance/mvt-regressions.js b/test/acceptance/mvt-regressions.js index c8c4ffa8..a7655e28 100644 --- a/test/acceptance/mvt-regressions.js +++ b/test/acceptance/mvt-regressions.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const suites = [ { diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 10c5cac7..9db7d7d1 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -4,7 +4,7 @@ require('../support/test_helper'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); function createMapConfig(sql = TestClient.SQL.ONE_POINT) { return { diff --git a/test/acceptance/named-map-cache-regressions.js b/test/acceptance/named-map-cache-regressions.js index 15c03f51..85594516 100644 --- a/test/acceptance/named-map-cache-regressions.js +++ b/test/acceptance/named-map-cache-regressions.js @@ -5,7 +5,7 @@ require('../support/test_helper'); const request = require('request'); const assert = require('assert'); const Server = require('../../lib/server'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const { mapnik } = require('windshaft'); const helper = require('../support/test_helper'); diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js index 4d92880f..60a7dc48 100644 --- a/test/acceptance/named_layers.js +++ b/test/acceptance/named_layers.js @@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/named_layers_visibility.js b/test/acceptance/named_layers_visibility.js index 5d1f9618..588f079c 100644 --- a/test/acceptance/named_layers_visibility.js +++ b/test/acceptance/named_layers_visibility.js @@ -5,7 +5,7 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var RedisPool = require('redis-mpool'); var TemplateMaps = require('../../lib/backends/template_maps.js'); diff --git a/test/acceptance/named_maps_authentication.js b/test/acceptance/named_maps_authentication.js index 6b7aac15..dc2163bd 100644 --- a/test/acceptance/named_maps_authentication.js +++ b/test/acceptance/named_maps_authentication.js @@ -7,7 +7,7 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var TemplateMaps = require('../../lib/backends/template_maps.js'); var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); diff --git a/test/acceptance/named_maps_cache.js b/test/acceptance/named_maps_cache.js index eb2edcd0..90969992 100644 --- a/test/acceptance/named_maps_cache.js +++ b/test/acceptance/named_maps_cache.js @@ -6,7 +6,7 @@ const helper = require('../support/test_helper'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); describe('named maps provider cache', function() { var server; diff --git a/test/acceptance/named_maps_static_view.js b/test/acceptance/named_maps_static_view.js index 1075b398..84175a38 100644 --- a/test/acceptance/named_maps_static_view.js +++ b/test/acceptance/named_maps_static_view.js @@ -7,7 +7,7 @@ var RedisPool = require('redis-mpool'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); var TemplateMaps = require('../../lib/backends/template_maps.js'); describe('named maps static view', function() { diff --git a/test/acceptance/named_maps_stats.js b/test/acceptance/named_maps_stats.js index 10be0d91..56df1169 100644 --- a/test/acceptance/named_maps_stats.js +++ b/test/acceptance/named_maps_stats.js @@ -7,7 +7,7 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var TemplateMaps = require('../../lib/backends/template_maps.js'); var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry'); diff --git a/test/acceptance/overviews_metadata.js b/test/acceptance/overviews_metadata.js index 2b2b25a8..74da08fa 100644 --- a/test/acceptance/overviews_metadata.js +++ b/test/acceptance/overviews_metadata.js @@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/overviews_metadata_named_maps.js b/test/acceptance/overviews_metadata_named_maps.js index e4822e0b..03afca5a 100644 --- a/test/acceptance/overviews_metadata_named_maps.js +++ b/test/acceptance/overviews_metadata_named_maps.js @@ -4,7 +4,7 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index 6ff5cfe2..ea84a4d2 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -1,7 +1,7 @@ 'use strict'; var _ = require('underscore'); -var serverOptions = require('../../../../lib/server_options'); +var serverOptions = require('../../../../lib/server-options'); var mapnik = require('windshaft').mapnik; var OverviewsQueryRewriter = require('../../../../lib/utils/overviews-query-rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js index d9589d0b..ed6c5c1c 100644 --- a/test/acceptance/rate-limit.test.js +++ b/test/acceptance/rate-limit.test.js @@ -9,7 +9,7 @@ const cartodbRedis = require('cartodb-redis'); const TestClient = require('../support/test-client'); const UserLimitsBackend = require('../../lib/backends/user-limits'); const rateLimitMiddleware = require('../../lib/api/middlewares/rate-limit'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitMiddleware; let userLimitsApi; diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions.js index df91d910..7e6f2f63 100644 --- a/test/acceptance/regressions.js +++ b/test/acceptance/regressions.js @@ -6,7 +6,7 @@ const helper = require('../support/test_helper'); var TestClient = require('../support/test-client'); const LayergroupToken = require('../../lib/models/layergroup-token'); const CartodbWindshaft = require(__dirname + '/../../lib/server'); -const serverOptions = require(__dirname + '/../../lib/server_options'); +const serverOptions = require(__dirname + '/../../lib/server-options'); describe('regressions', function() { diff --git a/test/acceptance/server.js b/test/acceptance/server.js index 39275415..93584e04 100644 --- a/test/acceptance/server.js +++ b/test/acceptance/server.js @@ -7,7 +7,7 @@ var querystring = require('querystring'); var step = require('step'); var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); describe('server', function() { diff --git a/test/acceptance/stats/mapnik_stats_layergroup.js b/test/acceptance/stats/mapnik_stats_layergroup.js index 5395bf0c..79ba6522 100644 --- a/test/acceptance/stats/mapnik_stats_layergroup.js +++ b/test/acceptance/stats/mapnik_stats_layergroup.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); -const serverOptions = require('../../../lib/server_options'); +const serverOptions = require('../../../lib/server-options'); const suites = [ { diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js index 67901c34..ceb5596b 100644 --- a/test/acceptance/templates.js +++ b/test/acceptance/templates.js @@ -21,7 +21,7 @@ var http = require('http'); var helper = require(__dirname + '/../support/test_helper'); var CartodbWindshaft = require(__dirname + '/../../lib/server'); -var serverOptions = require(__dirname + '/../../lib/server_options'); +var serverOptions = require(__dirname + '/../../lib/server-options'); var LayergroupToken = require('../../lib/models/layergroup-token'); diff --git a/test/acceptance/tilejson.js b/test/acceptance/tilejson.js index 22db6082..ee895031 100644 --- a/test/acceptance/tilejson.js +++ b/test/acceptance/tilejson.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; diff --git a/test/acceptance/turbo-carto/named-maps.js b/test/acceptance/turbo-carto/named-maps.js index 17269442..987cc2d5 100644 --- a/test/acceptance/turbo-carto/named-maps.js +++ b/test/acceptance/turbo-carto/named-maps.js @@ -5,7 +5,7 @@ var step = require('step'); var LayergroupToken = require('../../../lib/models/layergroup-token'); var testHelper = require('../../support/test_helper'); var CartodbWindshaft = require('../../../lib/server'); -var serverOptions = require('../../../lib/server_options'); +var serverOptions = require('../../../lib/server-options'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE_PER_MIL = 10; diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit.js index 81c0161c..24752fb8 100644 --- a/test/acceptance/user-database-timeout-limit.js +++ b/test/acceptance/user-database-timeout-limit.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit.js index 6e2e1e36..d890c1f0 100644 --- a/test/acceptance/user-render-timeout-limit.js +++ b/test/acceptance/user-render-timeout-limit.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js index 781e4d3f..6161b472 100644 --- a/test/acceptance/vector-layergroup.js +++ b/test/acceptance/vector-layergroup.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/server_options'); +const serverOptions = require('../../lib/server-options'); const POINTS_SQL_1 = ` diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps.js index d034453a..fe507a7f 100644 --- a/test/acceptance/widgets/named-maps.js +++ b/test/acceptance/widgets/named-maps.js @@ -9,7 +9,7 @@ var queue = require('queue-async'); var helper = require('../../support/test_helper'); var CartodbWindshaft = require('../../../lib/server'); -var serverOptions = require('../../../lib/server_options'); +var serverOptions = require('../../../lib/server-options'); var LayergroupToken = require('../../../lib/models/layergroup-token'); diff --git a/test/support/test-client.js b/test/support/test-client.js index b18580e4..7b58f458 100644 --- a/test/support/test-client.js +++ b/test/support/test-client.js @@ -13,7 +13,7 @@ var assert = require('./assert'); var helper = require('./test_helper'); var CartodbWindshaft = require('../../lib/server'); -var serverOptions = require('../../lib/server_options'); +var serverOptions = require('../../lib/server-options'); serverOptions.analysis.batch.inlineExecution = true; const MAPNIK_SUPPORTED_FORMATS = { diff --git a/test/unit/cartodb/ported/windshaft_server.test.js b/test/unit/cartodb/ported/windshaft_server.test.js index cf19f1b2..8ec43400 100644 --- a/test/unit/cartodb/ported/windshaft_server.test.js +++ b/test/unit/cartodb/ported/windshaft_server.test.js @@ -4,7 +4,7 @@ require('../../../support/test_helper.js'); var assert = require('assert'); var cartodbServer = require('../../../../lib/server'); -var serverOptions = require('../../../../lib/server_options'); +var serverOptions = require('../../../../lib/server-options'); describe('windshaft', function() { diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js index 5442db90..aaa0f2ee 100644 --- a/test/unit/cartodb/prepare-context.test.js +++ b/test/unit/cartodb/prepare-context.test.js @@ -42,7 +42,7 @@ describe('prepare-context', function() { }); - it('can be found in server_options', function(){ + it('can be found in server-options', function(){ assert.ok(_.isFunction(authorize)); assert.ok(_.isFunction(dbConnSetup)); assert.ok(_.isFunction(cleanUpQueryParams));