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

Add environment variable to check whether to run test against postgis 2.4 or not

Browse Source
This commit is contained in:
Daniel García Aubert 2017-10-16 11:08:46 +02:00
parent d959ef5007
commit 67ab12e8e7
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-test.sh
View File

@ -8,4 +8,4 @@ yarn
createdb template_postgis && createuser publicuser
psql -c "CREATE EXTENSION postgis" template_postgis
npm test
POSTGIS_VERSION=2.4 npm test

6
test/acceptance/mvt.js
View File

@ -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: {

5
test/acceptance/user-render-timeout-limit.js
View File

@ -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;