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

test/acceptance/ported/multilayer-test.js

@@ -6,7 +6,7 @@ var assert = require('../../support/assert');
 var _ = require('underscore');
 var querystring = require('querystring');
 var step = require('step');
-var mapnik = require('windshaft').mapnik;
+const mapnik = require('@carto/mapnik');
 var cartodbServer = require('../../../lib/server');
 var ServerOptions = require('./support/ported-server-options');
 var LayergroupToken = require('../../../lib/models/layergroup-token');

test/acceptance/ported/retina-test.js

@@ -3,7 +3,7 @@
 var testHelper = require('../../support/test-helper');
 
 var assert = require('../../support/assert');
-var mapnik = require('windshaft').mapnik;
+const mapnik = require('@carto/mapnik');
 var cartodbServer = require('../../../lib/server');
 var ServerOptions = require('./support/ported-server-options');
 

test/acceptance/ported/server-gettile-test.js

@@ -3,7 +3,7 @@
 var testHelper = require('../../support/test-helper');
 
 var assert = require('../../support/assert');
-var mapnik = require('windshaft').mapnik;
+const mapnik = require('@carto/mapnik');
 var semver = require('semver');
 var cartodbServer = require('../../../lib/server');
 var ServerOptions = require('./support/ported-server-options');

test/acceptance/ported/support/ported-server-options.js

@@ -2,7 +2,7 @@
 
 var _ = require('underscore');
 var serverOptions = require('../../../../lib/server-options');
-var mapnik = require('windshaft').mapnik;
+const mapnik = require('@carto/mapnik');
 var OverviewsQueryRewriter = require('../../../../lib/utils/overviews-query-rewriter');
 var overviewsQueryRewriter = new OverviewsQueryRewriter({
     zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)'

test/acceptance/ported/support/test-client.js

@@ -7,7 +7,7 @@ var step = require('step');
 var assert = require('../../../support/assert');
 var _ = require('underscore');
 var querystring = require('querystring');
-var mapnik = require('windshaft').mapnik;
+const mapnik = require('@carto/mapnik');
 var CartodbServer = require('../../../../lib/server');
 var PortedServerOptions = require('./ported-server-options');