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

Make all calls to finish to match (err, res) signature

Browse Source
This commit is contained in:
Raul Ochoa 2017-10-09 15:51:42 +00:00
parent e9d0b3b77d
commit a797e13eb3
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,15 @@ module.exports.SQL = {
ONE_POINT: 'select 1 as cartodb_id, \'SRID=3857;POINT(0 0)\'::geometry the_geom_webmercator' ONE_POINT: 'select 1 as cartodb_id, \'SRID=3857;POINT(0 0)\'::geometry the_geom_webmercator'
}; };
function resErr2errRes(callback) {
return (res, err) => {
if (err) {
return callback(err);
}
return callback(err, res);
};
}
TestClient.prototype.getWidget = function(widgetName, params, callback) { TestClient.prototype.getWidget = function(widgetName, params, callback) {
var self = this; var self = this;
@ -717,9 +726,9 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
expectedResponse.headers['Content-Type'] = 'application/json; charset=utf-8'; expectedResponse.headers['Content-Type'] = 'application/json; charset=utf-8';
} }
assert.response(self.server, request, expectedResponse, this); assert.response(self.server, request, expectedResponse, resErr2errRes(this));
}, },
function finish(res, err) { function finish(err, res) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@ -870,9 +879,9 @@ TestClient.prototype.getStaticCenter = function (params, callback) {
} }
}, params.response); }, params.response);
assert.response(self.server, request, expectedResponse, this); assert.response(self.server, request, expectedResponse, resErr2errRes(this));
}, },
function(res, err) { function(err, res) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@ -969,9 +978,9 @@ TestClient.prototype.getNodeStatus = function(nodeName, callback) {
} }
}; };
assert.response(self.server, request, expectedResponse, this); assert.response(self.server, request, expectedResponse, resErr2errRes(this));
}, },
function finish(res, err) { function finish(err, res) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@ -1064,9 +1073,9 @@ TestClient.prototype.getAttributes = function(params, callback) {
} }
}; };
assert.response(self.server, request, expectedResponse, this); assert.response(self.server, request, expectedResponse, resErr2errRes(this));
}, },
function finish(res, err) { function finish(err, res) {
if (err) { if (err) {
return callback(err); return callback(err);
} }