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

Replace assert.deepEqual() by assert.deepStrictEqual()

Browse Source
This commit is contained in:
Daniel García Aubert
2019-10-21 19:52:51 +02:00
parent 1bee877b24
commit 2423b5a4c4
69 changed files with 275 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/aggregation-test.js
+28 -28
View File
@@ -610,7 +610,7 @@ describe('aggregation', function () {
const expected_columns = [
'_cdb_feature_count', 'cartodb_id', 'first_column', 'second_column'
];
assert.deepEqual(columns.sort(), expected_columns.sort());
assert.deepStrictEqual(columns.sort(), expected_columns.sort());
done();
});
@@ -779,7 +779,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: [
"Invalid value for 'aggregation' query param: wadus." +
" Valid ones are 'true' or 'false'"
@@ -826,7 +826,7 @@ describe('aggregation', function () {
assert.ok(Array.isArray(body.metadata.layers));
body.metadata.layers.forEach(layer => {
assert.deepEqual(layer.meta.aggregation, { png: false, mvt: false });
assert.deepStrictEqual(layer.meta.aggregation, { png: false, mvt: false });
});
done();
@@ -860,7 +860,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: [
'Unsupported geometry type: ST_Polygon.' +
' Aggregation is available only for geometry type: ST_Point'
@@ -1038,7 +1038,7 @@ describe('aggregation', function () {
const tileJSON = tile.toJSON();
// Everything's aggregated into a single feature because the only
// dimension is space and all points are in the same place.
assert.deepEqual(tileJSON[0].features.map(f => f.properties._cdb_feature_count), [nPoints]);
assert.deepStrictEqual(tileJSON[0].features.map(f => f.properties._cdb_feature_count), [nPoints]);
done();
});
});
@@ -1080,7 +1080,7 @@ describe('aggregation', function () {
// with 20 different values, so we'll have an aggregated feature for each.
const expectedYears = Array.from({ length: 20 }, (_, k) => 2000 + k); // 2000 to 2019
const resultYears = tileJSON[0].features.map(f => f.properties.year).sort((a, b) => a - b);
assert.deepEqual(resultYears, expectedYears);
assert.deepStrictEqual(resultYears, expectedYears);
done();
});
@@ -1122,7 +1122,7 @@ describe('aggregation', function () {
const tileJSON = tile.toJSON();
assert.strictEqual(tileJSON[0].features.length, 3);
const resultQuimesters = tileJSON[0].features.map(f => f.properties.month).sort((a, b) => a - b);
assert.deepEqual(resultQuimesters, [1, 2, 3]);
assert.deepStrictEqual(resultQuimesters, [1, 2, 3]);
done();
});
@@ -1162,7 +1162,7 @@ describe('aggregation', function () {
}
const tileJSON = tile.toJSON();
const resultMonths = tileJSON[0].features.map(f => f.properties.month).sort((a, b) => a - b);
assert.deepEqual(resultMonths, [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24]);
assert.deepStrictEqual(resultMonths, [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24]);
done();
});
@@ -1290,7 +1290,7 @@ describe('aggregation', function () {
type: 'number'
}
};
assert.deepEqual(layergroup.metadata.layers[0].meta.stats.dimensions, expectedDimensions);
assert.deepStrictEqual(layergroup.metadata.layers[0].meta.stats.dimensions, expectedDimensions);
done();
});
});
@@ -1359,7 +1359,7 @@ describe('aggregation', function () {
}
const tileJSON = tile.toJSON();
const resultMonths = tileJSON[0].features.map(f => f.properties.month).sort();
assert.deepEqual(resultMonths, [
assert.deepStrictEqual(resultMonths, [
'2018-01', '2018-02', '2018-03', '2018-04', '2018-05', '2018-06',
'2018-07', '2018-08', '2018-09', '2018-10', '2018-11', '2018-12'
]);
@@ -1402,7 +1402,7 @@ describe('aggregation', function () {
}
const tileJSON = tile.toJSON();
const resultMonths = tileJSON[0].features.map(f => f.properties.month).sort();
assert.deepEqual(resultMonths, [
assert.deepStrictEqual(resultMonths, [
'2018-01', '2018-02', '2018-03', '2018-04', '2018-05', '2018-06',
'2018-07', '2018-08', '2018-09', '2018-10', '2018-11', '2018-12',
'2019-01'
@@ -1447,7 +1447,7 @@ describe('aggregation', function () {
}
const tileJSON = tile.toJSON();
const resultHours = tileJSON[0].features.map(f => f.properties.hour).sort();
assert.deepEqual(resultHours, [
assert.deepStrictEqual(resultHours, [
'2018-01-01T00',
'2018-01-01T01',
'2018-01-01T02',
@@ -1898,7 +1898,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: ['Invalid resolution, should be a number greather than 0'],
errors_with_context: [{
type: 'layer',
@@ -1940,7 +1940,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: ['Invalid placement. Valid values: centroid, point-grid, point-sample'],
errors_with_context: [{
type: 'layer',
@@ -1983,7 +1983,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: ['Invalid threshold, should be a number greather than 0'],
errors_with_context: [{
type: 'layer',
@@ -2031,7 +2031,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: ['Invalid column name, should be a non empty string'],
errors_with_context: [{
type: 'layer',
@@ -2079,7 +2079,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: ['Unsupported aggregation function wadus, ' +
'valid ones: count, avg, sum, min, max, mode'],
errors_with_context: [{
@@ -2128,7 +2128,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: ['Invalid aggregated column, should be a non empty string'],
errors_with_context: [{
type: 'layer',
@@ -2771,7 +2771,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: ['Invalid filter parameter name: not_a_valid_parameter'],
errors_with_context: [{
type: 'layer',
@@ -2825,7 +2825,7 @@ describe('aggregation', function () {
return done(err);
}
assert.deepEqual(body, {
assert.deepStrictEqual(body, {
errors: ['Invalid filtered column: value'],
errors_with_context: [{
type: 'layer',
@@ -2953,8 +2953,8 @@ describe('aggregation', function () {
const feature1 = tile1Features[0];
const feature2 = tile2Features[0];
// features should be identical (geometry and properties)
assert.deepEqual(feature1.properties, feature2.properties);
assert.deepEqual(feature1.geometry, feature2.geometry);
assert.deepStrictEqual(feature1.properties, feature2.properties);
assert.deepStrictEqual(feature1.geometry, feature2.geometry);
// and geometry should be on the border;
// for the dataset and zoom 1, only point with cartodb_id=4 (0,0)
assert.strictEqual(feature1.properties.cartodb_id, 4);
@@ -3102,10 +3102,10 @@ describe('aggregation', function () {
const tile01Actual = tile01.features.map(f => f.properties);
const tile11Actual = tile11.features.map(f => f.properties);
const orderById = (a, b) => a.cartodb_id - b.cartodb_id;
assert.deepEqual(tile00Actual.sort(orderById), tile00Expected);
assert.deepEqual(tile10Actual.sort(orderById), tile10Expected);
assert.deepEqual(tile01Actual.sort(orderById), tile01Expected);
assert.deepEqual(tile11Actual.sort(orderById), tile11Expected);
assert.deepStrictEqual(tile00Actual.sort(orderById), tile00Expected);
assert.deepStrictEqual(tile10Actual.sort(orderById), tile10Expected);
assert.deepStrictEqual(tile01Actual.sort(orderById), tile01Expected);
assert.deepStrictEqual(tile11Actual.sort(orderById), tile11Expected);
done();
});
@@ -3222,7 +3222,7 @@ describe('aggregation', function () {
if (placement === 'point-grid') {
// check geometry x = 18181005.874444414, y = -18181043.94366749
const expectedPoint = [163.322754576802, -83.3823797469878];
assert.deepEqual(tile.features[0].geometry.coordinates, expectedPoint);
assert.deepStrictEqual(tile.features[0].geometry.coordinates, expectedPoint);
}
done();
});
@@ -3260,7 +3260,7 @@ describe('aggregation', function () {
if (placement === 'point-grid') {
// check geometry x = 18181006.023735486, y = -18181043.794376418
const expectedPoint = [163.322755917907, -83.3823795924354];
assert.deepEqual(tile.features[0].geometry.coordinates, expectedPoint);
assert.deepStrictEqual(tile.features[0].geometry.coordinates, expectedPoint);
}
done();
});
test/acceptance/analysis/analyses-controller-test.js
+1 -1
View File
@@ -83,7 +83,7 @@ describe('analyses controller', function () {
return done(err);
}
assert.deepEqual(result.errors[0], 'Unauthorized');
assert.deepStrictEqual(result.errors[0], 'Unauthorized');
this.testClient.apiKey = apiKey;
done();
});
test/acceptance/analysis/analyses-filters-params-test.js
+1 -1
View File
@@ -142,7 +142,7 @@ describe('analysis-filters-params', () => {
});
testClient.getDataview('pop_max_histogram', testParams, (err, dataview) => {
assert.deepEqual(dataview, expectedError);
assert.deepStrictEqual(dataview, expectedError);
testClient.drain(done);
});
test/acceptance/analysis/analysis-layers-test.js
+3 -3
View File
@@ -175,7 +175,7 @@ describe('analysis-layers', function () {
testClient.getLayergroup({ response: PERMISSION_DENIED_RESPONSE }, function (err, layergroupResult) {
assert.ok(!err, err);
assert.deepEqual(
assert.deepStrictEqual(
layergroupResult.errors,
['Analysis requires authentication with API key: permission denied.']
);
@@ -201,7 +201,7 @@ describe('analysis-layers', function () {
assert.strictEqual(analyses.length, 1, 'Invalid number of analyses in metadata');
var nodes = analyses[0].nodes;
var nodesIds = Object.keys(nodes);
assert.deepEqual(nodesIds, ['HEAD', '2570e105-7b37-40d2-bdf4-1af889598745']);
assert.deepStrictEqual(nodesIds, ['HEAD', '2570e105-7b37-40d2-bdf4-1af889598745']);
nodesIds.forEach(function (nodeId) {
var node = nodes[nodeId];
assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');
@@ -292,7 +292,7 @@ describe('analysis-layers', function () {
var nodes = analyses[0].nodes;
var nodesIds = Object.keys(nodes);
assert.deepEqual(nodesIds, ['2570e105-7b37-40d2-bdf4-1af889598745']);
assert.deepStrictEqual(nodesIds, ['2570e105-7b37-40d2-bdf4-1af889598745']);
nodesIds.forEach(function (nodeId) {
var node = nodes[nodeId];
assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');
test/acceptance/analysis/named-maps-test.js
+3 -3
View File
@@ -85,7 +85,7 @@ describe('named-maps analysis', function () {
status: 200
},
function (res, err) {
assert.deepEqual(JSON.parse(res.body), { template_id: widgetsTemplateName });
assert.deepStrictEqual(JSON.parse(res.body), { template_id: widgetsTemplateName });
return done(err);
}
);
@@ -147,7 +147,7 @@ describe('named-maps analysis', function () {
assert.strictEqual(analyses.length, 1, 'Invalid number of analyses in metadata');
var nodes = analyses[0].nodes;
var nodesIds = Object.keys(nodes);
assert.deepEqual(nodesIds, ['HEAD', '2570e105-7b37-40d2-bdf4-1af889598745']);
assert.deepStrictEqual(nodesIds, ['HEAD', '2570e105-7b37-40d2-bdf4-1af889598745']);
nodesIds.forEach(function (nodeId) {
var node = nodes[nodeId];
assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');
@@ -299,7 +299,7 @@ describe('named-maps analysis', function () {
},
function (res, err) {
assert.ifError(err);
assert.deepEqual(
assert.deepStrictEqual(
JSON.parse(res.body),
{
errors: ['Unsupported image format \"gif\"'],
test/acceptance/cache/cache-headers-test.js
Vendored
+1 -1
View File
@@ -175,7 +175,7 @@ describe('get requests with cache headers', function () {
var dbName = headers['x-cache-channel'].split(':')[0];
var tables = headers['x-cache-channel'].split(':')[1].split(',').sort();
assert.strictEqual(dbName, expectedCacheHeaders.x_cache_channel.db_name);
assert.deepEqual(tables, expectedCacheHeaders.x_cache_channel.tables.sort());
assert.deepStrictEqual(tables, expectedCacheHeaders.x_cache_channel.tables.sort());
}
function noCacheHeaders (done) {
test/acceptance/cache/surrogate-keys-invalidation-test.js
Vendored
+3 -3
View File
@@ -122,7 +122,7 @@ describe('templates surrogate keys', function () {
throw err;
}
var parsedBody = JSON.parse(res.body);
assert.deepEqual(parsedBody, expectedBody);
assert.deepStrictEqual(parsedBody, expectedBody);
return true;
},
function finish (err) {
@@ -180,7 +180,7 @@ describe('templates surrogate keys', function () {
throw err;
}
var parsedBody = JSON.parse(res.body);
assert.deepEqual(parsedBody, expectedBody);
assert.deepStrictEqual(parsedBody, expectedBody);
assert.strictEqual(scope.pendingMocks().length, 0);
assert.strictEqual(fastlyScope.pendingMocks().length, 0);
@@ -304,7 +304,7 @@ describe('templates surrogate keys', function () {
throw err;
}
var parsedBody = JSON.parse(res.body);
assert.deepEqual(parsedBody, expectedBody);
assert.deepStrictEqual(parsedBody, expectedBody);
assert.strictEqual(scope.pendingMocks().length, 0);
assert.strictEqual(fastlyScope.pendingMocks().length, 0);
test/acceptance/custom-middlewares-test.js
+1 -1
View File
@@ -187,7 +187,7 @@ describe('custom middlewares', function () {
const body = JSON.parse(res.body);
assert.deepEqual(body, { template_id: templateid });
assert.deepStrictEqual(body, { template_id: templateid });
helper.deleteRedisKeys({ 'map_tpl|localhost': 0 }, done);
});
test/acceptance/dataviews/aggregation-test.js
+1 -1
View File
@@ -157,7 +157,7 @@ describe('aggregations happy cases', function () {
assert.strictEqual(searchResult.type, 'aggregation');
assert.strictEqual(searchResult.categories.length, 1);
assert.deepEqual(
assert.deepStrictEqual(
searchResult.categories,
widgetSearchExpects[operation]
);
test/acceptance/dataviews/error-cases-test.js
+4 -4
View File
@@ -56,7 +56,7 @@ describe('dataview error cases', function () {
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']);
assert.deepStrictEqual(errObj.errors, ['"dataviews" must be a valid JSON object: "string" type found']);
done();
});
@@ -68,7 +68,7 @@ describe('dataview error cases', function () {
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']);
assert.deepStrictEqual(errObj.errors, ['"dataviews" must be a valid JSON object: "array" type found']);
done();
});
@@ -179,7 +179,7 @@ describe('dataview error cases', function () {
this.testClient = new TestClient(createMapConfig(query));
this.testClient.getDataview('aggregation_count_dataview', params, function (err, result) {
assert.ifError(err);
assert.deepEqual(result, expectedResponseBody);
assert.deepStrictEqual(result, expectedResponseBody);
done();
});
});
@@ -203,7 +203,7 @@ describe('dataview error cases', function () {
this.testClient = new TestClient(createMapConfig(query));
this.testClient.getDataview('aggregation_count_dataview', { own_filter: 0 }, function (err, result) {
assert.ifError(err);
assert.deepEqual(result, expectedResponseBody);
assert.deepStrictEqual(result, expectedResponseBody);
done();
});
});
test/acceptance/dataviews/histogram-test.js
+8 -8
View File
@@ -968,7 +968,7 @@ describe('histogram-dataview for date column type', function() {
_testClient.getDataview('datetime_histogram_tz', params, function (err, filteredDataview) {
assert.ok(!err, err);
assert.deepEqual(dataview, filteredDataview);
assert.deepStrictEqual(dataview, filteredDataview);
done();
});
});
@@ -1126,7 +1126,7 @@ describe('histogram-dataview for date column type', function() {
assert.notEqual(dataview.offset, dataviewWithOffset.offset);
dataview.offset = dataviewWithOffset.offset;
assert.deepEqual(dataview, dataviewWithOffset);
assert.deepStrictEqual(dataview, dataviewWithOffset);
done();
});
});
@@ -1152,7 +1152,7 @@ describe('histogram-dataview for date column type', function() {
self.testClient.getDataview('minute_histogram', paramsWithFilter, function (err, filteredDataview) {
assert.ifError(err);
assert.deepEqual(dataview, filteredDataview);
assert.deepStrictEqual(dataview, filteredDataview);
self.testClient.getDataview('minute_histogram', paramsWithOffset,
function (err, filteredWithOffsetDataview) {
@@ -1160,7 +1160,7 @@ describe('histogram-dataview for date column type', function() {
assert.notEqual(filteredWithOffsetDataview.offset, filteredDataview.offset);
filteredWithOffsetDataview.offset = filteredDataview.offset;
assert.deepEqual(filteredWithOffsetDataview, filteredDataview);
assert.deepStrictEqual(filteredWithOffsetDataview, filteredDataview);
done();
});
});
@@ -1208,7 +1208,7 @@ describe('histogram-dataview for date column type', function() {
self.testClient.getDataview('minute_histogram', paramsWithDailyAgg, function (err, dataview) {
assert.ifError(err);
assert.deepEqual(dataview, dataviewWithDailyAggFixture);
assert.deepStrictEqual(dataview, dataviewWithDailyAggFixture);
done();
});
});
@@ -1247,7 +1247,7 @@ describe('histogram-dataview for date column type', function() {
self.testClient.getDataview('minute_histogram', paramsWithDailyAggAndOffset, function (err, dataview) {
assert.ifError(err);
assert.deepEqual(dataview, dataviewWithDailyAggAndOffsetFixture);
assert.deepStrictEqual(dataview, dataviewWithDailyAggAndOffsetFixture);
done();
});
});
@@ -1394,7 +1394,7 @@ describe('histogram-dates: aggregation input value', function() {
this.testClient.getDataview('bad_agg_value_histogram', override, function(err, dataviewError) {
assert.ifError(err);
assert.deepEqual(dataviewError, {
assert.deepStrictEqual(dataviewError, {
errors: [
'Invalid aggregation value. Valid ones: auto, second, minute, ' +
'hour, day, week, month, quarter, year, decade, century, millennium'
@@ -1425,7 +1425,7 @@ describe('histogram-dates: aggregation input value', function() {
this.testClient.getDataview('agg_value_histogram', override, function(err, dataviewError) {
assert.ifError(err);
assert.deepEqual(dataviewError, {
assert.deepStrictEqual(dataviewError, {
errors: [
'Invalid aggregation value. Valid ones: auto, second, minute, ' +
'hour, day, week, month, quarter, year, decade, century, millennium'
test/acceptance/dataviews/overviews-test.js
+19 -19
View File
@@ -54,7 +54,7 @@ describe('dataviews using tables without overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, { operation: 'count', result: 7313, nulls: 0, type: 'formula' });
assert.deepStrictEqual(formula_result, { operation: 'count', result: 7313, nulls: 0, type: 'formula' });
assert(getUsesOverviewsFromHeaders(headers) === false); // Overviews logging
testClient.drain(done);
@@ -70,7 +70,7 @@ describe('dataviews using tables without overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, { operation: 'count', result: 7253, nulls: 0, type: 'formula' });
assert.deepStrictEqual(formula_result, { operation: 'count', result: 7253, nulls: 0, type: 'formula' });
testClient.drain(done);
});
@@ -89,7 +89,7 @@ describe('dataviews using tables without overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, { operation: 'count', result: 256, nulls: 0, type: 'formula' });
assert.deepStrictEqual(formula_result, { operation: 'count', result: 256, nulls: 0, type: 'formula' });
testClient.drain(done);
});
});
@@ -106,7 +106,7 @@ describe('dataviews using tables without overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, { operation: 'count', result: 254, nulls: 0, type: 'formula' });
assert.deepStrictEqual(formula_result, { operation: 'count', result: 254, nulls: 0, type: 'formula' });
testClient.drain(done);
});
});
@@ -261,7 +261,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'sum',
result: 15,
infinities: 0,
@@ -282,7 +282,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'avg',
result: 3,
nulls: 0,
@@ -303,7 +303,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'count',
result: 5,
nulls: 0,
@@ -324,7 +324,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'max',
result: 5,
nulls: 0,
@@ -343,7 +343,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'min',
result: 1,
nulls: 0,
@@ -365,7 +365,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'sum',
result: 15,
nulls: 0,
@@ -472,7 +472,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'sum',
result: 1,
nulls: 0,
@@ -491,7 +491,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'avg',
result: 1,
nulls: 0,
@@ -511,7 +511,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'count',
result: 1,
infinities: 0,
@@ -531,7 +531,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'max',
result: 1,
nulls: 0,
@@ -550,7 +550,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'min',
result: 1,
nulls: 0,
@@ -575,7 +575,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(formula_result, {
assert.deepStrictEqual(formula_result, {
operation: 'sum',
result: 1,
nulls: 0,
@@ -598,7 +598,7 @@ describe('dataviews using tables with overviews', function () {
return done(err);
}
assert.deepEqual(dataview, {
assert.deepStrictEqual(dataview, {
aggregation: 'sum',
count: 5,
nulls: 0,
@@ -624,7 +624,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(dataview, {
assert.deepStrictEqual(dataview, {
bin_width: 0,
bins_count: 1,
bins_start: 3,
@@ -645,7 +645,7 @@ describe('dataviews using tables with overviews', function () {
if (err) {
return done(err);
}
assert.deepEqual(dataview, {
assert.deepStrictEqual(dataview, {
operation: 'sum',
result: 6,
nulls: 0,
test/acceptance/date-wrapping-test.js
+17 -17
View File
@@ -39,7 +39,7 @@ describe_mvt('date-wrapping', () => {
];
const actual = JSON.parse(mvt.toGeoJSONSync(0)).features;
assert.deepEqual(actual, expected);
assert.deepStrictEqual(actual, expected);
done();
});
});
@@ -47,7 +47,7 @@ describe_mvt('date-wrapping', () => {
it('should return metadata with casted columns', done => {
testClient.getLayergroup(function (err, layergroup) {
assert.ifError(err);
assert.deepEqual(layergroup.metadata.layers[0].meta.dates_as_numbers, ['date']);
assert.deepStrictEqual(layergroup.metadata.layers[0].meta.dates_as_numbers, ['date']);
done();
});
});
@@ -79,7 +79,7 @@ describe_mvt('date-wrapping', () => {
];
const actual = JSON.parse(mvt.toGeoJSONSync(0)).features;
assert.deepEqual(actual, expected);
assert.deepStrictEqual(actual, expected);
done();
});
});
@@ -104,8 +104,8 @@ describe_mvt('date-wrapping', () => {
it('should return dates as numbers for every layer', done => {
testClient.getLayergroup(function (err, layergroup) {
assert.ifError(err);
assert.deepEqual(layergroup.metadata.layers[0].meta.dates_as_numbers, ['date']);
assert.deepEqual(layergroup.metadata.layers[1].meta.dates_as_numbers, ['date']);
assert.deepStrictEqual(layergroup.metadata.layers[0].meta.dates_as_numbers, ['date']);
assert.deepStrictEqual(layergroup.metadata.layers[1].meta.dates_as_numbers, ['date']);
});
testClient.getTile(0, 0, 0, { format: 'mvt' }, (err, res, mvt) => {
@@ -140,8 +140,8 @@ describe_mvt('date-wrapping', () => {
const actual0 = JSON.parse(mvt.toGeoJSONSync(0)).features;
const actual1 = JSON.parse(mvt.toGeoJSONSync(1)).features;
assert.deepEqual(actual0, expected0);
assert.deepEqual(actual1, expected1);
assert.deepStrictEqual(actual0, expected0);
assert.deepStrictEqual(actual1, expected1);
done();
});
});
@@ -162,8 +162,8 @@ describe_mvt('date-wrapping', () => {
it('should return dates as numbers only for the layer with the "dates_as_numbers" flag enabled', done => {
testClient.getLayergroup(function (err, layergroup) {
assert.ifError(err);
assert.deepEqual(layergroup.metadata.layers[0].meta.dates_as_numbers || [], []);
assert.deepEqual(layergroup.metadata.layers[1].meta.dates_as_numbers, ['date']);
assert.deepStrictEqual(layergroup.metadata.layers[0].meta.dates_as_numbers || [], []);
assert.deepStrictEqual(layergroup.metadata.layers[1].meta.dates_as_numbers, ['date']);
});
testClient.getTile(0, 0, 0, { format: 'mvt' }, (err, res, mvt) => {
@@ -198,8 +198,8 @@ describe_mvt('date-wrapping', () => {
const actual0 = JSON.parse(mvt.toGeoJSONSync(0)).features;
const actual1 = JSON.parse(mvt.toGeoJSONSync(1)).features;
assert.deepEqual(actual0, expected0);
assert.deepEqual(actual1, expected1);
assert.deepStrictEqual(actual0, expected0);
assert.deepStrictEqual(actual1, expected1);
done();
});
});
@@ -220,8 +220,8 @@ describe_mvt('date-wrapping', () => {
it('should return dates as dates for both layers', done => {
testClient.getLayergroup(function (err, layergroup) {
assert.ifError(err);
assert.deepEqual(layergroup.metadata.layers[0].meta.dates_as_numbers || [], []);
assert.deepEqual(layergroup.metadata.layers[1].meta.dates_as_numbers || [], []);
assert.deepStrictEqual(layergroup.metadata.layers[0].meta.dates_as_numbers || [], []);
assert.deepStrictEqual(layergroup.metadata.layers[1].meta.dates_as_numbers || [], []);
});
testClient.getTile(0, 0, 0, { format: 'mvt' }, (err, res, mvt) => {
@@ -256,8 +256,8 @@ describe_mvt('date-wrapping', () => {
const actual0 = JSON.parse(mvt.toGeoJSONSync(0)).features;
const actual1 = JSON.parse(mvt.toGeoJSONSync(1)).features;
assert.deepEqual(actual0, expected0);
assert.deepEqual(actual1, expected1);
assert.deepStrictEqual(actual0, expected0);
assert.deepStrictEqual(actual1, expected1);
done();
});
});
@@ -282,7 +282,7 @@ describe_mvt('date-wrapping', () => {
it('should work', done => {
testClient.getLayergroup(function (err, layergroup) {
assert.ifError(err);
assert.deepEqual(layergroup.metadata.layers[0].meta.dates_as_numbers, ['date']);
assert.deepStrictEqual(layergroup.metadata.layers[0].meta.dates_as_numbers, ['date']);
done();
});
});
@@ -304,7 +304,7 @@ describe_mvt('date-wrapping', () => {
}
];
const actual = JSON.parse(mvt.toGeoJSONSync(0)).features;
assert.deepEqual(actual, expected);
assert.deepStrictEqual(actual, expected);
done();
});
});
test/acceptance/dynamic-styling-named-maps-test.js
+1 -1
View File
@@ -105,7 +105,7 @@ describe('dynamic styling for named maps', function () {
function checkTemplate (err, res) {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200);
assert.deepEqual(JSON.parse(res.body), {
assert.deepStrictEqual(JSON.parse(res.body), {
template_id: templateId
});
test/acceptance/errors-with-context-test.js
+1 -1
View File
@@ -67,7 +67,7 @@ describe('error with context', function () {
assert.strictEqual(err.type, 'layer');
assert.strictEqual(err.subtype, 'query');
assert.ok(err.message.indexOf(DB_ERROR_MESSAGE) >= 0);
assert.deepEqual(err.layer, scenario.expectedFailingLayer);
assert.deepStrictEqual(err.layer, scenario.expectedFailingLayer);
done();
});
});
test/acceptance/multilayer-server-test.js
+1 -1
View File
@@ -340,7 +340,7 @@ describe('tests from old api translated to multilayer', function () {
assert.ok(!res.headers.hasOwnProperty('x-cache-channel'));
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed.errors, ['fake error message']);
assert.deepStrictEqual(parsed.errors, ['fake error message']);
done();
}
test/acceptance/named-layers-test.js
+3 -3
View File
@@ -187,7 +187,7 @@ describe('named_layers', function () {
}
var parsedBody = JSON.parse(response.body);
assert.deepEqual(parsedBody.errors, ["Template 'nonexistent' of user 'localhost' not found"]);
assert.deepStrictEqual(parsedBody.errors, ["Template 'nonexistent' of user 'localhost' not found"]);
return null;
},
@@ -239,7 +239,7 @@ describe('named_layers', function () {
}
var parsedBody = JSON.parse(response.body);
assert.deepEqual(parsedBody.errors, ["Unauthorized 'auth_valid_template' template instantiation"]);
assert.deepStrictEqual(parsedBody.errors, ["Unauthorized 'auth_valid_template' template instantiation"]);
return null;
},
@@ -345,7 +345,7 @@ describe('named_layers', function () {
}
var parsedBody = JSON.parse(response.body);
assert.deepEqual(parsedBody.errors, ['Nested named layers are not allowed']);
assert.deepStrictEqual(parsedBody.errors, ['Nested named layers are not allowed']);
return null;
},
test/acceptance/named-maps-authentication-test.js
+4 -4
View File
@@ -173,7 +173,7 @@ describe('named maps authentication', function () {
var nonexistentName = 'nonexistent';
getNamedTile(nonexistentName, 0, 0, 0, { status: 404 }, function (err, res) {
assert.ok(!err);
assert.deepEqual(
assert.deepStrictEqual(
JSON.parse(res.body).errors,
["Template '" + nonexistentName + "' of user '" + username + "' not found"]
);
@@ -184,7 +184,7 @@ describe('named maps authentication', function () {
it('should return 403 if not properly authorized', function (done) {
getNamedTile(tokenAuthTemplateName, 0, 0, 0, { status: 403 }, function (err, res) {
assert.ok(!err);
assert.deepEqual(JSON.parse(res.body).errors, ['Unauthorized template instantiation']);
assert.deepStrictEqual(JSON.parse(res.body).errors, ['Unauthorized template instantiation']);
done();
});
});
@@ -241,7 +241,7 @@ describe('named maps authentication', function () {
var nonexistentName = 'nonexistent';
getStaticMap(nonexistentName, { status: 404 }, function (err, res) {
assert.ok(!err);
assert.deepEqual(
assert.deepStrictEqual(
JSON.parse(res.body).errors,
["Template '" + nonexistentName + "' of user '" + username + "' not found"]
);
@@ -252,7 +252,7 @@ describe('named maps authentication', function () {
it('should return 403 if not properly authorized', function (done) {
getStaticMap(tokenAuthTemplateName, { status: 403 }, function (err, res) {
assert.ok(!err);
assert.deepEqual(JSON.parse(res.body).errors, ['Unauthorized template instantiation']);
assert.deepStrictEqual(JSON.parse(res.body).errors, ['Unauthorized template instantiation']);
done();
});
});
test/acceptance/named-maps-cache-test.js
+1 -1
View File
@@ -176,7 +176,7 @@ describe('named maps provider cache', function () {
getNamedTile(templateId, { statusCode: 404 }, function (err, res) {
assert.ifError(err);
assert.deepEqual(
assert.deepStrictEqual(
JSON.parse(res.body).errors,
["Template 'template_with_color_black' of user 'localhost' not found"]
);
test/acceptance/named-maps-static-view-test.js
+1 -1
View File
@@ -327,7 +327,7 @@ describe('named maps static view', function () {
assert.response(server, requestOptions, expectedResponse, function (res, err) {
assert.ifError(err);
assert.deepEqual(
assert.deepStrictEqual(
JSON.parse(res.body),
{
errors: ['Unsupported image format \"gif\"'],
test/acceptance/overviews-metadata-named-maps-test.js
+3 -3
View File
@@ -83,7 +83,7 @@ describe('overviews metadata for named maps', function () {
var next = this;
assert.strictEqual(res.statusCode, 200);
assert.deepEqual(JSON.parse(res.body), {
assert.deepStrictEqual(JSON.parse(res.body), {
template_id: templateId
});
next(null);
@@ -133,7 +133,7 @@ describe('overviews metadata for named maps', function () {
});
mapStore.load(LayergroupToken.parse(layergroupId).token, function (err, mapConfig) {
assert.ifError(err);
assert.deepEqual(non_overviews_layer, mapConfig._cfg.layers[1]);
assert.deepStrictEqual(non_overviews_layer, mapConfig._cfg.layers[1]);
assert.strictEqual(mapConfig._cfg.layers[0].type, 'cartodb');
assert.ok(mapConfig._cfg.layers[0].options.query_rewrite_data);
var expected_data = {
@@ -145,7 +145,7 @@ describe('overviews metadata for named maps', function () {
}
}
};
assert.deepEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expected_data);
assert.deepStrictEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expected_data);
});
next(err);
test/acceptance/overviews-metadata-test.js
+3 -3
View File
@@ -88,7 +88,7 @@ describe('overviews metadata', function () {
});
mapStore.load(LayergroupToken.parse(expected_token).token, function (err, mapConfig) {
assert.ifError(err);
assert.deepEqual(non_overviews_layer, mapConfig._cfg.layers[1]);
assert.deepStrictEqual(non_overviews_layer, mapConfig._cfg.layers[1]);
assert.strictEqual(mapConfig._cfg.layers[0].type, 'cartodb');
assert.ok(mapConfig._cfg.layers[0].options.query_rewrite_data);
var expected_data = {
@@ -100,7 +100,7 @@ describe('overviews metadata', function () {
}
}
};
assert.deepEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expected_data);
assert.deepStrictEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expected_data);
});
next(err);
@@ -295,7 +295,7 @@ describe('overviews metadata with filters', function () {
unfiltered_query: 'select * from test_table_overviews',
filter_stats: { unfiltered_rows: 5, filtered_rows: 1 }
};
assert.deepEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expected_data);
assert.deepStrictEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expected_data);
});
next(err);
test/acceptance/ported/attributes-test.js
+4 -4
View File
@@ -80,7 +80,7 @@ describe('attributes', function () {
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
} else {
expected_token = parsedBody.layergroupid;
}
@@ -123,7 +123,7 @@ describe('attributes', function () {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200, res.statusCode + ': ' + res.body);
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed, { n: 6 });
assert.deepStrictEqual(parsed, { n: 6 });
return null;
},
function do_get_attr_1_404 (err) {
@@ -216,7 +216,7 @@ describe('attributes', function () {
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
} else {
expected_token = parsedBody.layergroupid;
}
@@ -263,7 +263,7 @@ describe('attributes', function () {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200, res.statusCode + ': ' + res.body);
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed, { n: 6 });
assert.deepStrictEqual(parsed, { n: 6 });
return null;
},
function finish (err) {
test/acceptance/ported/blend-http-fallback-test.js
+1 -1
View File
@@ -132,7 +132,7 @@ describe('blend http fallback', function () {
testClient.getTileLayer(mapConfig, tileRequest, expectedResponse, function (err, res) {
assert.ok(!err);
var parsedBody = JSON.parse(res.body);
assert.deepEqual(parsedBody.errors, [
assert.deepStrictEqual(parsedBody.errors, [
'Unable to fetch http tile: http://127.0.0.1:8033/error404/1/0/0.png [404]'
]);
done();
test/acceptance/ported/external-resources-test.js
+1 -1
View File
@@ -118,7 +118,7 @@ describe('external resources', function () {
var mapConfig = testClient.defaultTableMapConfig('test_table_3', style);
testClient.createLayergroup(mapConfig, { statusCode: 400 }, function (err, res) {
assert.deepEqual(JSON.parse(res.body).errors, [
assert.deepStrictEqual(JSON.parse(res.body).errors, [
"Unable to download '" + url + "' for 'style0' (server returned 404)"]
);
done();
test/acceptance/ported/limits-test.js
+1 -1
View File
@@ -40,7 +40,7 @@ describe.skip('render limits', function () {
serverOptions: serverOptions
};
testClient.createLayergroup(slowQueryMapConfig, options, function (err, res) {
assert.deepEqual(JSON.parse(res.body), { errors: ['Render timed out'] });
assert.deepStrictEqual(JSON.parse(res.body), { errors: ['Render timed out'] });
done();
});
});
test/acceptance/ported/multilayer-error-cases-test.js
+5 -5
View File
@@ -36,7 +36,7 @@ describe('multilayer error cases', function () {
}, {}, function (res) {
assert.strictEqual(res.statusCode, 400, res.body);
var parsedBody = JSON.parse(res.body);
assert.deepEqual(parsedBody.errors, ['POST data must be of type application/json']);
assert.deepStrictEqual(parsedBody.errors, ['POST data must be of type application/json']);
done();
});
});
@@ -52,7 +52,7 @@ describe('multilayer error cases', function () {
}, {}, function (res) {
assert.strictEqual(res.statusCode, 400, res.body);
var parsedBody = JSON.parse(res.body);
assert.deepEqual(parsedBody.errors, ['Missing layers array from layergroup config']);
assert.deepStrictEqual(parsedBody.errors, ['Missing layers array from layergroup config']);
done();
});
});
@@ -102,7 +102,7 @@ describe('multilayer error cases', function () {
}, {}, function (res) {
assert.strictEqual(res.statusCode, 400, res.body);
var parsedBody = JSON.parse(res.body);
assert.deepEqual(parsedBody.errors, ['Missing cartocss_version for layer 0 options']);
assert.deepStrictEqual(parsedBody.errors, ['Missing cartocss_version for layer 0 options']);
done();
});
});
@@ -393,7 +393,7 @@ describe('multilayer error cases', function () {
var mapConfig = testClient.singleLayerMapConfig('select * from test_table', null, null, 'name');
testClient.getGrid(mapConfig, 1, 13, 4011, 3088, defaultErrorExpectedResponse, function (err, res) {
assert.deepEqual(JSON.parse(res.body).errors, ["Layer '1' not found in layergroup"]);
assert.deepStrictEqual(JSON.parse(res.body).errors, ["Layer '1' not found in layergroup"]);
done();
});
});
@@ -423,7 +423,7 @@ describe('multilayer error cases', function () {
// FIXME: should be 404
assert.strictEqual(res.statusCode, 400, res.statusCode + ':' + res.body);
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed.errors, ["Invalid or nonexistent map configuration token 'deadbeef'"]);
assert.deepStrictEqual(parsed.errors, ["Invalid or nonexistent map configuration token 'deadbeef'"]);
return null;
},
function finish (err) {
test/acceptance/ported/multilayer-test.js
+7 -7
View File
@@ -176,7 +176,7 @@ describe('multilayer', function () {
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
} else {
expected_token = LayergroupToken.parse(parsedBody.layergroupid).token;
}
@@ -290,7 +290,7 @@ describe('multilayer', function () {
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
} else {
expected_token = LayergroupToken.parse(parsedBody.layergroupid).token;
}
@@ -615,7 +615,7 @@ describe('multilayer', function () {
assert.strictEqual(res.statusCode, 200, res.body);
assert.strictEqual(res.headers['content-type'], 'application/json; charset=utf-8');
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed, { n: 40 });
assert.deepStrictEqual(parsed, { n: 40 });
return null;
},
function do_get_torque2 (err) {
@@ -632,8 +632,8 @@ describe('multilayer', function () {
assert.strictEqual(res.statusCode, 200, res.body);
assert.strictEqual(res.headers['content-type'], 'application/json; charset=utf-8');
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed[0].vals__uint8, [1]);
assert.deepEqual(parsed[0].dates__uint16, [0]);
assert.deepStrictEqual(parsed[0].vals__uint8, [1]);
assert.deepStrictEqual(parsed[0].dates__uint16, [0]);
assert.strictEqual(parsed[0].x__uint8, 128);
assert.strictEqual(parsed[0].y__uint8, 128);
return null;
@@ -860,7 +860,7 @@ describe('multilayer', function () {
assert.strictEqual(res.statusCode, 200, res.body);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepEqual(parsedBody, { layergroupid: expected_token, layercount: 3 });
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 3 });
} else {
expected_token = LayergroupToken.parse(parsedBody.layergroupid).token;
}
@@ -1079,7 +1079,7 @@ describe('multilayer', function () {
assert.strictEqual(res.statusCode, 200, res.body);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepEqual(parsedBody, { layergroupid: expected_token, layercount: 3 });
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 3 });
} else {
expected_token = LayergroupToken.parse(parsedBody.layergroupid).token;
}
test/acceptance/ported/raster-test.js
+3 -3
View File
@@ -63,7 +63,7 @@ describe('raster', function () {
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
} else {
expected_token = parsedBody.layergroupid;
}
@@ -82,7 +82,7 @@ describe('raster', function () {
function check_response (err, res) {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200, res.body);
assert.deepEqual(res.headers['content-type'], 'image/png');
assert.deepStrictEqual(res.headers['content-type'], 'image/png');
var next = this;
assert.imageBufferIsSimilarToFile(res.body,
'./test/fixtures/raster_gray_rect.png',
@@ -145,7 +145,7 @@ describe('raster', function () {
assert.ok(!err);
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
assert.deepEqual(parsedBody.errors, ['Mapnik raster layers do not support interactivity']);
assert.deepStrictEqual(parsedBody.errors, ['Mapnik raster layers do not support interactivity']);
done();
}
);
test/acceptance/ported/retina-test.js
+1 -1
View File
@@ -124,7 +124,7 @@ describe('retina support', function () {
},
function (res, err) {
assert.ok(!err, 'Failed to request 0/0/0' + scaleFactor + '.png tile');
assert.deepEqual(JSON.parse(res.body).errors, ['Tile with specified resolution not found']);
assert.deepStrictEqual(JSON.parse(res.body).errors, ['Tile with specified resolution not found']);
done();
}
test/acceptance/ported/server-test.js
+6 -6
View File
@@ -68,7 +68,7 @@ describe('server', function () {
var mapConfig = testClient.singleLayerMapConfig('select * from test_table', null, null, 'name');
testClient.getGridJsonp(mapConfig, 0, 13, 4011, 3088, 'jsonp_test', function (err, res) {
assert.strictEqual(res.statusCode, 200, res.body);
assert.deepEqual(res.headers['content-type'], 'text/javascript; charset=utf-8');
assert.deepStrictEqual(res.headers['content-type'], 'text/javascript; charset=utf-8');
var didRunJsonCallback = false;
var response = {};
// jshint ignore:start
@@ -93,7 +93,7 @@ describe('server', function () {
4: { name: 'El Lacón' },
5: { name: 'El Pico' }
};
assert.deepEqual(JSON.parse(res.body).data, expected_json);
assert.deepStrictEqual(JSON.parse(res.body).data, expected_json);
done();
});
});
@@ -107,7 +107,7 @@ describe('server', function () {
}
};
testClient.getGrid(mapConfig, 0, 13, 4011, 3088, expectedResponse, function (err, res) {
assert.deepEqual(JSON.parse(res.body).errors, ['Tileset has no interactivity']);
assert.deepStrictEqual(JSON.parse(res.body).errors, ['Tileset has no interactivity']);
done();
});
});
@@ -151,12 +151,12 @@ describe('server', function () {
var mapConfigName = testClient.singleLayerMapConfig(query, style211, null, 'name');
testClient.getGrid(mapConfigName, 0, 3, 2, 2, function (err, res) {
var expected_data = { 1: { name: 'west' } };
assert.deepEqual(JSON.parse(res.body).data, expected_data);
assert.deepStrictEqual(JSON.parse(res.body).data, expected_data);
var mapConfigCartodbId = testClient.singleLayerMapConfig(query, style211, null, 'cartodb_id');
testClient.getGrid(mapConfigCartodbId, 0, 3, 2, 2, function (err, res) {
var expected_data = { 1: { cartodb_id: '1' } };
assert.deepEqual(JSON.parse(res.body).data, expected_data);
var expected_data = { 1: { cartodb_id: 1 } };
assert.deepStrictEqual(JSON.parse(res.body).data, expected_data);
done();
});
});
test/acceptance/ported/torque-boundaries-test.js
+2 -2
View File
@@ -384,7 +384,7 @@ describe('torque boundary points', function () {
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed, [{
assert.deepStrictEqual(parsed, [{
x__uint8: 255,
y__uint8: 172,
vals__uint8: [1],
@@ -452,7 +452,7 @@ describe('torque boundary points', function () {
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed.sort(function (a, b) { return a.x__uint8 > b.x__uint8; }), [
assert.deepStrictEqual(parsed.sort(function (a, b) { return a.x__uint8 > b.x__uint8; }), [
{
x__uint8: 47,
y__uint8: 127,
test/acceptance/ported/torque-test.js
+3 -3
View File
@@ -200,7 +200,7 @@ describe('torque', function () {
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
} else {
expected_token = parsedBody.layergroupid;
}
@@ -276,7 +276,7 @@ describe('torque', function () {
assert.strictEqual(res.headers['content-type'], 'application/json; charset=utf-8');
var tile_content = [{ x__uint8: 43, y__uint8: 43, vals__uint8: [1, 1], dates__uint16: [0, 1] }];
var parsed = JSON.parse(res.body);
assert.deepEqual(tile_content, parsed);
assert.deepStrictEqual(tile_content, parsed);
return null;
},
function do_get_torque0_1 (err) {
@@ -296,7 +296,7 @@ describe('torque', function () {
assert.strictEqual(res.headers['content-type'], 'application/json; charset=utf-8');
var tile_content = [{ x__uint8: 43, y__uint8: 43, vals__uint8: [1, 1], dates__uint16: [0, 1] }];
var parsed = JSON.parse(res.body);
assert.deepEqual(tile_content, parsed);
assert.deepStrictEqual(tile_content, parsed);
return null;
},
function finish (err) {
test/acceptance/ported/torque-zero-zero-test.js
+2 -2
View File
@@ -79,10 +79,10 @@ describe('torque tiles at 0,0 point', function () {
testClient.getTorque(mapConfig, 0, 3, tile.x, tile.y, function (err, res) {
assert.ok(!err, err);
try {
assert.deepEqual(JSON.parse(res.body), tile.expects);
assert.deepStrictEqual(JSON.parse(res.body), tile.expects);
} catch (ex) {
// With Proj 5.1 this bug has been fixed and the point appears in all tiles
assert.deepEqual(JSON.parse(res.body), tile.expects_fixed);
assert.deepStrictEqual(JSON.parse(res.body), tile.expects_fixed);
}
done();
});
test/acceptance/rate-limit-test.js
+1 -1
View File
@@ -140,7 +140,7 @@ function assertRateLimitRequest (status, limit, remaining, reset, retry, done) {
expectedHeaders['Retry-After'] = retry;
}
assert.deepEqual(res.headers, expectedHeaders);
assert.deepStrictEqual(res.headers, expectedHeaders);
if (status === 200) {
assert.ifError(err);
test/acceptance/regressions-test.js
+1 -1
View File
@@ -207,7 +207,7 @@ describe('regressions', function () {
assert.strictEqual(dataview.type, 'aggregation');
assert.strictEqual(dataview.categories.length, 1);
assert.deepEqual(dataview.categories[0], { value: 256, category: 'CAN', agg: false });
assert.deepStrictEqual(dataview.categories[0], { value: 256, category: 'CAN', agg: false });
testClient.drain(done);
});
test/acceptance/stats/mapnik-stats-layergroup-test.js
+4 -4
View File
@@ -354,7 +354,7 @@ suites.forEach(({ desc, usePostGIS }) => {
the_geom_webmercator: { type: 'geometry' },
address: { type: 'string' }
};
assert.deepEqual(layergroup.metadata.layers[0].meta.stats.columns, expectedColumns);
assert.deepStrictEqual(layergroup.metadata.layers[0].meta.stats.columns, expectedColumns);
testClient.drain(done);
});
});
@@ -435,7 +435,7 @@ suites.forEach(({ desc, usePostGIS }) => {
]
}
};
assert.deepEqual(
assert.deepStrictEqual(
withSortedCategories(layergroup.metadata.layers[0].meta.stats.columns),
withSortedCategories(expectedColumns)
);
@@ -578,7 +578,7 @@ suites.forEach(({ desc, usePostGIS }) => {
assert.strictEqual(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 100);
assert(layergroup.metadata.layers[0].meta.stats.sample.length > 0);
const expectedCols = ['cartodb_id', 'value', 'the_geom', 'the_geom_webmercator'].sort();
assert.deepEqual(Object.keys(layergroup.metadata.layers[0].meta.stats.sample[0]).sort(), expectedCols);
assert.deepStrictEqual(Object.keys(layergroup.metadata.layers[0].meta.stats.sample[0]).sort(), expectedCols);
testClient.drain(done);
});
});
@@ -629,7 +629,7 @@ suites.forEach(({ desc, usePostGIS }) => {
assert.strictEqual(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 100);
assert(layergroup.metadata.layers[0].meta.stats.sample.length > 0);
const expectedCols = ['cartodb_id', 'the_geom'].sort();
assert.deepEqual(Object.keys(layergroup.metadata.layers[0].meta.stats.sample[0]).sort(), expectedCols);
assert.deepStrictEqual(Object.keys(layergroup.metadata.layers[0].meta.stats.sample[0]).sort(), expectedCols);
testClient.drain(done);
});
});
test/acceptance/templates-test.js
+6 -6
View File
@@ -140,7 +140,7 @@ describe('template_api', function () {
assert.strictEqual(res.statusCode, 200, res.body);
var parsedBody = JSON.parse(res.body);
var expectedBody = { template_id: expected_tpl_id };
assert.deepEqual(parsedBody, expectedBody);
assert.deepStrictEqual(parsedBody, expectedBody);
keysToDelete['map_tpl|localhost'] = 0;
@@ -594,7 +594,7 @@ describe('template_api', function () {
var parsed = JSON.parse(res.body);
assert.ok(parsed.hasOwnProperty('template'),
"Missing 'template' from response body: " + res.body);
assert.deepEqual(extendDefaultsTemplate(makeTemplate()), parsed.template);
assert.deepStrictEqual(extendDefaultsTemplate(makeTemplate()), parsed.template);
keysToDelete['map_tpl|localhost'] = 0;
@@ -639,7 +639,7 @@ describe('template_api', function () {
var parsed = JSON.parse(res.body);
assert.ok(parsed.hasOwnProperty('template'),
"Missing 'template' from response body: " + res.body);
assert.deepEqual(extendDefaultsTemplate(makeTemplate()), parsed.template);
assert.deepStrictEqual(extendDefaultsTemplate(makeTemplate()), parsed.template);
var del_request = {
url: '/api/v1/map/named/' + tpl_id,
method: 'DELETE',
@@ -1771,7 +1771,7 @@ describe('template_api', function () {
if (err) {
throw err;
}
assert.deepEqual(JSON.parse(res.body), { template_id: expectedTemplateId });
assert.deepStrictEqual(JSON.parse(res.body), { template_id: expectedTemplateId });
var next = this;
assert.response(
server,
@@ -1887,7 +1887,7 @@ describe('template_api', function () {
if (err) {
return done(err);
}
assert.deepEqual(JSON.parse(res.body).errors,
assert.deepStrictEqual(JSON.parse(res.body).errors,
["Invalid or nonexistent map configuration token '" + nonexistentToken + "'"]);
done();
@@ -2041,7 +2041,7 @@ describe('template_api', function () {
keysToDelete['map_tpl|localhost'] = 0;
keysToDelete['user:localhost:mapviews:global'] = 5;
assert.deepEqual(
assert.deepStrictEqual(
JSON.parse(res.body),
scenario.expectedTile
);
test/acceptance/tilejson-test.js
+10 -10
View File
@@ -80,7 +80,7 @@ function tileJsonSuite (usePostGIS) {
assert.strictEqual(metadata.layers.length, 1);
const layer = metadata.layers[0];
assert.deepEqual(Object.keys(layer.tilejson), ['vector', 'raster']);
assert.deepStrictEqual(Object.keys(layer.tilejson), ['vector', 'raster']);
Object.keys(layer.tilejson).forEach(k => {
tilejsonValidation(layer.tilejson[k]);
@@ -101,7 +101,7 @@ function tileJsonSuite (usePostGIS) {
assert.strictEqual(metadata.layers.length, 1);
const layer = metadata.layers[0];
assert.deepEqual(Object.keys(layer.tilejson), ['vector']);
assert.deepStrictEqual(Object.keys(layer.tilejson), ['vector']);
Object.keys(layer.tilejson).forEach(k => {
tilejsonValidation(layer.tilejson[k]);
@@ -122,7 +122,7 @@ function tileJsonSuite (usePostGIS) {
assert.strictEqual(metadata.layers.length, 1);
const layer = metadata.layers[0];
assert.deepEqual(Object.keys(layer.tilejson), ['raster']);
assert.deepStrictEqual(Object.keys(layer.tilejson), ['raster']);
Object.keys(layer.tilejson).forEach(k => {
tilejsonValidation(layer.tilejson[k]);
@@ -143,7 +143,7 @@ function tileJsonSuite (usePostGIS) {
assert.strictEqual(metadata.layers.length, 1);
const layer = metadata.layers[0];
assert.deepEqual(Object.keys(layer.tilejson), ['vector', 'raster']);
assert.deepStrictEqual(Object.keys(layer.tilejson), ['vector', 'raster']);
tilejsonValidation(layer.tilejson.vector);
tilejsonValidation(layer.tilejson.raster, true);
@@ -162,11 +162,11 @@ function tileJsonSuite (usePostGIS) {
assert.strictEqual(metadata.layers.length, 2);
assert.deepEqual(Object.keys(metadata.layers[0].tilejson), ['vector', 'raster']);
assert.deepStrictEqual(Object.keys(metadata.layers[0].tilejson), ['vector', 'raster']);
tilejsonValidation(metadata.layers[0].tilejson.vector);
tilejsonValidation(metadata.layers[0].tilejson.raster);
assert.deepEqual(Object.keys(metadata.layers[1].tilejson), ['vector', 'raster']);
assert.deepStrictEqual(Object.keys(metadata.layers[1].tilejson), ['vector', 'raster']);
tilejsonValidation(metadata.layers[1].tilejson.vector);
tilejsonValidation(metadata.layers[1].tilejson.raster, true);
@@ -185,14 +185,14 @@ function tileJsonSuite (usePostGIS) {
assert.ok(metadata);
const tilejson = metadata.tilejson;
assert.deepEqual(Object.keys(tilejson), ['vector']);
assert.deepStrictEqual(Object.keys(tilejson), ['vector']);
Object.keys(tilejson).forEach(k => {
tilejsonValidation(tilejson[k]);
});
const url = metadata.url;
assert.deepEqual(Object.keys(url), ['vector']);
assert.deepStrictEqual(Object.keys(url), ['vector']);
assert.ok(url.vector.urlTemplate);
assert.ok(url.vector.subdomains);
@@ -210,14 +210,14 @@ function tileJsonSuite (usePostGIS) {
assert.ok(metadata);
const tilejson = metadata.tilejson;
assert.deepEqual(Object.keys(tilejson), ['vector', 'raster']);
assert.deepStrictEqual(Object.keys(tilejson), ['vector', 'raster']);
Object.keys(tilejson).forEach(k => {
tilejsonValidation(tilejson[k]);
});
const url = metadata.url;
assert.deepEqual(Object.keys(url), ['vector', 'raster']);
assert.deepStrictEqual(Object.keys(url), ['vector', 'raster']);
assert.ok(url.vector.urlTemplate);
assert.ok(url.vector.subdomains);
test/acceptance/turbo-carto/error-cases-test.js
+1 -1
View File
@@ -127,7 +127,7 @@ describe('turbo-carto error cases', function () {
assert.strictEqual(layergroup.errors_with_context[0].layer.type, 'mapnik');
assert.strictEqual(layergroup.errors_with_context[0].layer.context.selector, '#populated_places_simple_reduced');
assert.deepEqual(layergroup.errors_with_context[0].layer.context.source, {
assert.deepStrictEqual(layergroup.errors_with_context[0].layer.context.source, {
start: {
line: 10,
column: 3
test/acceptance/turbo-carto/named-maps-test.js
+1 -1
View File
@@ -104,7 +104,7 @@ describe('turbo-carto for named maps', function () {
function checkTemplate (err, res) {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200);
assert.deepEqual(JSON.parse(res.body), {
assert.deepStrictEqual(JSON.parse(res.body), {
template_id: templateId
});
test/acceptance/turbo-carto/regressions-test.js
+2 -2
View File
@@ -373,7 +373,7 @@ describe('turbo-carto regressions', function () {
assert.ok(!err, err);
assert.ok(layergroup.hasOwnProperty('layergroupid'));
assert.deepEqual(layergroup.metadata.layers[0].meta.cartocss, scenario.expected);
assert.deepStrictEqual(layergroup.metadata.layers[0].meta.cartocss, scenario.expected);
done();
});
@@ -465,7 +465,7 @@ describe('turbo-carto regressions', function () {
assert.ok(!err, err);
assert.strictEqual(rule.buckets.length, scenario.numBuckets);
assert.deepEqual(rule.buckets, scenario.bucketResponse);
assert.deepStrictEqual(rule.buckets, scenario.bucketResponse);
done();
});
test/acceptance/user-database-timeout-limit-test.js
+12 -12
View File
@@ -124,7 +124,7 @@ describe('user database timeout limit', function () {
this.testClient.getDataview('count', params, (err, timeoutError) => {
assert.ifError(err);
assert.deepEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
assert.deepStrictEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
done();
});
@@ -157,7 +157,7 @@ describe('user database timeout limit', function () {
};
this.testClient.getLayergroup({ response: expectedResponse }, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
assert.deepStrictEqual(timeoutError, {
errors: [db_limit_error_message],
errors_with_context: [{
type: 'limit',
@@ -317,7 +317,7 @@ describe('user database timeout limit', function () {
this.testClient.getTile(0, 0, 0, params, (err, res, timeoutError) => {
assert.ifError(err);
assert.deepEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
assert.deepStrictEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
done();
});
@@ -343,7 +343,7 @@ describe('user database timeout limit', function () {
this.testClient.getStaticCenter(params, (err, res, timeoutError) => {
assert.ifError(err);
assert.deepEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
assert.deepStrictEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
done();
});
@@ -379,7 +379,7 @@ describe('user database timeout limit', function () {
};
this.testClient.getLayergroup({ response: expectedResponse }, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
assert.deepStrictEqual(timeoutError, {
errors: [db_limit_error_message],
errors_with_context: [{
type: 'limit',
@@ -497,7 +497,7 @@ describe('user database timeout limit', function () {
};
this.testClient.getLayergroup({ response: expectedResponse }, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
assert.deepStrictEqual(timeoutError, {
errors: [db_limit_error_message],
errors_with_context: [{
type: 'limit',
@@ -563,7 +563,7 @@ describe('user database timeout limit', function () {
this.testClient.getTile(0, 0, 0, params, (err, res, timeoutError) => {
assert.ifError(err);
assert.deepEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
assert.deepStrictEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
done();
});
@@ -601,7 +601,7 @@ describe('user database timeout limit', function () {
};
this.testClient.getLayergroup({ response: expectedResponse }, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
assert.deepStrictEqual(timeoutError, {
errors: [db_limit_error_message],
errors_with_context: [{
type: 'limit',
@@ -670,7 +670,7 @@ describe('user database timeout limit', function () {
this.testClient.getTile(0, 0, 0, params, (err, res, timeoutError) => {
assert.ifError(err);
assert.deepEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
assert.deepStrictEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
done();
});
@@ -692,7 +692,7 @@ describe('user database timeout limit', function () {
this.testClient.getTile(0, 0, 0, params, (err, res, attributes) => {
assert.ifError(err);
assert.deepEqual(attributes, DATASOURCE_TIMEOUT_ERROR);
assert.deepStrictEqual(attributes, DATASOURCE_TIMEOUT_ERROR);
done();
});
@@ -732,7 +732,7 @@ describe('user database timeout limit', function () {
};
this.testClient.getLayergroup({ response: expectedResponse }, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
assert.deepStrictEqual(timeoutError, {
errors: [db_limit_error_message],
errors_with_context: [{
type: 'limit',
@@ -809,7 +809,7 @@ describe('user database timeout limit', function () {
this.testClient.getAttributes(params, (err, res, timeoutError) => {
assert.ifError(err);
assert.deepEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
assert.deepStrictEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
done();
});
test/acceptance/user-render-timeout-limit-test.js
+4 -4
View File
@@ -100,7 +100,7 @@ describe('user render timeout limit', function () {
this.testClient.getLayergroup({ response: expectedResponse }, (err, timeoutError) => {
assert.ifError(err);
assert.deepEqual(timeoutError, {
assert.deepStrictEqual(timeoutError, {
errors: [renderTimeoutErrorMessage],
errors_with_context: [{
type: 'limit',
@@ -210,7 +210,7 @@ describe('user render timeout limit', function () {
this.testClient.getTile(0, 0, 0, params, (err, res, timeoutError) => {
assert.ifError(err);
assert.deepEqual(timeoutError, {
assert.deepStrictEqual(timeoutError, {
errors: [renderTimeoutErrorMessage],
errors_with_context: [{
type: 'limit',
@@ -318,7 +318,7 @@ describe('user render timeout limit', function () {
this.testClient.getTile(0, 0, 0, params, (err, res, tile) => {
assert.ifError(err);
assert.deepEqual(tile, {
assert.deepStrictEqual(tile, {
errors: [renderTimeoutErrorMessage],
errors_with_context: [{
type: 'limit',
@@ -434,7 +434,7 @@ describe('user render timeout limit', function () {
this.testClient.getStaticCenter(params, function (err, res, timeoutError) {
assert.ifError(err);
assert.deepEqual(timeoutError, {
assert.deepStrictEqual(timeoutError, {
errors: [renderTimeoutErrorMessage],
errors_with_context: [{
type: 'limit',
test/acceptance/vector-layergroup-test.js
+2 -2
View File
@@ -187,7 +187,7 @@ suites.forEach((suite) => {
return done(err);
}
assert.deepEqual(body, INVALID_FORMAT_ERROR);
assert.deepStrictEqual(body, INVALID_FORMAT_ERROR);
done();
});
});
@@ -211,7 +211,7 @@ suites.forEach((suite) => {
return done(err);
}
assert.deepEqual(body, INCOMPATIBLE_LAYERS_ERROR);
assert.deepStrictEqual(body, INCOMPATIBLE_LAYERS_ERROR);
done();
});
test/acceptance/widgets/aggregation-test.js
+2 -2
View File
@@ -38,7 +38,7 @@ describe('aggregation widgets', function () {
var aggregation = JSON.parse(res.body);
assert.strictEqual(aggregation.categories.length, 6);
assert.deepEqual(aggregation.categories[0], { value: 769, category: 'USA', agg: false });
assert.deepStrictEqual(aggregation.categories[0], { value: 769, category: 'USA', agg: false });
testClient.drain(done);
});
@@ -62,7 +62,7 @@ describe('aggregation widgets', function () {
var aggregation = JSON.parse(res.body);
assert.strictEqual(aggregation.categories.length, 1);
assert.deepEqual(aggregation.categories[0], { value: 256, category: 'CAN', agg: false });
assert.deepStrictEqual(aggregation.categories[0], { value: 256, category: 'CAN', agg: false });
testClient.drain(done);
});
test/acceptance/widgets/histogram-test.js
+3 -3
View File
@@ -76,7 +76,7 @@ describe('histogram widgets', function () {
var histogram = JSON.parse(res.body);
// notice min value
assert.deepEqual(
assert.deepStrictEqual(
histogram.bins[0],
{ bin: 0, freq: 6497, min: 0, max: 742572, avg: 113511.16823149147 }
);
@@ -103,7 +103,7 @@ describe('histogram widgets', function () {
var histogram = JSON.parse(res.body);
// notice min value
assert.deepEqual(histogram.bins[0], {
assert.deepStrictEqual(histogram.bins[0], {
bin: 0,
freq: 62,
min: 4000000,
@@ -131,7 +131,7 @@ describe('histogram widgets', function () {
var histogram = JSON.parse(res.body);
// notice min value
assert.deepEqual(histogram.bins[0], {
assert.deepStrictEqual(histogram.bins[0], {
bin: 0,
freq: 62,
min: 4000000,
test/acceptance/widgets/named-maps-test.js
+1 -1
View File
@@ -97,7 +97,7 @@ describe('named-maps widgets', function () {
function instantiateTemplate (err, res) {
assert.ifError(err);
assert.deepEqual(JSON.parse(res.body), { template_id: widgetsTemplateName });
assert.deepStrictEqual(JSON.parse(res.body), { template_id: widgetsTemplateName });
var next = this;
assert.response(
server,
test/acceptance/widgets/ported/aggregation-test.js
+10 -10
View File
@@ -47,12 +47,12 @@ describe('widgets', function () {
assert.strictEqual(aggregation.categories.length, 6);
assert.deepEqual(
assert.deepStrictEqual(
aggregation.categories[0],
{ category: 'United States of America', value: 769, agg: false }
);
assert.deepEqual(
assert.deepStrictEqual(
aggregation.categories[aggregation.categories.length - 1],
{ category: 'Other', value: 4914, agg: true }
);
@@ -106,7 +106,7 @@ describe('widgets', function () {
}, {});
Object.keys(categoriesByCategory).forEach(function (category) {
assert.deepEqual(categoriesByCategory[category], scenarioByCategory[category]);
assert.deepStrictEqual(categoriesByCategory[category], scenarioByCategory[category]);
});
done();
@@ -147,12 +147,12 @@ describe('widgets', function () {
assert.strictEqual(aggregation.categories.length, 6);
assert.deepEqual(
assert.deepStrictEqual(
aggregation.categories[0],
{ category: 'China', value: 374537585, agg: false }
);
assert.deepEqual(
assert.deepStrictEqual(
aggregation.categories[aggregation.categories.length - 1],
{ category: 'Other', value: 1412626289, agg: true }
);
@@ -205,7 +205,7 @@ describe('widgets', function () {
}, {});
Object.keys(categoriesByCategory).forEach(function (category) {
assert.deepEqual(categoriesByCategory[category], scenarioByCategory[category]);
assert.deepStrictEqual(categoriesByCategory[category], scenarioByCategory[category]);
});
done();
@@ -256,7 +256,7 @@ describe('widgets', function () {
assert.strictEqual(aggregation.type, 'aggregation');
assert.strictEqual(aggregation.categories.length, 1);
assert.deepEqual(aggregation.categories[0], { category: '1', value: 179, agg: false });
assert.deepStrictEqual(aggregation.categories[0], { category: 1, value: 179, agg: false });
done();
});
@@ -292,7 +292,7 @@ describe('widgets', function () {
assert.strictEqual(searchResult.type, 'aggregation');
assert.strictEqual(searchResult.categories.length, 2);
assert.deepEqual(
assert.deepStrictEqual(
searchResult.categories,
[{ category: 10, value: 515 }, { category: 1, value: 179 }]
);
@@ -312,7 +312,7 @@ describe('widgets', function () {
assert.strictEqual(searchResult.type, 'aggregation');
assert.strictEqual(searchResult.categories.length, 1);
assert.deepEqual(
assert.deepStrictEqual(
searchResult.categories,
[{ category: 'Argentina', value: 159 }]
);
@@ -331,7 +331,7 @@ describe('widgets', function () {
assert.strictEqual(searchResult.type, 'aggregation');
assert.strictEqual(searchResult.categories.length, 1);
assert.deepEqual(
assert.deepStrictEqual(
searchResult.categories,
[{ category: 'Argentina', value: 28015640 }]
);
test/acceptance/widgets/ported/histogram-test.js
+6 -6
View File
@@ -55,7 +55,7 @@ describe('widgets', function () {
assert.ok(histogram.bins.length);
assert.deepEqual(histogram.bins[0], { bin: 0, freq: 179, min: 1, max: 1, avg: 1 });
assert.deepStrictEqual(histogram.bins[0], { bin: 0, freq: 179, min: 1, max: 1, avg: 1 });
done();
});
@@ -71,7 +71,7 @@ describe('widgets', function () {
assert.ok(histogram.bins.length);
assert.deepEqual(
assert.deepStrictEqual(
histogram.bins[histogram.bins.length - 1],
{ bin: 47, freq: 1, min: 35676000, max: 35676000, avg: 35676000 }
);
@@ -102,7 +102,7 @@ describe('widgets', function () {
assert.ok(histogram.bins.length);
assert.deepEqual(
assert.deepStrictEqual(
histogram.bins[histogram.bins.length - 1],
{ bin: 7, min: 8829000, max: 9904000, avg: 9340914.714285715, freq: 7 }
);
@@ -140,7 +140,7 @@ describe('widgets', function () {
assert.strictEqual(histogram.type, 'histogram');
validateHistogramBins(histogram);
assert.ok(histogram.bins.length);
assert.deepEqual(
assert.deepStrictEqual(
histogram.bins[histogram.bins.length - 1],
{ bin: 19, freq: 1, min: 35676000, max: 35676000, avg: 35676000 }
);
@@ -172,11 +172,11 @@ describe('widgets', function () {
validateHistogramBins(histogram);
assert.ok(histogram.bins.length);
assert.deepEqual(
assert.deepStrictEqual(
histogram.bins[0],
{ bin: 0, min: 0, max: 7067423, avg: 280820.0057731959, freq: 7275 }
);
assert.deepEqual(
assert.deepStrictEqual(
histogram.bins[histogram.bins.length - 1],
{ bin: 4, freq: 1, min: 35676000, max: 35676000, avg: 35676000 }
);
test/acceptance/widgets/regressions-test.js
+5 -5
View File
@@ -56,12 +56,12 @@ describe('widgets-regressions', function () {
assert.strictEqual(aggregation.categories.length, 6);
assert.deepEqual(
assert.deepStrictEqual(
aggregation.categories[0],
{ category: 'China', value: 374537585, agg: false }
);
assert.deepEqual(
assert.deepStrictEqual(
aggregation.categories[aggregation.categories.length - 1],
{ category: 'Other', value: 1412626289, agg: true }
);
@@ -154,7 +154,7 @@ describe('widgets-regressions', function () {
assert.strictEqual(metadata.layers.length, 3);
assert.strictEqual(metadata.analyses.length, 2);
assert.strictEqual(Object.keys(metadata.dataviews).length, 4);
assert.deepEqual(
assert.deepStrictEqual(
Object.keys(metadata.dataviews),
['wadus', 'adm0name_categories', 'adm1name_categories', 'pop_max_histogram']
);
@@ -203,12 +203,12 @@ describe('widgets-regressions', function () {
assert.strictEqual(aggregation.categories.length, 6);
assert.deepEqual(
assert.deepStrictEqual(
aggregation.categories[0],
{ category: 'China', value: 374537585, agg: false }
);
assert.deepEqual(
assert.deepStrictEqual(
aggregation.categories[aggregation.categories.length - 1],
{ category: 'Other', value: 1412626289, agg: true }
);
test/acceptance/widgets/widgets-test.js
+4 -4
View File
@@ -55,7 +55,7 @@ describe('widget filters', function () {
var aggregation = JSON.parse(res.body);
// first one would be CHN if reject filter wasn't applied
assert.deepEqual(aggregation.categories[0], { value: 769, category: 'USA', agg: false });
assert.deepStrictEqual(aggregation.categories[0], { value: 769, category: 'USA', agg: false });
// confirm 'CHN' was filtered out (reject)
assert.strictEqual(aggregation.categories.reduce(function (sum, row) {
@@ -86,7 +86,7 @@ describe('widget filters', function () {
var aggregation = JSON.parse(res.body);
// first one would be CHN if reject filter wasn't applied
assert.deepEqual(aggregation.categories[0], { value: 4, category: 'IND', agg: false });
assert.deepStrictEqual(aggregation.categories[0], { value: 4, category: 'IND', agg: false });
// confirm 'CHN' was filtered out (reject)
assert.strictEqual(aggregation.categories.reduce(function (sum, row) {
@@ -117,7 +117,7 @@ describe('widget filters', function () {
var aggregation = JSON.parse(res.body);
// first one would be CHN if reject filter wasn't applied
assert.deepEqual(aggregation.categories[0], { value: 96, category: 'RUS', agg: false });
assert.deepStrictEqual(aggregation.categories[0], { value: 96, category: 'RUS', agg: false });
// confirm 'CHN' was filtered out (reject)
assert.strictEqual(aggregation.categories.reduce(function (sum, row) {
@@ -149,7 +149,7 @@ describe('widget filters', function () {
var aggregation = JSON.parse(res.body);
// first one would be CHN if reject filter wasn't applied
assert.deepEqual(aggregation.categories[0], { value: 77, category: 'TUR', agg: false });
assert.deepStrictEqual(aggregation.categories[0], { value: 77, category: 'TUR', agg: false });
// confirm 'CHN' was filtered out (reject)
assert.strictEqual(aggregation.categories.reduce(function (sum, row) {