From 67ab12e8e779f7341f4a7eb4c10d2b0b944e364f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 16 Oct 2017 11:08:46 +0200 Subject: [PATCH] Add environment variable to check whether to run test against postgis 2.4 or not --- docker-test.sh | 2 +- test/acceptance/mvt.js | 6 ++++-- test/acceptance/user-render-timeout-limit.js | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) 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/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;