Merge branch 'master' into eslint

2019-11-13 19:00:50 +01:00
parent 734c373f3d ccd01e6da5
commit 2c8a030ecb
21 changed files with 333 additions and 133 deletions
@@ -251,12 +251,12 @@ describe('torque boundary points', function () {
                assert.ok(!err, 'Failed to create layergroup');

                var parsedBody = JSON.parse(res.body);
-                var expected_token = parsedBody.layergroupid;
-                layergroupIdToDelete = expected_token;
+                var expectedToken = parsedBody.layergroupid;
+                layergroupIdToDelete = expectedToken;

                var partialUrl = tileRequest.z + '/' + tileRequest.x + '/' + tileRequest.y;
                assert.response(server, {
-                    url: '/api/v1/map/' + expected_token + '/0/' + partialUrl + '.json.torque',
+                    url: '/api/v1/map/' + expectedToken + '/0/' + partialUrl + '.json.torque',
                    method: 'GET',
                    headers: {
                        host: 'localhost'