In tests, stop using mapnik module exposed by windshaft and require it from development dependencies

test/support/assert.js

@@ -7,7 +7,7 @@ var fs = require('fs');
 var path = require('path');
 var util = require('util');
 
-var mapnik = require('windshaft').mapnik;
+const mapnik = require('@carto/mapnik');
 
 var request = require('request');
 
@@ -95,7 +95,6 @@ assert.response = function (server, req, res, callback) {
     var listener = server.listen(port, host);
     listener.on('error', callback);
     listener.on('listening', function onServerListening () {
-        // jshint maxcomplexity:9
         const { address: host, port } = listener.address();
         const address = `${host}:${port}`;
 
@@ -186,7 +185,6 @@ function validateResponse (response, expected) {
 
 // @param tolerance number of tolerated grid cell differences
 assert.utfgridEqualsFile = function (buffer, fileB, tolerance, callback) {
-    // jshint maxcomplexity:9
     fs.writeFileSync('/tmp/grid.json', buffer, 'binary'); // <-- to debug/update
     var expectedJson = JSON.parse(fs.readFileSync(fileB, 'utf8'));
 

test/support/test-client.js

@@ -5,7 +5,7 @@ var step = require('step');
 const { URL } = require('url');
 var PSQL = require('cartodb-psql');
 var _ = require('underscore');
-var mapnik = require('windshaft').mapnik;
+const mapnik = require('@carto/mapnik');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 
@@ -821,7 +821,6 @@ TestClient.prototype.getTile = function (z, x, y, params, callback) {
             );
         },
         function getTileResult (err, layergroupId) {
-            // jshint maxcomplexity:13
             assert.ifError(err);
 
             self.keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0;
@@ -931,7 +930,6 @@ TestClient.prototype.getTile = function (z, x, y, params, callback) {
 };
 
 TestClient.prototype.getLayergroup = function (params, callback) {
-    // jshint maxcomplexity: 7
     var self = this;
 
     if (!callback) {