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

Merge pull request #976 from Algunenano/auto_postgis

Browse Source 
Test: Make POSTGIS_VERSION detection automatic
This commit is contained in:
Raúl Marín
2018-06-12 10:09:40 +02:00
committed by GitHub
parent 163f494b8a 50cf5e5c7a
commit 7e7b268a66
9 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/aggregation.js
+1 -1
View File
@@ -9,7 +9,7 @@ const suites = [{
usePostGIS: false
}];
if (process.env.POSTGIS_VERSION === '2.4') {
if (process.env.POSTGIS_VERSION >= '20400') {
suites.push({
desc: 'mvt (postgis)',
usePostGIS: true
test/acceptance/buffer-size-format.js
+2 -2
View File
@@ -152,7 +152,7 @@ describe('buffer size per format', function () {
});
});
};
if (process.env.POSTGIS_VERSION === '2.4' && test.format === 'mvt'){
if (process.env.POSTGIS_VERSION >= '20400' && test.format === 'mvt'){
testFn(true);
}
testFn(false);
@@ -465,7 +465,7 @@ describe('buffer size per format for named maps w/o placeholders', function () {
});
});
};
if (process.env.POSTGIS_VERSION === '2.4' && test.format === 'mvt'){
if (process.env.POSTGIS_VERSION >= '20400' && test.format === 'mvt'){
testFn(true);
}
testFn(false);
test/acceptance/mvt-regressions.js
+1 -1
View File
@@ -9,7 +9,7 @@ const suites = [{
usePostGIS: false
}];
if (process.env.POSTGIS_VERSION === '2.4') {
if (process.env.POSTGIS_VERSION >= '20400') {
suites.push({
desc: 'postgis',
usePostGIS: true
test/acceptance/mvt.js
+1 -1
View File
@@ -20,7 +20,7 @@ function createMapConfig(sql = TestClient.SQL.ONE_POINT) {
}
describe('mvt (mapnik)', mvt(false));
if (process.env.POSTGIS_VERSION === '2.4') {
if (process.env.POSTGIS_VERSION >= '20400') {
describe('mvt (postgis)', mvt(true));
}
test/acceptance/user-database-timeout-limit.js
+1 -1
View File
@@ -440,7 +440,7 @@ describe('user database timeout limit', function () {
});
});
if (process.env.POSTGIS_VERSION === '2.4') {
if (process.env.POSTGIS_VERSION >= '20400') {
describe('fetching vector tiles via PostGIS renderer', function() {
const usePostGIS = true;
const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS;
test/acceptance/vector-layergroup.js
+1 -1
View File
@@ -72,7 +72,7 @@ const suites = [{
usePostGIS: false
}];
if (process.env.POSTGIS_VERSION === '2.4') {
if (process.env.POSTGIS_VERSION >= '20400') {
suites.push({
desc: 'mvt (postgis)',
usePostGIS: true