From a6e5898504e3a0ac03cb9886f87d5571c8d7a6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20Zag=C3=B3rski?= <zbigniew@cartodb.com>
Date: Fri, 19 Jan 2024 12:14:15 +0100
Subject: [PATCH] carto(v8.9): fix CartoLayer tests

---
 test/modules/carto/api/maps-api-client.spec.js | 5 -----
 test/modules/carto/carto-layer.spec.js         | 8 +++++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/test/modules/carto/api/maps-api-client.spec.js b/test/modules/carto/api/maps-api-client.spec.js
index e8ef469485b..ea71e7d9d3f 100644
--- a/test/modules/carto/api/maps-api-client.spec.js
+++ b/test/modules/carto/api/maps-api-client.spec.js
@@ -147,11 +147,6 @@ const TABLE_PARAMS = {
     params: {...TABLE_PARAMS, type: MAP_TYPES.TILESET, geoColumn: 'geo'},
     regex: /geoColumn parameter is not supported by type tileset/
   },
-  {
-    title: 'query + columns',
-    params: {...TABLE_PARAMS, type: MAP_TYPES.QUERY, columns: ['geo']},
-    regex: /columns parameter is not supported by type query/
-  },
   {
     title: 'no geoColumn + aggregationExp',
     params: {...TABLE_PARAMS, aggregationExp: 'sum(x) as y'},
diff --git a/test/modules/carto/carto-layer.spec.js b/test/modules/carto/carto-layer.spec.js
index 01089191d48..419ede79bf5 100644
--- a/test/modules/carto/carto-layer.spec.js
+++ b/test/modules/carto/carto-layer.spec.js
@@ -101,7 +101,8 @@ mockedV3Test('CartoLayer#v3', async t => {
         props: {
           ...props,
           data: 'select * from table',
-          type: MAP_TYPES.QUERY
+          type: MAP_TYPES.QUERY,
+          columns: ['a', 'b']
         },
         onAfterUpdate
       },
@@ -117,7 +118,8 @@ mockedV3Test('CartoLayer#v3', async t => {
         props: {
           ...props,
           data: 'table',
-          type: MAP_TYPES.TABLE
+          type: MAP_TYPES.TABLE,
+          columns: ['a', 'b']
         },
         onAfterUpdate
       },
@@ -252,7 +254,7 @@ mockedV1Test('CartoLayer#should throw with invalid params for v1 and v2', t => {
       },
       regex: /geoColumn prop is only supported for type/i
     })),
-    ...[MAP_TYPES.TILESET, MAP_TYPES.QUERY].map(type => ({
+    ...[MAP_TYPES.TILESET].map(type => ({
       title: `should throw when columns prop is used with type ${type}`,
       props: {
         ...layer.props,