From 0906ae3c932b3b5d49a5eb8862312b9cce4ac2b0 Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Tue, 20 Mar 2018 11:33:31 +0100
Subject: [PATCH] PG11: Modify regex match to accept pg11 errors

---
 NEWS.md                                    | 1 +
 test/acceptance/multilayer.js              | 2 +-
 test/acceptance/named_layers.js            | 2 +-
 test/acceptance/turbo-carto/regressions.js | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index b61c816f..119f0169 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -9,6 +9,7 @@ New features:
  - Upgrades camshaft to 0.61.8
  - Upgrades cartodb-redis to 1.0.0
  - Rate limit feature (disabled by default)
+ - Fixes for tests with PG11
 
 ## 5.4.0
 Released 2018-03-15
diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js
index a1a93e40..dfb6174f 100644
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -1336,7 +1336,7 @@ describe(suiteName, function() {
                 status: 403
             },
             function(res) {
-                assert.ok(res.body.match(/permission denied for relation test_table_private_1/));
+                assert.ok(res.body.match(/permission denied for .+?test_table_private_1/));
                 done();
             }
         );
diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js
index 5844c479..2090ffe2 100644
--- a/test/acceptance/named_layers.js
+++ b/test/acceptance/named_layers.js
@@ -659,7 +659,7 @@ describe('named_layers', function() {
                 }
 
                 var parsedBody = JSON.parse(response.body);
-                assert.ok(parsedBody.errors[0].match(/permission denied for relation test_table_private_1/));
+                assert.ok(parsedBody.errors[0].match(/permission denied for .+?test_table_private_1/));
 
                 return null;
             },
diff --git a/test/acceptance/turbo-carto/regressions.js b/test/acceptance/turbo-carto/regressions.js
index 9e2d377f..3f3ebc57 100644
--- a/test/acceptance/turbo-carto/regressions.js
+++ b/test/acceptance/turbo-carto/regressions.js
@@ -88,7 +88,7 @@ describe('turbo-carto regressions', function() {
             var turboCartoError = layergroup.errors_with_context[0];
             assert.ok(turboCartoError);
             assert.equal(turboCartoError.type, 'layer');
-            assert.ok(turboCartoError.message.match(/permission\sdenied\sfor\srelation\stest_table_private_1/));
+            assert.ok(turboCartoError.message.match(/permission\sdenied\sfor\s.+?test_table_private_1/));
 
             done();
         });