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

Adapt test-client to handle client query param

Browse Source
This commit is contained in:
Daniel García Aubert
2020-05-26 16:52:13 +02:00
parent f82232194c
commit b97aeda53c
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/support/test-client.js
View File

@@ -942,24 +942,8 @@ TestClient.prototype.getLayergroup = function (params, callback) {
params = {};
}
let url = '/api/v1/map';
const urlNamed = url + '/named';
const headers = Object.assign({ host: 'localhost', 'Content-Type': 'application/json' }, self.extraHeaders);
const queryParams = {};
if (self.apiKey) {
queryParams.api_key = self.apiKey;
}
if (params.aggregation !== undefined) {
queryParams.aggregation = params.aggregation;
}
if (Object.keys(queryParams).length) {
url += '?' + qs.stringify(queryParams);
}
var layergroupId;
if (params.layergroupid) {
@@ -982,7 +966,7 @@ TestClient.prototype.getLayergroup = function (params, callback) {
assert.response(self.server,
{
url: urlNamed + '?' + qs.stringify({ api_key: self.apiKey }),
url: `/api/v1/map/named?${qs.stringify({ api_key: self.apiKey })}`,
method: 'POST',
headers,
data: JSON.stringify(self.template)
@@ -1023,9 +1007,10 @@ TestClient.prototype.getLayergroup = function (params, callback) {
};
}
const url = '/api/v1/map';
const queryParams = {};
if (self.apiKey) {
if (self.apiKey !== undefined) {
queryParams.api_key = self.apiKey;
}
@@ -1038,8 +1023,8 @@ TestClient.prototype.getLayergroup = function (params, callback) {
}
const path = templateId
? `${urlNamed}/${templateId}?${qs.stringify(queryParams)}`
: `${url}?${qs.stringify(queryParams)}`;
? `${url}/named/${templateId}${Object.keys(queryParams).length ? `?${qs.stringify(queryParams)}` : ''}`
: `${url}${Object.keys(queryParams).length ? `?${qs.stringify(queryParams)}` : ''}`;
assert.response(self.server,
{