Fix all ported tests related to req2params

lib/cartodb/controllers/named_maps.js

@@ -10,8 +10,8 @@ var cors = require('../middleware/cors');
 
 var TablesCacheEntry = require('../cache/model/database_tables_entry');
 
-function NamedMapsController(app, authApi, pgConnection, namedMapProviderCache, tileBackend, previewBackend, surrogateKeysCache,
-                             tablesExtentApi) {
+function NamedMapsController(app, authApi, pgConnection, namedMapProviderCache, tileBackend, previewBackend,
+                             surrogateKeysCache, tablesExtentApi) {
     BaseController.call(this, authApi, pgConnection);
 
     this.app = app;

lib/cartodb/controllers/named_maps_admin.js

@@ -21,6 +21,8 @@ function NamedMapsAdminController(templateMaps, authApi, pgConnection) {
     this.authApi = authApi;
 }
 
+util.inherits(NamedMapsAdminController, BaseController);
+
 module.exports = NamedMapsAdminController;
 
 NamedMapsAdminController.prototype.register = function(app) {

test/acceptance/ported/attributes.js

@@ -5,11 +5,12 @@ var redis         = require('redis');
 var step          = require('step');
 var cartodbServer = require('../../../lib/cartodb/server');
 var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 
 describe('attributes', function() {
 
     var server = cartodbServer(PortedServerOptions);
-    server.req2params = PortedServerOptions.req2params;
     server.setMaxListeners(0);
     var redis_client = redis.createClient(PortedServerOptions.redis.port);
 
@@ -38,6 +39,16 @@ describe('attributes', function() {
         assert.equal(res.headers['access-control-allow-origin'], '*');
     }
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     it("can only be fetched from layer having an attributes spec", function(done) {
 
             var expected_token;

test/acceptance/ported/blend.js

@@ -3,8 +3,21 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('blend png renderer', function() {
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     var IMAGE_TOLERANCE_PER_MIL = 20;
 
     function plainTorqueMapConfig(plainColor) {

test/acceptance/ported/blend_filtering.js

@@ -5,13 +5,20 @@ var testClient = require('./support/test_client');
 var fs = require('fs');
 var http = require('http');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('blend layer filtering', function() {
 
     var IMG_TOLERANCE_PER_MIL = 20;
 
     var httpRendererResourcesServer;
 
+    var req2paramsFn;
     before(function(done) {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+
         // Start a server to test external resources
         httpRendererResourcesServer = http.createServer( function(request, response) {
             var filename = __dirname + '/../../fixtures/http/light_nolabels-1-0-0.png';
@@ -25,6 +32,7 @@ describe('blend layer filtering', function() {
     });
 
     after(function(done) {
+        BaseController.prototype.req2params = req2paramsFn;
         httpRendererResourcesServer.close(done);
     });
 

test/acceptance/ported/blend_http_fallback.js

@@ -5,13 +5,19 @@ var testClient = require('./support/test_client');
 var fs = require('fs');
 var http = require('http');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('blend http fallback', function() {
 
     var IMG_TOLERANCE_PER_MIL = 20;
 
     var httpRendererResourcesServer;
 
+    var req2paramsFn;
     before(function(done) {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
         // Start a server to test external resources
         httpRendererResourcesServer = http.createServer( function(request, response) {
             if (request.url.match(/^\/error404\//)) {
@@ -33,6 +39,7 @@ describe('blend http fallback', function() {
     });
 
     after(function(done) {
+        BaseController.prototype.req2params = req2paramsFn;
         httpRendererResourcesServer.close(done);
     });
 

test/acceptance/ported/blend_http_timeout.js

@@ -6,8 +6,21 @@ var serverOptions = require('./support/ported_server_options');
 var fs = require('fs');
 var http = require('http');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe.skip('blend http client timeout', function() {
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     var mapConfig = {
         version: '1.3.0',
         layers: [

test/acceptance/ported/external_resources.js

@@ -7,6 +7,8 @@ var PortedServerOptions = require('./support/ported_server_options');
 var http = require('http');
 var testClient = require('./support/test_client');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 function rmdir_recursive_sync(dirname) {
   var files = fs.readdirSync(dirname);
   for (var i=0; i<files.length; ++i) {
@@ -29,7 +31,10 @@ describe('external resources', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
 
+    var req2paramsFn;
     before(function(done) {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
         // Start a server to test external resources
         res_serv = http.createServer( function(request, response) {
             ++res_serv_status.numrequests;
@@ -48,6 +53,15 @@ describe('external resources', function() {
         res_serv.listen(res_serv_port, done);
     });
 
+    after(function(done) {
+        BaseController.prototype.req2params = req2paramsFn;
+
+        rmdir_recursive_sync(global.environment.millstone.cache_basedir);
+
+        // Close the resources server
+        res_serv.close(done);
+    });
+
     function imageCompareFn(fixture, done) {
         return function(err, res) {
             if (err) {
@@ -121,12 +135,5 @@ describe('external resources', function() {
         });
     });
 
-
-    after(function(done) {
-        rmdir_recursive_sync(global.environment.millstone.cache_basedir);
-
-        // Close the resources server
-        res_serv.close(done);
-    });
 });
 

test/acceptance/ported/limits.js

@@ -6,13 +6,19 @@ var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 var serverOptions = require('./support/ported_server_options');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe.skip('render limits', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
 
     var limitsConfig;
     var onTileErrorStrategy;
+    var req2paramsFn;
     before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
         limitsConfig = serverOptions.renderer.mapnik.limits;
         serverOptions.renderer.mapnik.limits = {
             render: 50,
@@ -25,6 +31,7 @@ describe.skip('render limits', function() {
     });
 
     after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
         serverOptions.renderer.mapnik.limits = limitsConfig;
         serverOptions.renderer.onTileErrorStrategy = onTileErrorStrategy;
     });

test/acceptance/ported/multilayer.js

@@ -11,11 +11,11 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var http = require('http');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
+var BaseController = require('../../../lib/cartodb/controllers/base');
 
 describe('multilayer', function() {
 
     var server = cartodbServer(ServerOptions);
-    server.req2params = ServerOptions.req2params;
     server.setMaxListeners(0);
     var redis_client = redis.createClient(ServerOptions.redis.port);
     var res_serv; // resources server
@@ -30,7 +30,11 @@ describe('multilayer', function() {
       assert.equal(res.headers['access-control-allow-origin'], '*');
     }
 
+    var req2paramsFn;
     before(function(done) {
+      req2paramsFn = BaseController.prototype.req2params;
+      BaseController.prototype.req2params = ServerOptions.req2params;
+
       // Start a server to test external resources
       res_serv = http.createServer( function(request, response) {
           var filename = __dirname + '/../fixtures/markers' + request.url;
@@ -50,6 +54,8 @@ describe('multilayer', function() {
     });
 
     after(function(done) {
+        BaseController.prototype.req2params = req2paramsFn;
+
         // Close the resources server
         res_serv.close(done);
     });

test/acceptance/ported/multilayer_error_cases.js

@@ -6,12 +6,23 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('multilayer error cases', function() {
 
     var server = cartodbServer(ServerOptions);
-    server.req2params = ServerOptions.req2params;
     server.setMaxListeners(0);
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     it("post layergroup with wrong Content-Type", function(done) {
         assert.response(server, {
             url: '/database/windshaft_test/layergroup',

test/acceptance/ported/multilayer_interactivity.js

@@ -8,13 +8,24 @@ var getLayerTypeFn = require('windshaft').model.MapConfig.prototype.getType;
 var PortedServerOptions = require('./support/ported_server_options');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('multilayer interactivity and layers order', function() {
 
     var server = cartodbServer(PortedServerOptions);
-    server.req2params = PortedServerOptions.req2params;
     server.setMaxListeners(0);
     var redisClient = redis.createClient(PortedServerOptions.redis.port);
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     function layerType(layer) {
         return layer.type || 'undefined';
     }

test/acceptance/ported/raster.js

@@ -6,10 +6,11 @@ var step = require('step');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('raster', function() {
 
     var server = cartodbServer(ServerOptions);
-    server.req2params = ServerOptions.req2params;
     server.setMaxListeners(0);
     var redis_client = redis.createClient(ServerOptions.redis.port);
 
@@ -20,6 +21,16 @@ describe('raster', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 2;
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     it("can render raster for valid mapconfig", function(done) {
 
       var mapconfig =  {

test/acceptance/ported/regressions.js

@@ -8,6 +8,8 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 function rmdir_recursive_sync(dirname) {
   var files = fs.readdirSync(dirname);
   for (var i=0; i<files.length; ++i) {
@@ -28,7 +30,10 @@ describe('regressions', function() {
     var res_serv_status = { numrequests:0 }; // status of resources server
     var res_serv_port = 8033; // FIXME: make configurable ?
 
+    var req2paramsFn;
     before(function(done) {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
         // Start a server to test external resources
         res_serv = http.createServer( function(request, response) {
             ++res_serv_status.numrequests;
@@ -49,6 +54,7 @@ describe('regressions', function() {
 
 
     after(function(done) {
+        BaseController.prototype.req2params = req2paramsFn;
         rmdir_recursive_sync(global.environment.millstone.cache_basedir);
 
         // Close the resources server

test/acceptance/ported/retina.js

@@ -6,15 +6,26 @@ var mapnik = require('windshaft').mapnik;
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('retina support', function() {
 
     var layergroupId = null;
 
     var server = cartodbServer(ServerOptions);
-    server.req2params = ServerOptions.req2params;
     server.setMaxListeners(0);
     var redis_client = redis.createClient(ServerOptions.redis.port);
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     beforeEach(function(done) {
         var retinaSampleMapConfig =  {
             version: '1.2.0',

test/acceptance/ported/server.js

@@ -7,6 +7,8 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 function rmdir_recursive_sync(dirname) {
   var files = fs.readdirSync(dirname);
   for (var i=0; i<files.length; ++i) {
@@ -23,13 +25,15 @@ function rmdir_recursive_sync(dirname) {
 describe('server', function() {
 
     var server = cartodbServer(ServerOptions);
-    server.req2params = ServerOptions.req2params;
     server.setMaxListeners(0);
     var res_serv; // resources server
     var res_serv_status = { numrequests:0 }; // status of resources server
     var res_serv_port = 8033; // FIXME: make configurable ?
 
+    var req2paramsFn;
     before(function(done) {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
 
         // Start a server to test external resources
         res_serv = http.createServer( function(request, response) {
@@ -51,6 +55,8 @@ describe('server', function() {
     });
 
     after(function(done) {
+        BaseController.prototype.req2params = req2paramsFn;
+
         rmdir_recursive_sync(global.environment.millstone.cache_basedir);
 
         // Close the resources server

test/acceptance/ported/server_gettile.js

@@ -9,6 +9,8 @@ var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 function rmdir_recursive_sync(dirname) {
   var files = fs.readdirSync(dirname);
   for (var i=0; i<files.length; ++i) {
@@ -26,7 +28,6 @@ function rmdir_recursive_sync(dirname) {
 describe('server_gettile', function() {
 
     var server = cartodbServer(ServerOptions);
-    server.req2params = ServerOptions.req2params;
     server.setMaxListeners(0);
     var res_serv; // resources server
     var res_serv_status = { numrequests:0 }; // status of resources server
@@ -34,7 +35,11 @@ describe('server_gettile', function() {
 
     var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
 
+    var req2paramsFn;
     before(function(done) {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
+
         // Start a server to test external resources
         res_serv = http.createServer( function(request, response) {
             ++res_serv_status.numrequests;
@@ -55,6 +60,8 @@ describe('server_gettile', function() {
 
 
     after(function(done) {
+        BaseController.prototype.req2params = req2paramsFn;
+
         rmdir_recursive_sync(global.environment.millstone.cache_basedir);
 
         // Close the resources server

test/acceptance/ported/server_png8_format.js

@@ -7,6 +7,8 @@ var redis = require('redis');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 var IMAGE_EQUALS_TOLERANCE_PER_MIL = 85;
 
 describe('server_png8_format', function() {
@@ -15,14 +17,12 @@ describe('server_png8_format', function() {
     serverOptionsPng32.grainstore = _.clone(ServerOptions.grainstore);
     serverOptionsPng32.grainstore.mapnik_tile_format = 'png32';
     var serverPng32 = new cartodbServer(serverOptionsPng32);
-    serverPng32.req2params = ServerOptions.req2params;
     serverPng32.setMaxListeners(0);
 
     var serverOptionsPng8 = ServerOptions;
     serverOptionsPng8.grainstore = _.clone(ServerOptions.grainstore);
     serverOptionsPng8.grainstore.mapnik_tile_format = 'png8:m=h';
     var serverPng8 = new cartodbServer(serverOptionsPng8);
-    serverPng8.req2params = ServerOptions.req2params;
     serverPng8.setMaxListeners(0);
 
 
@@ -30,7 +30,10 @@ describe('server_png8_format', function() {
 
     var layergroupId;
 
+    var req2paramsFn;
     before(function(done) {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
         var testPngFilesDir = __dirname + '/../../results/png';
         fs.readdirSync(testPngFilesDir)
             .filter(function(fileName) {
@@ -44,6 +47,10 @@ describe('server_png8_format', function() {
         done();
     });
 
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     function testOutputForPng32AndPng8(desc, tile, callback) {
 
         var bufferPng32,

test/acceptance/ported/static_maps.js

@@ -5,6 +5,9 @@ var testClient = require('./support/test_client');
 var http = require('http');
 var fs = require('fs');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('static_maps', function() {
 
     var validUrlTemplate = 'http://127.0.0.1:8033/{s}/{z}/{x}/{y}.png';
@@ -12,7 +15,11 @@ describe('static_maps', function() {
 
     var httpRendererResourcesServer;
 
+    var req2paramsFn;
     before(function(done) {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+
         // Start a server to test external resources
         httpRendererResourcesServer = http.createServer( function(request, response) {
             var filename = __dirname + '/../../fixtures/http/basemap.png';
@@ -26,6 +33,7 @@ describe('static_maps', function() {
     });
 
     after(function(done) {
+        BaseController.prototype.req2params = req2paramsFn;
         httpRendererResourcesServer.close(done);
     });
 

test/acceptance/ported/support/test_client.js

@@ -40,7 +40,6 @@ module.exports = {
 
 
 var server = new CartodbServer(PortedServerOptions);
-server.req2params = PortedServerOptions.req2params;
 server.setMaxListeners(0);
 var redisClient = redis.createClient(global.environment.redis.port);
 

test/acceptance/ported/torque.js

@@ -7,13 +7,24 @@ var step = require('step');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('torque', function() {
 
     var server = cartodbServer(ServerOptions);
-    server.req2params = ServerOptions.req2params;
     server.setMaxListeners(0);
     var redis_client = redis.createClient(ServerOptions.redis.port);
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     function checkCORSHeaders(res) {
       assert.equal(res.headers['access-control-allow-headers'], 'X-Requested-With, X-Prototype-Version, X-CSRF-Token');
       assert.equal(res.headers['access-control-allow-origin'], '*');

test/acceptance/ported/torque_boundaries.js

@@ -5,16 +5,34 @@ var redis = require('redis');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('torque boundary points', function() {
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = ServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     var layergroupIdToDelete = null;
 
     beforeEach(function() {
         layergroupIdToDelete = null;
     });
 
+    afterEach(function(done) {
+        var redisKey = 'map_cfg|' + layergroupIdToDelete;
+        redis_client.del(redisKey, function () {
+            done();
+        });
+    });
+
     var server = cartodbServer(ServerOptions);
-    server.req2params = ServerOptions.req2params;
     server.setMaxListeners(0);
     var redis_client = redis.createClient(ServerOptions.redis.port);
 
@@ -437,10 +455,4 @@ describe('torque boundary points', function() {
         });
     });
 
-    afterEach(function(done) {
-        var redisKey = 'map_cfg|' + layergroupIdToDelete;
-        redis_client.del(redisKey, function () {
-            done();
-        });
-    });
 });

test/acceptance/ported/torque_png.js

@@ -3,8 +3,21 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('torque png renderer', function() {
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     var IMAGE_TOLERANCE_PER_MIL = 20;
 
     var torquePngPointsMapConfig =  {

test/acceptance/ported/torque_zero_zero.js

@@ -3,8 +3,21 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('torque tiles at 0,0 point', function() {
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
 /*
     Tiles are represented as in:
 

test/acceptance/ported/wrap.js

@@ -3,8 +3,21 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var testClient = require('./support/test_client');
 
+var PortedServerOptions = require('./support/ported_server_options');
+var BaseController = require('../../../lib/cartodb/controllers/base');
+
 describe('wrap x coordinate', function() {
 
+    var req2paramsFn;
+    before(function() {
+        req2paramsFn = BaseController.prototype.req2params;
+        BaseController.prototype.req2params = PortedServerOptions.req2params;
+    });
+
+    after(function() {
+        BaseController.prototype.req2params = req2paramsFn;
+    });
+
     describe('renders correct tile', function() {
         var IMG_TOLERANCE_PER_MIL = 20;
 

test/unit/cartodb/ported/windshaft_server.test.js

@@ -36,7 +36,8 @@ describe('windshaft', function() {
 
     it('options are set on main windshaft object',  function(){
         var ws = cartodbServer(serverOptions);
-        assert.ok(_.isFunction(ws.req2params));
+        assert.ok(_.isObject(ws.bind));
+        assert.ok(_.isObject(ws.grainstore));
         assert.equal(ws.base_url, '/tiles/:table');
     });
 

test/unit/cartodb/req2params.test.js

@@ -2,20 +2,37 @@ var assert = require('assert');
 var _ = require('underscore');
 var test_helper = require('../../support/test_helper');
 
-suite('req2params', function() {
+var RedisPool = require('redis-mpool');
+var cartodbRedis = require('cartodb-redis');
+var PgConnection = require('../../../lib/cartodb/backends/pg_connection');
+var AuthApi = require('../../../lib/cartodb/api/auth_api');
+var TemplateMaps = require('../../../lib/cartodb/backends/template_maps');
 
-    // configure redis pool instance to use in tests
-    var CartodbWindshaft = require('../../../lib/cartodb/server');
-    var serverOptions = require('../../../lib/cartodb/server_options');
-    var server = new CartodbWindshaft(serverOptions);
+var BaseController = require('../../../lib/cartodb/controllers/base');
+var windshaft = require('windshaft');
+
+suite('req2params', function() {
 
     var test_user = _.template(global.environment.postgres_auth_user, {user_id:1});
     var test_pubuser = global.environment.postgres.user;
     var test_database = test_user + '_db';
 
+
+    var baseController;
+    before(function() {
+        var redisPool = new RedisPool(global.environment.redis);
+        var mapStore = new windshaft.storage.MapStore();
+        var metadataBackend = cartodbRedis({pool: redisPool});
+        var pgConnection = new PgConnection(metadataBackend);
+        var templateMaps = new TemplateMaps(redisPool);
+        var authApi = new AuthApi(pgConnection, metadataBackend, mapStore, templateMaps);
+
+        baseController = new BaseController(authApi, pgConnection);
+    });
+
     
     test('can be found in server_options', function(){
-      assert.ok(_.isFunction(server.req2params));
+      assert.ok(_.isFunction(baseController.req2params));
     });
 
     function prepareRequest(req) {
@@ -28,7 +45,7 @@ suite('req2params', function() {
 
     test('cleans up request', function(done){
       var req = {headers: { host:'localhost' }, query: {dbuser:'hacker',dbname:'secret'}};
-      server.req2params(prepareRequest(req), function(err, req) {
+      baseController.req2params(prepareRequest(req), function(err, req) {
           if ( err ) { done(err); return; }
           assert.ok(_.isObject(req.query), 'request has query');
           assert.ok(!req.query.hasOwnProperty('dbuser'), 'dbuser was removed from query');
@@ -42,7 +59,7 @@ suite('req2params', function() {
 
     test('sets dbname from redis metadata', function(done){
       var req = {headers: { host:'localhost' }, query: {} };
-      server.req2params(prepareRequest(req), function(err, req) {
+      baseController.req2params(prepareRequest(req), function(err, req) {
           if ( err ) { done(err); return; }
           //console.dir(req);
           assert.ok(_.isObject(req.query), 'request has query');
@@ -57,7 +74,7 @@ suite('req2params', function() {
 
     test('sets also dbuser for authenticated requests', function(done){
       var req = {headers: { host:'localhost' }, query: {map_key: '1234'} };
-      server.req2params(prepareRequest(req), function(err, req) {
+      baseController.req2params(prepareRequest(req), function(err, req) {
           if ( err ) { done(err); return; }
           //console.dir(req);
           assert.ok(_.isObject(req.query), 'request has query');
@@ -75,7 +92,7 @@ suite('req2params', function() {
                   map_key: '1235'
               }
           };
-          server.req2params(prepareRequest(req), function(err, req) {
+          baseController.req2params(prepareRequest(req), function(err, req) {
               // wrong key resets params to no user
               assert.ok(req.params.dbuser === test_pubuser, 'could inject dbuser ('+req.params.dbuser+')');
               done();
@@ -101,7 +118,7 @@ suite('req2params', function() {
                     lzma: data
                 }
             };
-            server.req2params(prepareRequest(req), function(err, req) {
+            baseController.req2params(prepareRequest(req), function(err, req) {
                 if ( err ) {
                     return done(err);
                 }