From 23c0cb757d84d8e354ae3f70b1caf7c6e571a69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 1 Dec 2017 13:52:28 +0100
Subject: [PATCH] Fix tests according to the last changes in windshaft

---
 test/acceptance/mvt.js               | 14 +++++++-------
 test/acceptance/vector-layergroup.js | 15 +++++++--------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js
index 424ac95e..25544d5e 100644
--- a/test/acceptance/mvt.js
+++ b/test/acceptance/mvt.js
@@ -166,12 +166,12 @@ return function () {
 
                 assert.deepEqual(body, {
                     "errors": [
-                        "Invalid format: only mvt format is available for layers without CartoCSS defined"
+                        "Unsupported format: 'cartocss' option is missing for png"
                     ],
                     "errors_with_context":[
                         {
                             "type":"tile",
-                            "message":"Invalid format: only mvt format is available for layers without CartoCSS defined"
+                            "message":"Unsupported format: 'cartocss' option is missing for png"
                         }
                     ]
                 });
@@ -196,14 +196,14 @@ return function () {
 
                 assert.deepEqual(body, {
                     "errors": [
-                        "The layergroup contains incompatible layers: " +
-                            "don't mix styled layers with non styled layers (without cartocss)"
+                        "The `mapnik` or `cartodb` layers must be consistent:"  +
+                            " `cartocss` option is either present or voided in all layers. Mixing is not allowed."
                     ],
                     "errors_with_context":[
                         {
-                            "type":"layergroup",
-                            "message": "The layergroup contains incompatible layers: " +
-                                "don't mix styled layers with non styled layers (without cartocss)"
+                            "type":"mapconfig",
+                            "message": "The `mapnik` or `cartodb` layers must be consistent:"  +
+                            " `cartocss` option is either present or voided in all layers. Mixing is not allowed."
                         }
                     ]
                 });
diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js
index 794f8fbc..54ec29ef 100644
--- a/test/acceptance/vector-layergroup.js
+++ b/test/acceptance/vector-layergroup.js
@@ -43,27 +43,26 @@ function createVectorLayergroup () {
 
 const INCOMPATIBLE_LAYERS_ERROR = {
     "errors": [
-        "The layergroup contains incompatible layers: " +
-            "don't mix styled layers with non styled layers (without cartocss)"
+        "The `mapnik` or `cartodb` layers must be consistent:" +
+            " `cartocss` option is either present or voided in all layers. Mixing is not allowed."
     ],
     "errors_with_context":[
         {
-            "type":"layergroup",
-            "message": "The layergroup contains incompatible layers: " +
-                "don't mix styled layers with non styled layers (without cartocss)"
+            "type":"mapconfig",
+            "message": "The `mapnik` or `cartodb` layers must be consistent:"  +
+                " `cartocss` option is either present or voided in all layers. Mixing is not allowed."
         }
     ]
 };
 
 const INVALID_FORMAT_ERROR = {
     "errors": [
-        "Invalid format: only mvt format is available for layers without CartoCSS defined"
+        "Unsupported format: 'cartocss' option is missing for png"
     ],
     "errors_with_context":[
         {
             "type": "tile",
-            "message": "Invalid format:" +
-                " only mvt format is available for layers without CartoCSS defined"
+            "message": "Unsupported format: 'cartocss' option is missing for png"
         }
     ]
 };