Merge remote-tracking branch 'origin/master' into mvt-path-conf

test/support/layergroup-token.js

@@ -1,29 +0,0 @@
-/**
- * @param {String} token might match the following pattern: {user}@{tpl_id}@{token}:{cache_buster}
- */
-function parse(token) {
-    var signer, cacheBuster;
-
-    var tokenSplit = token.split(':');
-
-    token = tokenSplit[0];
-    if (tokenSplit.length > 1) {
-        cacheBuster = tokenSplit[1];
-    }
-
-    tokenSplit = token.split('@');
-    if ( tokenSplit.length > 1 ) {
-        signer = tokenSplit.shift();
-        if ( tokenSplit.length > 1 ) {
-            /*var template_hash = */tokenSplit.shift(); // unused
-        }
-        token = tokenSplit.shift();
-    }
-
-    return {
-        token: token,
-        signer: signer,
-        cacheBuster: cacheBuster
-    };
-}
-module.exports.parse = parse;

test/support/test-client.js

@@ -7,7 +7,7 @@ var PSQL = require('cartodb-psql');
 var _ = require('underscore');
 var mapnik = require('windshaft').mapnik;
 
-var LayergroupToken = require('./layergroup-token');
+var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 var assert = require('./assert');
 var helper = require('./test_helper');
@@ -116,6 +116,15 @@ module.exports.SQL = {
     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) {
     var self = this;
 
@@ -716,9 +725,9 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
                 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) {
                 return callback(err);
             }
@@ -869,9 +878,9 @@ TestClient.prototype.getStaticCenter = function (params, callback) {
                 }
             }, 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) {
                 return callback(err);
             }
@@ -968,9 +977,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) {
                 return callback(err);
             }
@@ -1063,9 +1072,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) {
                 return callback(err);
             }