cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'separate-app-and-controllers-creation' into separate-routers

Browse Source
This commit is contained in:
Daniel García Aubert
2018-04-18 17:06:53 +02:00
parent 5b1b78d386 8afe6c5228
commit be5e419288
35 changed files with 248 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/ported/attributes.js
+6 -2
View File
@@ -7,8 +7,12 @@ var PortedServerOptions = require('./support/ported_server_options');
var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
describe('attributes', function() {
var server = cartodbServer(PortedServerOptions);
server.setMaxListeners(0);
var server;
before(function () {
server = cartodbServer(PortedServerOptions);
server.setMaxListeners(0);
});
var test_mapconfig_1 = {
version: '1.1.0',
test/acceptance/ported/external_resources.js
+14 -3
View File
@@ -11,12 +11,11 @@ describe('external resources', function() {
var res_serv; // resources server
var res_serv_status = { numrequests:0 }; // status of resources server
var res_serv_port = 8033; // FIXME: make configurable ?
var res_serv_port;
var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
before(function(done) {
nock.enableNetConnect('127.0.0.1');
// Start a server to test external resources
res_serv = http.createServer( function(request, response) {
++res_serv_status.numrequests;
@@ -32,12 +31,24 @@ describe('external resources', function() {
response.end();
});
});
res_serv.listen(res_serv_port, done);
const host = '127.0.0.1';
const markersServer = res_serv.listen(0);
res_serv_port = markersServer.address().port;
nock.disableNetConnect();
nock.enableNetConnect(host);
markersServer.on('listening', done);
});
after(function(done) {
testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
nock.cleanAll();
nock.enableNetConnect();
// Close the resources server
res_serv.close(done);
});
test/acceptance/ported/multilayer.js
+6 -2
View File
@@ -10,9 +10,13 @@ var ServerOptions = require('./support/ported_server_options');
var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
describe('multilayer', function() {
var server;
before(function () {
server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
});
var server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
mapnik.register_system_fonts();
var available_system_fonts = _.keys(mapnik.fontFiles());
test/acceptance/ported/multilayer_error_cases.js
+5 -2
View File
@@ -8,9 +8,12 @@ var testClient = require('./support/test_client');
var TestClient = require('../../support/test-client');
describe('multilayer error cases', function() {
var server;
var server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
before(function () {
server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
});
// var client = null;
afterEach(function(done) {
test/acceptance/ported/multilayer_interactivity.js
+5 -2
View File
@@ -8,9 +8,12 @@ var PortedServerOptions = require('./support/ported_server_options');
var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
describe('multilayer interactivity and layers order', function() {
var server;
var server = cartodbServer(PortedServerOptions);
server.setMaxListeners(0);
before(function () {
server = cartodbServer(PortedServerOptions);
server.setMaxListeners(0);
});
function layerType(layer) {
return layer.type || 'undefined';
test/acceptance/ported/raster.js
+6 -2
View File
@@ -8,8 +8,12 @@ var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
describe('raster', function() {
var server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
var server;
before(function () {
server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
});
function checkCORSHeaders(res) {
assert.equal(res.headers['access-control-allow-headers'], 'X-Requested-With, X-Prototype-Version, X-CSRF-Token');
test/acceptance/ported/retina.js
+5 -2
View File
@@ -11,9 +11,12 @@ describe('retina support', function() {
var layergroupId = null;
var server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
var server;
before(function () {
server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
});
var keysToDelete;
beforeEach(function(done) {
test/acceptance/ported/server.js
+5 -2
View File
@@ -6,9 +6,12 @@ var ServerOptions = require('./support/ported_server_options');
var testClient = require('./support/test_client');
describe('server', function() {
var server;
var server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
before(function () {
server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
});
after(function() {
testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
test/acceptance/ported/server_gettile.js
+5 -2
View File
@@ -8,9 +8,12 @@ var ServerOptions = require('./support/ported_server_options');
var testClient = require('./support/test_client');
describe('server_gettile', function() {
var server;
var server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
before(function () {
server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
});
var IMAGE_EQUALS_TOLERANCE_PER_MIL = 25;
test/acceptance/ported/server_png8_format.js
+15 -10
View File
@@ -11,17 +11,22 @@ var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
var IMAGE_EQUALS_TOLERANCE_PER_MIL = 85;
describe('server_png8_format', function() {
var serverOptionsPng32 = ServerOptions;
serverOptionsPng32.grainstore = _.clone(ServerOptions.grainstore);
serverOptionsPng32.grainstore.mapnik_tile_format = 'png32';
var serverPng32 = cartodbServer(serverOptionsPng32);
serverPng32.setMaxListeners(0);
var serverPng32;
var serverPng8;
var serverOptionsPng8 = ServerOptions;
serverOptionsPng8.grainstore = _.clone(ServerOptions.grainstore);
serverOptionsPng8.grainstore.mapnik_tile_format = 'png8:m=h';
var serverPng8 = cartodbServer(serverOptionsPng8);
serverPng8.setMaxListeners(0);
before(function () {
var serverOptionsPng32 = ServerOptions;
serverOptionsPng32.grainstore = _.clone(ServerOptions.grainstore);
serverOptionsPng32.grainstore.mapnik_tile_format = 'png32';
serverPng32 = cartodbServer(serverOptionsPng32);
serverPng32.setMaxListeners(0);
var serverOptionsPng8 = ServerOptions;
serverOptionsPng8.grainstore = _.clone(ServerOptions.grainstore);
serverOptionsPng8.grainstore.mapnik_tile_format = 'png8:m=h';
serverPng8 = cartodbServer(serverOptionsPng8);
serverPng8.setMaxListeners(0);
});
var layergroupId;
test/acceptance/ported/support/test_client.js
+13 -4
View File
@@ -39,9 +39,18 @@ module.exports = {
getTileLayer: getTileLayer
};
var server;
var server = new CartodbServer(PortedServerOptions);
server.setMaxListeners(0);
function getServer () {
if (server) {
return server;
}
server = new CartodbServer(PortedServerOptions);
server.setMaxListeners(0);
return server;
}
var jsonContentType = 'application/json; charset=utf-8';
var jsContentType = 'text/javascript; charset=utf-8';
@@ -349,7 +358,7 @@ function getGeneric(layergroupConfig, url, expectedResponse, callback) {
'Content-Type': 'application/json; charset=utf-8'
}
};
assert.response(server, request, expectedResponse, function (res, err) {
assert.response(getServer(), request, expectedResponse, function (res, err) {
next(err, res);
});
},
@@ -384,7 +393,7 @@ function getGeneric(layergroupConfig, url, expectedResponse, callback) {
request.encoding = 'binary';
}
assert.response(server, request, expectedResponse, function (res, err) {
assert.response(getServer(), request, expectedResponse, function (res, err) {
next(err, res);
});
},
test/acceptance/ported/torque.js
+5 -2
View File
@@ -9,9 +9,12 @@ var ServerOptions = require('./support/ported_server_options');
var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
describe('torque', function() {
var server;
var server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
before(function () {
server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
});
var keysToDelete;
beforeEach(function() {
test/acceptance/ported/torque_boundaries.js
+7 -3
View File
@@ -7,6 +7,13 @@ var ServerOptions = require('./support/ported_server_options');
var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
describe('torque boundary points', function() {
var server;
before(function () {
server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
});
var layergroupIdToDelete = null;
beforeEach(function() {
@@ -22,9 +29,6 @@ describe('torque boundary points', function() {
testHelper.deleteRedisKeys(keysToDelete, done);
});
var server = cartodbServer(ServerOptions);
server.setMaxListeners(0);
var boundaryPointsMapConfig = {
version: '1.1.0',
layers: [