From dfc354550c0991f9d7b8ca67f2b7c7d4876c55e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 22 May 2018 18:27:50 +0200 Subject: [PATCH] Add method to override cache buster provided by server while fetching tiles and static images --- test/support/test-client.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/support/test-client.js b/test/support/test-client.js index 5e08394a..2a5840f5 100644 --- a/test/support/test-client.js +++ b/test/support/test-client.js @@ -125,6 +125,14 @@ function resErr2errRes(callback) { }; } +function layergroupidTemplate (layergroupId, params) { + const { token, signer, cacheBuster } = LayergroupToken.parse(layergroupId); + + // {user}@{token}:{cache_buster} + // {token}:{cache_buster} + return `${signer ? signer + '@' : ''}${token}:${params.cacheBuster ? Date.now() : cacheBuster }`; +} + TestClient.prototype.getWidget = function(widgetName, params, callback) { var self = this; @@ -726,7 +734,7 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) { self.keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0; self.keysToDelete['user:localhost:mapviews:global'] = 5; - url = '/api/v1/map/' + layergroupId + '/'; + url = `/api/v1/map/${layergroupidTemplate(layergroupId, params)}/`; var layers = params.layers; @@ -769,7 +777,6 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) { } }, params.response); - var isPng = format.match(/png$/); if (isPng) { @@ -954,7 +961,9 @@ TestClient.prototype.getStaticCenter = function (params, callback) { self.keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0; self.keysToDelete['user:localhost:mapviews:global'] = 5; - url = `/api/v1/map/static/center/${layergroupId}/${zoom}/${lat}/${lng}/${width}/${height}.${format}`; + const layergroupid = layergroupidTemplate(layergroupId, params); + + url = `/api/v1/map/static/center/${layergroupid}/${zoom}/${lat}/${lng}/${width}/${height}.${format}`; if (self.apiKey) { url += '?' + qs.stringify({api_key: self.apiKey});