Fix all ported tests related to req2params

This commit is contained in:
Raul Ochoa
2015-09-16 18:09:39 +02:00
parent 99d78ce9b8
commit e32ced107e
27 changed files with 271 additions and 40 deletions
+7 -1
View File
@@ -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);
});