diff --git a/.travis.yml b/.travis.yml index b946378f..5bc0cf1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: - docker pull cartoimages/windshaft-carto-testing script: - - docker run -v `pwd`:/srv cartoimages/windshaft-carto-testing + - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/windshaft-carto-testing language: generic diff --git a/docker-test.sh b/docker-test.sh index 6bf5360e..8cc8c093 100644 --- a/docker-test.sh +++ b/docker-test.sh @@ -8,4 +8,4 @@ yarn createdb template_postgis && createuser publicuser psql -c "CREATE EXTENSION postgis" template_postgis -npm test \ No newline at end of file +POSTGIS_VERSION=2.4 npm test \ No newline at end of file diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format.js index 2366d035..ba8955e7 100644 --- a/test/acceptance/buffer-size-format.js +++ b/test/acceptance/buffer-size-format.js @@ -152,7 +152,7 @@ describe('buffer size per format', function () { }); }); }; - if (test.format === 'mvt'){ + if (process.env.POSTGIS_VERSION === '2.4' && test.format === 'mvt'){ testFn(true); } testFn(false); @@ -465,7 +465,7 @@ describe('buffer size per format for named maps w/o placeholders', function () { }); }); }; - if (test.format === 'mvt'){ + if (process.env.POSTGIS_VERSION === '2.4' && test.format === 'mvt'){ testFn(true); } testFn(false); diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 883f050f..ded1772e 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -20,7 +20,9 @@ function createMapConfig(sql = TestClient.SQL.ONE_POINT) { } describe('mvt (mapnik)', mvt(false)); -describe('mvt (postgis)', mvt(true)); +if (process.env.POSTGIS_VERSION === '2.4') { + describe('mvt (postgis)', mvt(true)); +} function mvt(usePostGIS) { return function () { @@ -185,7 +187,7 @@ return function () { type: 'mapnik', options: { sql: 'select * from populated_places_simple_reduced', - cartocss: + cartocss: '#layer0 { marker-fill: red; marker-width: 10; [name="Madrid"] { marker-fill: green; } }', cartocss_version: '2.0.1', widgets: { diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit.js index eaf98805..0bb45c2b 100644 --- a/test/acceptance/user-render-timeout-limit.js +++ b/test/acceptance/user-render-timeout-limit.js @@ -201,7 +201,10 @@ describe('user render timeout limit', function () { }); }); - describe('vector (PostGIS)', vector(true)); + if (process.env.POSTGIS_VERSION === '2.4') { + describe('vector (PostGIS)', vector(true)); + } + describe('vector (mapnik)', vector(false)); function vector(usePostGIS) { const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS;