Merge pull request #773 from CartoDB/fix-test-postgis-2.3

Fix tests in master branch while testing in devel environment (NOT CI)

.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
 

docker-test.sh

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

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

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

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;