Merge branch 'mvt-invalid-props' of github.com:CartoDB/Windshaft-cartodb into mvt-invalid-props

This commit is contained in:
Simon Martín 2018-04-12 10:46:45 +02:00
commit b4ca44f096

View File

@ -5,18 +5,18 @@ const TestClient = require('../support/test-client');
const serverOptions = require('../../lib/cartodb/server_options'); const serverOptions = require('../../lib/cartodb/server_options');
const suites = [{ const suites = [{
desc: 'regressions mvt (mapnik)', desc: 'mapnik',
usePostGIS: false usePostGIS: false
}]; }];
if (process.env.POSTGIS_VERSION === '2.4') { if (process.env.POSTGIS_VERSION === '2.4') {
suites.push({ suites.push({
desc: 'regressions mvt (postgis)', desc: 'postgis',
usePostGIS: true usePostGIS: true
}); });
} }
describe('aggregation', function () { describe('mvt regressions', function () {
suites.forEach((suite) => { suites.forEach((suite) => {
const { desc, usePostGIS } = suite; const { desc, usePostGIS } = suite;
@ -36,7 +36,7 @@ describe('aggregation', function () {
this.testClient.drain(done); this.testClient.drain(done);
}); });
it('aggregates with centroid placement', function (done) { it('should not error on missing column from aggregation', function (done) {
const mapConfig = { const mapConfig = {
version: '1.7.0', version: '1.7.0',
layers: [ layers: [