From fa9d604fa3e458d89c5a7e1e35df744e94a02f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 22 Mar 2019 19:09:58 +0100
Subject: [PATCH] Fix broken test

---
 test/acceptance/user-render-timeout-limit.js | 60 +++++++++++++++++---
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit.js
index b5722dcf..a011ce70 100644
--- a/test/acceptance/user-render-timeout-limit.js
+++ b/test/acceptance/user-render-timeout-limit.js
@@ -129,7 +129,13 @@ describe('user render timeout limit', function () {
 
                 const mapconfig = createMapConfig();
                 this.testClient = new TestClient(mapconfig, 1234);
-                this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+                this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
+                    if (err) {
+                        return done(err);
+                    }
+                    this.layergroup = layergroup;
+                    this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+                });
             });
 
             afterEach(function (done) {
@@ -144,7 +150,12 @@ describe('user render timeout limit', function () {
             });
 
             it('layergroup creation works but tile request fails due to render timeout', function (done) {
-                this.testClient.getTile(0, 0, 0, { cacheBuster: true }, (err, res, tile) => {
+                const params = {
+                    layergroupid: this.layergroup.layergroupid,
+                    cacheBuster: true
+                };
+
+                this.testClient.getTile(0, 0, 0, params, (err, res, tile) => {
                     assert.ifError(err);
 
                     assert.imageIsSimilarToFile(tile, timeoutErrorTilePath, 0.05, (err) => {
@@ -164,7 +175,13 @@ describe('user render timeout limit', function () {
 
                 const mapconfig = createMapConfig();
                 this.testClient = new TestClient(mapconfig, 1234);
-                this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+                this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
+                    if (err) {
+                        return done(err);
+                    }
+                    this.layergroup = layergroup;
+                    this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+                });
             });
 
             afterEach(function (done) {
@@ -180,6 +197,7 @@ describe('user render timeout limit', function () {
 
             it('layergroup creation works and render tile fails', function (done) {
                 var params = {
+                    layergroupid: this.layergroup.layergroupid,
                     response: {
                         status: 429,
                         headers: {
@@ -215,7 +233,13 @@ describe('user render timeout limit', function () {
             serverOptions.renderer.mvt.usePostGIS = usePostGIS;
             const mapconfig = createMapConfig();
             this.testClient = new TestClient(mapconfig, 1234);
-            this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+            this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
+                if (err) {
+                    return done(err);
+                }
+                this.layergroup = layergroup;
+                this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+            });
         });
 
         afterEach(function (done) {
@@ -230,6 +254,7 @@ describe('user render timeout limit', function () {
 
         it('layergroup creation works but vector tile request fails due to render timeout', function (done) {
             const params = {
+                layergroupid: this.layergroup.layergroupid,
                 format: 'mvt',
                 response: {
                     status: 429,
@@ -258,7 +283,13 @@ describe('user render timeout limit', function () {
         beforeEach(function (done) {
             const mapconfig = createMapConfig();
             this.testClient = new TestClient(mapconfig, 1234);
-            this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+            this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
+                if (err) {
+                    return done(err);
+                }
+                this.layergroup = layergroup;
+                this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+            });
         });
 
         afterEach(function (done) {
@@ -272,6 +303,7 @@ describe('user render timeout limit', function () {
 
         it('layergroup creation works but "grid.json" tile request fails due to render timeout', function (done) {
             const params = {
+                layergroupid: this.layergroup.layergroupid,
                 layers: 'mapnik',
                 format: 'grid.json',
                 response: {
@@ -310,7 +342,13 @@ describe('user render timeout limit', function () {
 
                 const mapconfig = createMapConfig();
                 this.testClient = new TestClient(mapconfig, 1234);
-                this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+                this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
+                    if (err) {
+                        return done(err);
+                    }
+                    this.layergroup = layergroup;
+                    this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+                });
             });
 
             afterEach(function (done) {
@@ -326,6 +364,7 @@ describe('user render timeout limit', function () {
 
             it('layergroup creation works but static image fails due to render timeout', function (done) {
                 const params = {
+                    layergroupid: this.layergroup.layergroupid,
                     zoom: 0,
                     lat: 0,
                     lng: 0,
@@ -354,7 +393,13 @@ describe('user render timeout limit', function () {
 
                 const mapconfig = createMapConfig();
                 this.testClient = new TestClient(mapconfig, 1234);
-                this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+                this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
+                    if (err) {
+                        return done(err);
+                    }
+                    this.layergroup = layergroup;
+                    this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
+                });
             });
 
             afterEach(function (done) {
@@ -370,6 +415,7 @@ describe('user render timeout limit', function () {
 
             it('layergroup creation works and render static center tile fails', function (done) {
                 const params = {
+                    layergroupid: this.layergroup.layergroupid,
                     zoom: 0,
                     lat: 0,
                     lng: 0,