cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ise strict mode for moduler under test folder

Browse Source
This commit is contained in:
Daniel García Aubert 2018-10-23 18:39:02 +02:00
parent 361e99006b
commit e2d27db828
125 changed files with 280 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/acceptance/aggregation.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
const assert = require('../support/assert');

2
test/acceptance/analysis/analyses-controller.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/analysis/analyses-filters-params.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
const assert = require('../../support/assert');

2
test/acceptance/analysis/analyses-filters.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
const assert = require('../../support/assert');

2
test/acceptance/analysis/analysis-layers-dataviews.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/analysis/analysis-layers-use-cases.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/analysis/analysis-layers.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/analysis/error-cases.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/analysis/named-maps.js
View File

@ -1,3 +1,5 @@
'use strict';
var assert = require('../../support/assert');
var helper = require('../../support/test_helper');

2
test/acceptance/analysis/regressions.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/auth/authorization-basic-use-cases.js
View File

@ -1,3 +1,5 @@
'use strict';
const assert = require('../../support/assert');
const testHelper = require('../../support/test_helper');
const CartodbWindshaft = require('../../../lib/cartodb/server');

4
test/acceptance/auth/authorization.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
const assert = require('../../support/assert');
@ -927,6 +929,6 @@ describe('authorization', function() {
});
});
});
});
});
});

2
test/acceptance/buffer-size-format.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var fs = require('fs');

2
test/acceptance/cache/cache_headers.js vendored
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/cache/surrogate_keys_invalidation.js vendored
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/dataviews/aggregation.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');
var TestClient = require('../../support/test-client');

30
test/acceptance/dataviews/error-cases.js
View File

