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

camel case

Browse Source
This commit is contained in:
Daniel García Aubert
2019-11-13 20:05:19 +01:00
parent 2c8a030ecb
commit 97f4adbc1a
7 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/overviews-metadata-test.js
+41 -41
View File
@@ -1,6 +1,6 @@
'use strict';
var test_helper = require('../support/test-helper');
var testHelper = require('../support/test-helper');
var assert = require('../support/assert');
var CartodbWindshaft = require('../../lib/server');
@@ -24,7 +24,7 @@ describe('overviews metadata', function () {
// configure redis pool instance to use in tests
var redisPool = new RedisPool(global.environment.redis);
var overviews_layer = {
var overviewsLayer = {
type: 'cartodb',
options: {
sql: 'SELECT * FROM test_table_overviews',
@@ -33,7 +33,7 @@ describe('overviews metadata', function () {
}
};
var non_overviews_layer = {
var nonOverviewsLayer = {
type: 'cartodb',
options: {
sql: 'SELECT * FROM test_table',
@@ -49,23 +49,23 @@ describe('overviews metadata', function () {
});
afterEach(function (done) {
test_helper.deleteRedisKeys(keysToDelete, done);
testHelper.deleteRedisKeys(keysToDelete, done);
});
it('layers with and without overviews', function (done) {
var layergroup = {
version: '1.0.0',
layers: [overviews_layer, non_overviews_layer]
layers: [overviewsLayer, nonOverviewsLayer]
};
var layergroup_url = '/api/v1/map';
var layergroupUrl = '/api/v1/map';
var expected_token;
var expectedToken;
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: layergroup_url,
url: layergroupUrl,
method: 'POST',
headers: { host: 'localhost', 'Content-Type': 'application/json' },
data: JSON.stringify(layergroup)
@@ -74,11 +74,11 @@ describe('overviews metadata', function () {
var parsedBody = JSON.parse(res.body);
assert.strictEqual(res.headers['x-layergroup-id'], parsedBody.layergroupid);
expected_token = parsedBody.layergroupid;
expectedToken = parsedBody.layergroupid;
next(null, res);
});
},
function do_get_mapconfig (err) {
function doGetMapconfig (err) {
assert.ifError(err);
var next = this;
@@ -86,12 +86,12 @@ describe('overviews metadata', function () {
pool: redisPool,
expire_time: 500000
});
mapStore.load(LayergroupToken.parse(expected_token).token, function (err, mapConfig) {
mapStore.load(LayergroupToken.parse(expectedToken).token, function (err, mapConfig) {
assert.ifError(err);
assert.deepStrictEqual(non_overviews_layer, mapConfig._cfg.layers[1]);
assert.deepStrictEqual(nonOverviewsLayer, 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 = {
var expectedData = {
overviews: {
test_table_overviews: {
schema: 'public',
@@ -100,13 +100,13 @@ describe('overviews metadata', function () {
}
}
};
assert.deepStrictEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expected_data);
assert.deepStrictEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expectedData);
});
next(err);
},
function finish (err) {
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
keysToDelete['map_cfg|' + LayergroupToken.parse(expectedToken).token] = 0;
keysToDelete['user:localhost:mapviews:global'] = 5;
done(err);
}
@@ -117,17 +117,17 @@ describe('overviews metadata', function () {
it('Overviews used', function (done) {
var layergroup = {
version: '1.0.0',
layers: [overviews_layer, non_overviews_layer]
layers: [overviewsLayer, nonOverviewsLayer]
};
var layergroup_url = '/api/v1/map';
var layergroupUrl = '/api/v1/map';
var expected_token;
var expectedToken;
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: layergroup_url,
url: layergroupUrl,
method: 'POST',
headers: { host: 'localhost', 'Content-Type': 'application/json' },
data: JSON.stringify(layergroup)
@@ -140,12 +140,12 @@ describe('overviews metadata', function () {
assert.strictEqual(headers.mapType, 'anonymous');
const parsedBody = JSON.parse(res.body);
expected_token = parsedBody.layergroupid;
expectedToken = parsedBody.layergroupid;
next();
});
},
function finish (err) {
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
keysToDelete['map_cfg|' + LayergroupToken.parse(expectedToken).token] = 0;
keysToDelete['user:localhost:mapviews:global'] = 5;
done(err);
}
@@ -154,17 +154,17 @@ describe('overviews metadata', function () {
it('Overviews NOT used', function (done) {
var layergroup = {
version: '1.0.0',
layers: [non_overviews_layer]
layers: [nonOverviewsLayer]
};
var layergroup_url = '/api/v1/map';
var layergroupUrl = '/api/v1/map';
var expected_token;
var expectedToken;
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: layergroup_url,
url: layergroupUrl,
method: 'POST',
headers: { host: 'localhost', 'Content-Type': 'application/json' },
data: JSON.stringify(layergroup)
@@ -177,12 +177,12 @@ describe('overviews metadata', function () {
assert.strictEqual(headers.mapType, 'anonymous');
const parsedBody = JSON.parse(res.body);
expected_token = parsedBody.layergroupid;
expectedToken = parsedBody.layergroupid;
next();
});
},
function finish (err) {
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
keysToDelete['map_cfg|' + LayergroupToken.parse(expectedToken).token] = 0;
keysToDelete['user:localhost:mapviews:global'] = 5;
done(err);
}
@@ -208,7 +208,7 @@ describe('overviews metadata with filters', function () {
});
afterEach(function (done) {
test_helper.deleteRedisKeys(keysToDelete, done);
testHelper.deleteRedisKeys(keysToDelete, done);
});
it('layers with overviews', function (done) {
@@ -252,14 +252,14 @@ describe('overviews metadata with filters', function () {
}
};
var layergroup_url = '/api/v1/map';
var layergroupUrl = '/api/v1/map';
var expected_token;
var expectedToken;
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: layergroup_url + '?filters=' + JSON.stringify(filters),
url: layergroupUrl + '?filters=' + JSON.stringify(filters),
method: 'POST',
headers: { host: 'localhost', 'Content-Type': 'application/json' },
data: JSON.stringify(layergroup)
@@ -267,11 +267,11 @@ describe('overviews metadata with filters', function () {
assert.strictEqual(res.statusCode, 200, res.body);
var parsedBody = JSON.parse(res.body);
assert.strictEqual(res.headers['x-layergroup-id'], parsedBody.layergroupid);
expected_token = parsedBody.layergroupid;
expectedToken = parsedBody.layergroupid;
next(null, res);
});
},
function do_get_mapconfig (err) {
function doGetMapconfig (err) {
assert.ifError(err);
var next = this;
@@ -279,11 +279,11 @@ describe('overviews metadata with filters', function () {
pool: redisPool,
expire_time: 500000
});
mapStore.load(LayergroupToken.parse(expected_token).token, function (err, mapConfig) {
mapStore.load(LayergroupToken.parse(expectedToken).token, function (err, mapConfig) {
assert.ifError(err);
assert.strictEqual(mapConfig._cfg.layers[0].type, 'cartodb');
assert.ok(mapConfig._cfg.layers[0].options.query_rewrite_data);
var expected_data = {
var expectedData = {
overviews: {
test_table_overviews: {
schema: 'public',
@@ -295,13 +295,13 @@ describe('overviews metadata with filters', function () {
unfiltered_query: 'select * from test_table_overviews',
filter_stats: { unfiltered_rows: 5, filtered_rows: 1 }
};
assert.deepStrictEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expected_data);
assert.deepStrictEqual(mapConfig._cfg.layers[0].options.query_rewrite_data, expectedData);
});
next(err);
},
function finish (err) {
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
keysToDelete['map_cfg|' + LayergroupToken.parse(expectedToken).token] = 0;
keysToDelete['user:localhost:mapviews:global'] = 5;
done(err);
}
test/acceptance/ported/attributes-test.js
+34 -34
View File
@@ -16,7 +16,7 @@ describe('attributes', function () {
server.setMaxListeners(0);
});
var test_mapconfig_1 = {
var testMapconfig1 = {
version: '1.1.0',
layers: [
{
@@ -58,9 +58,9 @@ describe('attributes', function () {
});
it('can only be fetched from layer having an attributes spec', function (done) {
var expected_token;
var expectedToken;
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: '/api/v1/map',
@@ -69,7 +69,7 @@ describe('attributes', function () {
host: 'localhost',
'Content-Type': 'application/json'
},
data: JSON.stringify(test_mapconfig_1)
data: JSON.stringify(testMapconfig1)
}, {}, function (res, err) { next(err, res); });
},
function checkPost (err, res) {
@@ -79,25 +79,25 @@ describe('attributes', function () {
// from layergroup creation via POST
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
if (expectedToken) {
assert.deepStrictEqual(parsedBody, { layergroupid: expectedToken, layercount: 2 });
} else {
expected_token = parsedBody.layergroupid;
expectedToken = parsedBody.layergroupid;
}
return null;
},
function do_get_attr_0 (err) {
function doGetAttr0 (err) {
assert.ifError(err);
var next = this;
assert.response(server, {
url: '/api/v1/map/' + expected_token + '/0/attributes/1',
url: '/api/v1/map/' + expectedToken + '/0/attributes/1',
method: 'GET',
headers: {
host: 'localhost'
}
}, {}, function (res, err) { next(err, res); });
},
function check_error_0 (err, res) {
function checkError0 (err, res) {
assert.ifError(err);
assert.strictEqual(
res.statusCode,
@@ -108,36 +108,36 @@ describe('attributes', function () {
assert.strictEqual(parsed.errors[0], 'Layer 0 has no exposed attributes');
return null;
},
function do_get_attr_1 (err) {
function doGetAttr1 (err) {
assert.ifError(err);
var next = this;
assert.response(server, {
url: '/api/v1/map/' + expected_token + '/1/attributes/1',
url: '/api/v1/map/' + expectedToken + '/1/attributes/1',
method: 'GET',
headers: {
host: 'localhost'
}
}, {}, function (res, err) { next(err, res); });
},
function check_attr_1 (err, res) {
function checkAttr1 (err, res) {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200, res.statusCode + ': ' + res.body);
var parsed = JSON.parse(res.body);
assert.deepStrictEqual(parsed, { n: 6 });
return null;
},
function do_get_attr_1_404 (err) {
function doGetAttr1404 (err) {
assert.ifError(err);
var next = this;
assert.response(server, {
url: '/api/v1/map/' + expected_token + '/1/attributes/-666',
url: '/api/v1/map/' + expectedToken + '/1/attributes/-666',
method: 'GET',
headers: {
host: 'localhost'
}
}, {}, function (res, err) { next(err, res); });
},
function check_attr_1_404 (err, res) {
function checkAttr1404 (err, res) {
assert.ifError(err);
assert.strictEqual(res.statusCode, 404, res.statusCode + ': ' + res.body);
var parsed = JSON.parse(res.body);
@@ -147,7 +147,7 @@ describe('attributes', function () {
return null;
},
function finish (err) {
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
keysToDelete['map_cfg|' + LayergroupToken.parse(expectedToken).token] = 0;
keysToDelete['user:localhost:mapviews:global'] = 5;
done(err);
@@ -158,14 +158,14 @@ describe('attributes', function () {
// See https://github.com/CartoDB/Windshaft/issues/131
it('are checked at map creation time', function (done) {
// clone the mapconfig test
var mapconfig = JSON.parse(JSON.stringify(test_mapconfig_1));
var mapconfig = JSON.parse(JSON.stringify(testMapconfig1));
// append unexistant attribute name
mapconfig.layers[1].options.sql = 'SELECT * FROM test_table';
mapconfig.layers[1].options.attributes.id = 'unexistant';
mapconfig.layers[1].options.attributes.columns = ['cartodb_id'];
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: '/api/v1/map',
@@ -194,9 +194,9 @@ describe('attributes', function () {
});
it('can be used with jsonp', function (done) {
var expected_token;
var expectedToken;
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: '/api/v1/map',
@@ -205,7 +205,7 @@ describe('attributes', function () {
host: 'localhost',
'Content-Type': 'application/json'
},
data: JSON.stringify(test_mapconfig_1)
data: JSON.stringify(testMapconfig1)
}, {}, function (res, err) { next(err, res); });
},
function checkPost (err, res) {
@@ -215,18 +215,18 @@ describe('attributes', function () {
// from layergroup creation via POST
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
if (expectedToken) {
assert.deepStrictEqual(parsedBody, { layergroupid: expectedToken, layercount: 2 });
} else {
expected_token = parsedBody.layergroupid;
expectedToken = parsedBody.layergroupid;
}
return null;
},
function do_get_attr_0 (err) {
function doGetAttr0 (err) {
assert.ifError(err);
var next = this;
assert.response(server, {
url: '/api/v1/map/' + expected_token +
url: '/api/v1/map/' + expectedToken +
'/0/attributes/1?callback=test',
method: 'GET',
headers: {
@@ -234,7 +234,7 @@ describe('attributes', function () {
}
}, {}, function (res, err) { next(err, res); });
},
function check_error_0 (err, res) {
function checkError0 (err, res) {
assert.ifError(err);
// jsonp errors should be returned with HTTP status 200
assert.strictEqual(res.statusCode, 200, res.statusCode + ': ' + res.body);
@@ -248,18 +248,18 @@ describe('attributes', function () {
);
return null;
},
function do_get_attr_1 (err) {
function doGetAttr1 (err) {
assert.ifError(err);
var next = this;
assert.response(server, {
url: '/api/v1/map/' + expected_token + '/1/attributes/1',
url: '/api/v1/map/' + expectedToken + '/1/attributes/1',
method: 'GET',
headers: {
host: 'localhost'
}
}, {}, function (res, err) { next(err, res); });
},
function check_attr_1 (err, res) {
function checkAttr1 (err, res) {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200, res.statusCode + ': ' + res.body);
var parsed = JSON.parse(res.body);
@@ -267,7 +267,7 @@ describe('attributes', function () {
return null;
},
function finish (err) {
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
keysToDelete['map_cfg|' + LayergroupToken.parse(expectedToken).token] = 0;
keysToDelete['user:localhost:mapviews:global'] = 5;
done(err);
@@ -281,13 +281,13 @@ describe('attributes', function () {
//
it('database access is read-only', function (done) {
// clone the mapconfig test
var mapconfig = JSON.parse(JSON.stringify(test_mapconfig_1));
var mapconfig = JSON.parse(JSON.stringify(testMapconfig1));
mapconfig.layers[1].options.sql +=
", test_table_inserter(st_setsrid(st_point(0,0),4326),'write') as w";
mapconfig.layers[1].options.attributes.columns.push('w');
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: '/api/v1/map',
test/acceptance/ported/external-resources-test.js
+15 -15
View File
@@ -11,16 +11,16 @@ var nock = require('nock');
var path = require('path');
describe('external resources', function () {
var res_serv; // resources server
var res_serv_status = { numrequests: 0 }; // status of resources server
var res_serv_port;
var resServ; // resources server
var resServStatus = { numrequests: 0 }; // status of resources server
var resServPort;
var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
before(function (done) {
// Start a server to test external resources
res_serv = http.createServer(function (request, response) {
++res_serv_status.numrequests;
resServ = http.createServer(function (request, response) {
++resServStatus.numrequests;
var filename = path.join(__dirname, '/../../fixtures/markers', request.url);
fs.readFile(filename, 'binary', function (err, file) {
if (err) {
@@ -35,9 +35,9 @@ describe('external resources', function () {
});
const host = '127.0.0.1';
const markersServer = res_serv.listen(0);
const markersServer = resServ.listen(0);
res_serv_port = markersServer.address().port;
resServPort = markersServer.address().port;
nock.disableNetConnect();
nock.enableNetConnect(host);
@@ -52,7 +52,7 @@ describe('external resources', function () {
nock.enableNetConnect();
// Close the resources server
res_serv.close(done);
resServ.close(done);
});
function imageCompareFn (fixture, done) {
@@ -66,7 +66,7 @@ describe('external resources', function () {
}
it('basic external resource', function (done) {
var circleStyle = "#test_table_3 { marker-file: url('http://127.0.0.1:" + res_serv_port +
var circleStyle = "#test_table_3 { marker-file: url('http://127.0.0.1:" + resServPort +
"/circle.svg'); marker-transform:'scale(0.2)'; }";
testClient.getTile(testClient.defaultTableMapConfig('test_table_3', circleStyle), 13, 4011, 3088,
@@ -74,7 +74,7 @@ describe('external resources', function () {
});
it('different external resource', function (done) {
var squareStyle = "#test_table_3 { marker-file: url('http://127.0.0.1:" + res_serv_port +
var squareStyle = "#test_table_3 { marker-file: url('http://127.0.0.1:" + resServPort +
"/square.svg'); marker-transform:'scale(0.2)'; }";
testClient.getTile(testClient.defaultTableMapConfig('test_table_3', squareStyle), 13, 4011, 3088,
@@ -87,16 +87,16 @@ describe('external resources', function () {
serverOptions: PortedServerOptions
};
var externalResourceStyle = "#test_table_3{marker-file: url('http://127.0.0.1:" + res_serv_port +
var externalResourceStyle = "#test_table_3{marker-file: url('http://127.0.0.1:" + resServPort +
"/square.svg'); marker-transform:'scale(0.2)'; }";
var externalResourceMapConfig = testClient.defaultTableMapConfig('test_table_3', externalResourceStyle);
testClient.createLayergroup(externalResourceMapConfig, options, function () {
var externalResourceRequestsCount = res_serv_status.numrequests;
var externalResourceRequestsCount = resServStatus.numrequests;
testClient.createLayergroup(externalResourceMapConfig, options, function () {
assert.strictEqual(res_serv_status.numrequests, externalResourceRequestsCount);
assert.strictEqual(resServStatus.numrequests, externalResourceRequestsCount);
// reset resources cache
testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
@@ -104,7 +104,7 @@ describe('external resources', function () {
externalResourceMapConfig = testClient.defaultTableMapConfig('test_table_3 ', externalResourceStyle);
testClient.createLayergroup(externalResourceMapConfig, options, function () {
assert.strictEqual(res_serv_status.numrequests, externalResourceRequestsCount + 1);
assert.strictEqual(resServStatus.numrequests, externalResourceRequestsCount + 1);
done();
});
@@ -113,7 +113,7 @@ describe('external resources', function () {
});
it('referencing unexistant external resources returns an error', function (done) {
var url = 'http://127.0.0.1:' + res_serv_port + '/notfound.png';
var url = 'http://127.0.0.1:' + resServPort + '/notfound.png';
var style = "#test_table_3{marker-file: url('" + url + "'); marker-transform:'scale(0.2)'; }";
var mapConfig = testClient.defaultTableMapConfig('test_table_3', style);
test/acceptance/ported/multilayer-error-cases-test.js
+1 -1
View File
@@ -411,7 +411,7 @@ describe('multilayer error cases', function () {
it('nonexistent layergroup token error', function (done) {
step(
function do_get_tile (err) {
function doGetTile (err) {
assert.ifError(err);
var next = this;
assert.response(server, {
test/acceptance/ported/raster-test.js
+9 -9
View File
@@ -44,9 +44,9 @@ describe('raster', function () {
}
]
};
var expected_token;
var expectedToken;
step(
function do_post () {
function doPost () {
var next = this;
assert.response(server, {
url: '/api/v1/map',
@@ -62,24 +62,24 @@ describe('raster', function () {
// from layergroup creation via POST
checkCORSHeaders(res);
var parsedBody = JSON.parse(res.body);
if (expected_token) {
assert.deepStrictEqual(parsedBody, { layergroupid: expected_token, layercount: 2 });
if (expectedToken) {
assert.deepStrictEqual(parsedBody, { layergroupid: expectedToken, layercount: 2 });
} else {
expected_token = parsedBody.layergroupid;
expectedToken = parsedBody.layergroupid;
}
return null;
},
function do_get_tile (err) {
function doGetTile (err) {
assert.ifError(err);
var next = this;
assert.response(server, {
url: '/api/v1/map/' + expected_token + '/0/0/0.png',
url: '/api/v1/map/' + expectedToken + '/0/0/0.png',
method: 'GET',
encoding: 'binary',
headers: { host: 'localhost' }
}, {}, function (res, err) { next(err, res); });
},
function check_response (err, res) {
function checkResponse (err, res) {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200, res.body);
assert.deepStrictEqual(res.headers['content-type'], 'image/png');
@@ -101,7 +101,7 @@ describe('raster', function () {
var keysToDelete = {
'user:localhost:mapviews:global': 5
};
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
keysToDelete['map_cfg|' + LayergroupToken.parse(expectedToken).token] = 0;
testHelper.deleteRedisKeys(keysToDelete, done);
}
);
test/acceptance/ported/server-gettile-test.js
+8 -8
View File
@@ -132,16 +132,16 @@ describe('server_gettile', function () {
});
});
var test_style_black_200 = '#test_table{marker-fill:black;marker-line-color:black;marker-width:5}';
var test_style_black_210 = '#test_table{marker-fill:black;marker-line-color:black;marker-width:10}';
var testStyleBlack200 = '#test_table{marker-fill:black;marker-line-color:black;marker-width:5}';
var testStyleBlack210 = '#test_table{marker-fill:black;marker-line-color:black;marker-width:10}';
it("get'ing a tile with url specified 2.0.0 style should return an expected tile", function (done) {
testClient.getTile(testClient.defaultTableMapConfig('test_table', test_style_black_200, '2.0.0'),
testClient.getTile(testClient.defaultTableMapConfig('test_table', testStyleBlack200, '2.0.0'),
13, 4011, 3088, imageCompareFn('test_table_13_4011_3088_styled_black.png', done));
});
it("get'ing a tile with url specified 2.1.0 style should return an expected tile", function (done) {
testClient.getTile(testClient.defaultTableMapConfig('test_table', test_style_black_210, '2.1.0'),
testClient.getTile(testClient.defaultTableMapConfig('test_table', testStyleBlack210, '2.1.0'),
13, 4011, 3088, imageCompareFn('test_table_13_4011_3088_styled_black.png', done));
});
@@ -156,7 +156,7 @@ describe('server_gettile', function () {
}
// See http://github.com/CartoDB/Windshaft/issues/100
var test_strictness = function (done) {
var testStrictness = function (done) {
var nonStrictMapConfig = testClient.singleLayerMapConfig(
"SELECT 1 as cartodb_id, 'SRID=3857;POINT(666 666)'::geometry as the_geom",
"#test_table{point-transform: 'scale(100)';}"
@@ -172,12 +172,12 @@ describe('server_gettile', function () {
});
});
};
var test_strict_lbl = 'unused directives are not tolerated if strict';
var testStrictLbl = 'unused directives are not tolerated if strict';
if (semver.satisfies(mapnik.versions.mapnik, '2.3.x')) {
// Strictness handling changed in 2.3.x, possibly a bug: see http://github.com/mapnik/mapnik/issues/2301
it.skip('[skipped due to http://github.com/mapnik/mapnik/issues/2301]' + test_strict_lbl, test_strictness);
it.skip('[skipped due to http://github.com/mapnik/mapnik/issues/2301]' + testStrictLbl, testStrictness);
} else if (!semver.satisfies(mapnik.versions.mapnik, '3.0.x')) {
it(test_strict_lbl, test_strictness);
it(testStrictLbl, testStrictness);
}
if (semver.satisfies(mapnik.versions.mapnik, '2.3.x')) {
test/acceptance/ported/server-test.js
+8 -8
View File
@@ -66,14 +66,14 @@ describe('server', function () {
it('grid jsonp', function (done) {
var mapConfig = testClient.singleLayerMapConfig('select * from test_table', null, null, 'name');
testClient.getGridJsonp(mapConfig, 0, 13, 4011, 3088, 'jsonp_test', function (err, res) {
testClient.getGridJsonp(mapConfig, 0, 13, 4011, 3088, 'jsonpTest', function (err, res) {
assert.ifError(err);
assert.strictEqual(res.statusCode, 200, res.body);
assert.deepStrictEqual(res.headers['content-type'], 'text/javascript; charset=utf-8');
var didRunJsonCallback = false;
var response = {};
/* eslint-disable no-unused-vars, no-eval */
function jsonp_test (body) {
function jsonpTest (body) {
response = body;
didRunJsonCallback = true;
}
@@ -88,14 +88,14 @@ describe('server', function () {
var mapConfig = testClient.singleLayerMapConfig('select * from test_table', null, null, 'name');
testClient.getGrid(mapConfig, 0, 13, 4011, 3088, function (err, res) {
assert.ifError(err);
var expected_json = {
var expectedJson = {
1: { name: 'Hawai' },
2: { name: 'El Estocolmo' },
3: { name: 'El Rey del Tallarín' },
4: { name: 'El Lacón' },
5: { name: 'El Pico' }
};
assert.deepStrictEqual(JSON.parse(res.body).data, expected_json);
assert.deepStrictEqual(JSON.parse(res.body).data, expectedJson);
done();
});
});
@@ -157,14 +157,14 @@ describe('server', function () {
var mapConfigName = testClient.singleLayerMapConfig(query, style211, null, 'name');
testClient.getGrid(mapConfigName, 0, 3, 2, 2, function (err, res) {
assert.ifError(err);
var expected_data = { 1: { name: 'west' } };
assert.deepStrictEqual(JSON.parse(res.body).data, expected_data);
var expectedData = { 1: { name: 'west' } };
assert.deepStrictEqual(JSON.parse(res.body).data, expectedData);
var mapConfigCartodbId = testClient.singleLayerMapConfig(query, style211, null, 'cartodb_id');
testClient.getGrid(mapConfigCartodbId, 0, 3, 2, 2, function (err, res) {
assert.ifError(err);
var expected_data = { 1: { cartodb_id: 1 } };
assert.deepStrictEqual(JSON.parse(res.body).data, expected_data);
var expectedData = { 1: { cartodb_id: 1 } };
assert.deepStrictEqual(JSON.parse(res.body).data, expectedData);
done();
});
});