@ -1,10 +1,12 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');
var TestClient = require('../../support/test-client');
describe('dataview error cases', function() {
describe('generic errors', function() {
afterEach(function(done) {
@ -21,7 +23,7 @@ describe('dataview error cases', function() {
'Content-Type': 'application/json; charset=utf-8'
}
};
function createMapConfig(dataviews) {
return {
version: '1.5.0',
@ -49,40 +51,40 @@ describe('dataview error cases', function() {
]
};
}
it('should fail when invalid dataviews object is provided, string case', function(done) {
var mapConfig = createMapConfig("wadus-string");
this.testClient = new TestClient(mapConfig, 1234);
this.testClient.getLayergroup({ response: ERROR_RESPONSE }, function(err, errObj) {
assert.ok(!err, err);
assert.deepEqual(errObj.errors, [ '"dataviews" must be a valid JSON object: "string" type found' ]);
done();
});
});
it('should fail when invalid dataviews object is provided, array case', function(done) {
var mapConfig = createMapConfig([]);
this.testClient = new TestClient(mapConfig, 1234);
this.testClient.getLayergroup({ response: ERROR_RESPONSE }, function(err, errObj) {
assert.ok(!err, err);
assert.deepEqual(errObj.errors, [ '"dataviews" must be a valid JSON object: "array" type found' ]);
done();
});
});
it('should work with empty but valid objects', function(done) {
var mapConfig = createMapConfig({});
this.testClient = new TestClient(mapConfig, 1234);
this.testClient.getLayergroup(function(err, layergroup) {
assert.ok(!err, err);
assert.ok(layergroup);
assert.ok(layergroup.layergroupid);
done();
});
});
@ -132,7 +134,7 @@ describe('dataview error cases', function() {
}
}
}
};
};
}
it('should work without filters', function(done) {
@ -184,7 +186,7 @@ describe('dataview error cases', function() {
done();
});
});
it('should not fail if query does not return rows', function(done) {
const query = 'select * from populated_places_simple_reduced limit 0';
@ -198,7 +200,7 @@ describe('dataview error cases', function() {
max: 0,
categoriesCount: 0,
categories: [],
type: 'aggregation'
type: 'aggregation'
};
this.testClient = new TestClient(createMapConfig(query));

2
test/acceptance/dataviews/formula.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');
var TestClient = require('../../support/test-client');

2
test/acceptance/dataviews/histogram.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/dataviews/overviews.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

4
test/acceptance/date-wrapping.spec.js
View File

@ -1,3 +1,5 @@
'use strict';
/* eslint-env mocha */
const assert = require('assert');
const TestClient = require('../support/test-client');
@ -316,5 +318,3 @@ describe_mvt('date-wrapping', () => {
});
});

2
test/acceptance/dynamic-styling-named-maps.js
View File

@ -1,3 +1,5 @@
'use strict';
var assert = require('../support/assert');
var step = require('step');
var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');

2
test/acceptance/error-middleware.js
View File

@ -1,3 +1,5 @@
'use strict';
const assert = require('../support/assert');
const TestClient = require('../support/test-client');

2
test/acceptance/errors-with-context.js
View File

@ -1,3 +1,5 @@
'use strict';
var assert = require('../support/assert');
var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');

2
test/acceptance/health_check.js
View File

@ -1,3 +1,5 @@
'use strict';
require(__dirname + '/../support/test_helper');
var fs = require('fs');

10
test/acceptance/label-wrap.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var TestClient = require('../support/test-client');
@ -7,10 +9,10 @@ var IMAGE_TOLERANCE = 5;
describe('CartoCSS wrap', function () {
const options = {
sql: `
SELECT
5 as cartodb_id,
ST_Transform(ST_SetSRID(ST_MakePoint(-57.65625,-15.6230368),4326),3857) as the_geom_webmercator,
ST_SetSRID(ST_MakePoint(-57.65625,-15.62303683),4326) as the_geom,
SELECT
5 as cartodb_id,
ST_Transform(ST_SetSRID(ST_MakePoint(-57.65625,-15.6230368),4326),3857) as the_geom_webmercator,
ST_SetSRID(ST_MakePoint(-57.65625,-15.62303683),4326) as the_geom,
'South America' as continent
`,
cartocss: `

2
test/acceptance/layergroup-metadata.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
const assert = require('../support/assert');

4
test/acceptance/layers-filters.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var TestClient = require('../support/test-client');
@ -51,4 +53,4 @@ describe('layers filters', function() {
});
});
});
});

2
test/acceptance/multilayer.js
View File

@ -1,3 +1,5 @@
'use strict';
var assert = require('../support/assert');
var _ = require('underscore');
var redis = require('redis');

2
test/acceptance/multilayer_server.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../support/test_helper');
var assert = require('../support/assert');

4
test/acceptance/mvt-regressions.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
const assert = require('../support/assert');
@ -95,7 +97,7 @@ describe('MVT Mapnik', function () {
it('invalid properties', function (done) {
const query = `
select ldc, cartodb_id, _2016_6_partcntry, the_geom_webmercator, country
from countries_null_values
from countries_null_values
where country = 'Kenya' OR country = 'Sudan' LIMIT 3
`;

2
test/acceptance/mvt.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('../support/assert');

2
test/acceptance/named_layers.js
View File

@ -1,3 +1,5 @@
'use strict';
var test_helper = require('../support/test_helper');
var assert = require('../support/assert');

2
test/acceptance/named_layers_visibility.js
View File

@ -1,3 +1,5 @@
'use strict';
var step = require('step');
var test_helper = require('../support/test_helper');

2
test/acceptance/named_maps_authentication.js
View File

@ -1,3 +1,5 @@
'use strict';
var test_helper = require('../support/test_helper');
var RedisPool = require('redis-mpool');
var querystring = require('querystring');

2
test/acceptance/named_maps_cache.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var RedisPool = require('redis-mpool');

6
test/acceptance/named_maps_static_view.js
View File

@ -1,3 +1,5 @@
'use strict';
var qs = require('querystring');
var testHelper = require('../support/test_helper');
var RedisPool = require('redis-mpool');
@ -295,10 +297,10 @@ describe('named maps static view', function() {
if (err) {
return done(err);
}
var url = `/api/v1/map/static/named/${templateName}/640/480.gif`;
var requestOptions = {
url: url,
method: 'GET',

2
test/acceptance/named_maps_stats.js
View File

@ -1,3 +1,5 @@
'use strict';
var test_helper = require('../support/test_helper');
var RedisPool = require('redis-mpool');
var querystring = require('querystring');

2
test/acceptance/overviews_metadata.js
View File

@ -1,3 +1,5 @@
'use strict';
var test_helper = require('../support/test_helper');
var assert = require('../support/assert');

2
test/acceptance/overviews_metadata_named_maps.js
View File

@ -1,3 +1,5 @@
'use strict';
var test_helper = require('../support/test_helper');
var assert = require('../support/assert');

2
test/acceptance/overviews_queries.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../support/test_helper');
var assert = require('../support/assert');

2
test/acceptance/ported/attributes.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/blend.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/blend_filtering.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/blend_http_fallback.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/blend_http_timeout.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/external_resources.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/limits.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var fs = require('fs');

2
test/acceptance/ported/multilayer.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/multilayer_error_cases.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/multilayer_interactivity.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/raster.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper =require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/regressions.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/retina.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/server.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/server_gettile.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/server_png8_format.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/static_maps.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/support/ported_server_options.js
View File

@ -1,3 +1,5 @@
'use strict';
var _ = require('underscore');
var serverOptions = require('../../../../lib/cartodb/server_options');
var mapnik = require('windshaft').mapnik;

2
test/acceptance/ported/support/test_client.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../../support/test_helper');
var LayergroupToken = require('../../../../lib/cartodb/models/layergroup-token');

2
test/acceptance/ported/torque.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/torque_boundaries.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/torque_png.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/torque_zero_zero.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/ported/wrap.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/rate-limit.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
const assert = require('../support/assert');

2
test/acceptance/regressions.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('../support/assert');
const helper = require('../support/test_helper');

2
test/acceptance/server.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('../support/assert');

3
test/acceptance/special-numeric-values.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('../support/assert');
@ -68,4 +70,3 @@ describe('special numeric values', function() {
});
});
});

2
test/acceptance/sql-wrap.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('../support/assert');

2
test/acceptance/stats/mapnik_stats_layergroup.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/stats/multilayer_stats.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/templates.js
View File

@ -1,3 +1,5 @@
'use strict';
var assert = require('../support/assert');
var _ = require('underscore');
var redis = require('redis');

2
test/acceptance/tilejson.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
const assert = require('../support/assert');

2
test/acceptance/turbo-carto/anonymous-maps.js
View File

@ -1,3 +1,5 @@
'use strict';
var assert = require('../../support/assert');
var TestClient = require('../../support/test-client');

2
test/acceptance/turbo-carto/error-cases.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/turbo-carto/named-maps.js
View File

@ -1,3 +1,5 @@
'use strict';
var assert = require('../../support/assert');
var step = require('step');
var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');

12
test/acceptance/turbo-carto/regressions.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');
@ -470,7 +472,7 @@ describe('turbo-carto regressions', function() {
done();
});
});
});
});
function makeMapconfig({numQuantiles = 1}) {
return {
@ -481,10 +483,10 @@ describe('turbo-carto regressions', function() {
"options": {
"cartocss_version": '2.3.0',
"sql": 'SELECT * FROM populated_places_simple_reduced',
"cartocss": `#layer {\n
marker-width: ramp([labelrank], range(1, 20), quantiles(${numQuantiles}));\n
marker-fill: #EE4D5A;\n marker-fill-opacity: 0.9;\n
marker-allow-overlap: true;\n marker-line-width: 1;\n
"cartocss": `#layer {\n
marker-width: ramp([labelrank], range(1, 20), quantiles(${numQuantiles}));\n
marker-fill: #EE4D5A;\n marker-fill-opacity: 0.9;\n
marker-allow-overlap: true;\n marker-line-width: 1;\n
marker-line-color: #FFFFFF;\n marker-line-opacity: 1;\n}`,
}
}

2
test/acceptance/user-database-timeout-limit.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
const assert = require('../support/assert');

2
test/acceptance/user-render-timeout-limit.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
const assert = require('../support/assert');

2
test/acceptance/vector-layergroup.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
const assert = require('../support/assert');

2
test/acceptance/widgets/aggregation.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/widgets/histogram.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/acceptance/widgets/named-maps.js
View File

@ -1,3 +1,5 @@
'use strict';
var assert = require('../../support/assert');
var step = require('step');

2
test/acceptance/widgets/ported/aggregation.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../../support/test_helper');
var assert = require('../../../support/assert');

2
test/acceptance/widgets/ported/formula.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../../support/test_helper');
var assert = require('../../../support/assert');

2
test/acceptance/widgets/ported/histogram.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../../support/test_helper');
var assert = require('../../../support/assert');

4
test/acceptance/widgets/regressions.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');
@ -260,7 +262,7 @@ describe('widgets-regressions', function() {
]]
};
const query = `
const query = `
SELECT
ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON(
'${JSON.stringify(notIntersectingLeftTriangle)}'

2
test/acceptance/widgets/widgets.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../support/test_helper');
var assert = require('../../support/assert');

2
test/integration/analysis-backend-limits.js
View File

@ -1,3 +1,5 @@
'use strict';
var testHelper = require('../support/test_helper');
var assert = require('assert');

2
test/integration/mapconfig_named_layers_datasource.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('assert');

2
test/integration/mapconfig_named_layers_expanded.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('assert');

2
test/integration/mapconfig_overviews_adapter.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('assert');

2
test/integration/overviews-metadata-api.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('assert');

2
test/integration/pg-query-runner.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('assert');

2
test/integration/profiler.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('assert');

4
test/integration/query-tables.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('assert');
@ -68,4 +70,4 @@ describe('QueryTables', function() {
});
});
});
});

2
test/integration/template-maps-limits.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../support/test_helper');
var assert = require('assert');

2
test/support/assert.js
View File

@ -1,3 +1,5 @@
'use strict';
// Cribbed from the ever prolific Konstantin Kaefer
// https://github.com/mapbox/tilelive-mapnik/blob/master/test/support/assert.js

2
test/support/test_helper.js
View File

@ -1,3 +1,5 @@
'use strict';
/**
* User: simon
* Date: 30/08/2011

Some files were not shown because too many files have changed in this diff Show More