Release 2.54.0

Upgrades camshaft to 0.23.0

NEWS.md

@@ -1,5 +1,56 @@
 # Changelog
 
+## 2.54.0
+
+Released 2016-06-30
+
+Improvements:
+ - Errors with context: replaced `turbo-carto` error type by `layer` type.
+
+Announcements:
+ - Upgrades camshaft to [0.23.0](https://github.com/CartoDB/camshaft/releases/tag/0.23.0)
+
+
+## 2.53.5
+
+Released 2016-06-29
+
+Bug fixes:
+ - Uses node list so identical nodes are not de-duplicated and can be used with different ids #528.
+
+
+## 2.53.4
+
+Released 2016-06-28
+
+Announcements:
+ - Upgrades camshaft to [0.22.4](https://github.com/CartoDB/camshaft/releases/tag/0.22.4)
+
+
+## 2.53.3
+
+Released 2016-06-28
+
+Announcements:
+ - Upgrades camshaft to [0.22.3](https://github.com/CartoDB/camshaft/releases/tag/0.22.3)
+
+
+## 2.53.2
+
+Released 2016-06-28
+
+Announcements:
+ - Upgrades camshaft to [0.22.2](https://github.com/CartoDB/camshaft/releases/tag/0.22.2)
+
+
+## 2.53.1
+
+Released 2016-06-28
+
+Announcements:
+ - Upgrades camshaft to [0.22.1](https://github.com/CartoDB/camshaft/releases/tag/0.22.1)
+
+
 ## 2.53.0
 
 Released 2016-06-24
@@ -23,6 +74,7 @@ Released 2016-06-21
 Enhancements:
  - Split turbo-carto adapter substitutions tokens query.
  - Now errors with context have the same schema. #519
+ - Responses with error now return the layer-id to give more info to the user.
 
 Announcements:
  - Upgrades camshaft to [0.20.0](https://github.com/CartoDB/camshaft/releases/tag/0.20.0)

lib/cartodb/backends/dataview.js

@@ -85,7 +85,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
                     sourceId2Node[rootNode.params.id] = rootNode;
                 }
 
-                analysis.getSortedNodes().forEach(function(node) {
+                analysis.getNodes().forEach(function(node) {
                     if (node.params && node.params.id) {
                         sourceId2Node[node.params.id] = node;
                     }
@@ -232,7 +232,7 @@ DataviewBackend.prototype.search = function (mapConfigProvider, user, params, ca
                     sourceId2Node[rootNode.params.id] = rootNode;
                 }
 
-                analysis.getSortedNodes().forEach(function(node) {
+                analysis.getNodes().forEach(function(node) {
                     if (node.params && node.params.id) {
                         sourceId2Node[node.params.id] = node;
                     }

lib/cartodb/controllers/base.js

@@ -242,11 +242,19 @@ function errorMessageWithContext(err) {
     // See https://github.com/Vizzuality/Windshaft-cartodb/issues/68
     var message = (_.isString(err) ? err : err.message) || 'Unknown error';
 
-    return {
+    var error = {
         type: err.type || 'unknown',
         message: stripConnectionInfo(message),
-        context: err.context || 'unknown'
     };
+
+    for (var prop in err) {
+        // type & message are properties from Error's prototype and will be skipped
+        if (err.hasOwnProperty(prop)) {
+            error[prop] = err[prop];
+        }
+    }
+
+    return error;
 }
 module.exports.errorMessage = errorMessage;
 

lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js

@@ -58,14 +58,12 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
 
     requestMapConfig = appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId);
 
-    function createAnalysis(analysisDefinition, index, done) {
+    function createAnalysis(analysisDefinition, done) {
         self.analysisBackend.create(analysisConfiguration, analysisDefinition, function (err, analysis) {
             if (err) {
                 var error = new Error(err.message);
                 error.type = 'analysis';
-                error.context = {};
-                error.context.layer = {
-                    index: index,
+                error.analysis = {
                     id: analysisDefinition.id,
                     type: analysisDefinition.type
                 };
@@ -77,8 +75,8 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
     }
 
     var analysesQueue = queue(requestMapConfig.analyses.length);
-    requestMapConfig.analyses.forEach(function(analysis, index) {
-        analysesQueue.defer(createAnalysis, analysis, index);
+    requestMapConfig.analyses.forEach(function(analysis) {
+        analysesQueue.defer(createAnalysis, analysis);
     });
 
     analysesQueue.awaitAll(function(err, analysesResults) {
@@ -92,7 +90,7 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
                 sourceId2Query[rootNode.params.id] = rootNode;
             }
 
-            analysis.getSortedNodes().forEach(function(node) {
+            analysis.getNodes().forEach(function(node) {
                 if (node.params && node.params.id) {
                     sourceId2Query[node.params.id] = node;
                 }

lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js

@@ -9,6 +9,8 @@ var turboCarto = require('turbo-carto');
 var SubstitutionTokens = require('../../../utils/substitution-tokens');
 var PostgresDatasource = require('../../../backends/turbo-carto-postgres-datasource');
 
+var MapConfig = require('windshaft').model.MapConfig;
+
 function TurboCartoAdapter() {
 }
 
@@ -26,7 +28,8 @@ TurboCartoAdapter.prototype.getMapConfig = function (user, requestMapConfig, par
     var parseCartoQueue = queue(layers.length);
 
     layers.forEach(function(layer, index) {
-        parseCartoQueue.defer(self._parseCartoCss.bind(self), user, params, layer, index);
+        var layerId = MapConfig.getLayerId(requestMapConfig, index);
+        parseCartoQueue.defer(self._parseCartoCss.bind(self), user, params, layer, index, layerId);
     });
 
     parseCartoQueue.awaitAll(function (err, layers) {
@@ -65,7 +68,7 @@ var tokensQueryTpl = dot.template([
     'from bbox_query, pixel_size_query, scale_denominator_query, zoom_query'
 ].join('\n'));
 
-TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer, index, callback) {
+TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer, layerIndex, layerId, callback) {
     if (!shouldParseLayerCartocss(layer)) {
         return callback(null, layer);
     }
@@ -76,11 +79,13 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer,
         if (err && err.name === 'TurboCartoError') {
             var error = new Error('turbo-carto: ' + err.message);
             error.http_status = 400;
-            error.type = 'turbo-carto';
-            error.context = err.context;
-            error.context.layer = {
-                index: index,
-                type: layer.type
+            error.type = 'layer';
+            error.subtype = 'turbo-carto';
+            error.layer = {
+                id: layerId,
+                index: layerIndex,
+                type: layer.type,
+                context: err.context
             };
 
             return callback(error);

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.53.0",
+  "version": "2.54.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -90,7 +90,7 @@
             },
             "mime-types": {
               "version": "2.1.11",
-              "from": "mime-types@>=2.1.2 <2.2.0",
+              "from": "mime-types@>=2.1.11 <2.2.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
@@ -105,9 +105,9 @@
       }
     },
     "camshaft": {
-      "version": "0.22.0",
-      "from": "camshaft@0.22.0",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.22.0.tgz",
+      "version": "0.23.0",
+      "from": "camshaft@0.23.0",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.23.0.tgz",
       "dependencies": {
         "async": {
           "version": "1.5.2",
@@ -1318,9 +1318,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "2.3.0",
-      "from": "windshaft@2.3.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.3.0.tgz",
+      "version": "2.4.0",
+      "from": "windshaft@2.4.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.4.0.tgz",
       "dependencies": {
         "abaculus": {
           "version": "1.1.0-cdb5",
@@ -3031,16 +3031,16 @@
                       "from": "boom@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                     },
-                    "brace-expansion": {
-                      "version": "1.1.4",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
-                    },
                     "caseless": {
                       "version": "0.11.0",
                       "from": "caseless@>=0.11.0 <0.12.0",
                       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
                     },
+                    "brace-expansion": {
+                      "version": "1.1.4",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
+                    },
                     "chalk": {
                       "version": "1.1.3",
                       "from": "chalk@>=1.1.1 <2.0.0",
@@ -3106,16 +3106,16 @@
                       "from": "extend@>=3.0.0 <3.1.0",
                       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
                     },
-                    "forever-agent": {
-                      "version": "0.6.1",
-                      "from": "forever-agent@>=0.6.1 <0.7.0",
-                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                    },
                     "extsprintf": {
                       "version": "1.0.2",
                       "from": "extsprintf@1.0.2",
                       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
                     },
+                    "forever-agent": {
+                      "version": "0.6.1",
+                      "from": "forever-agent@>=0.6.1 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                    },
                     "form-data": {
                       "version": "1.0.0-rc4",
                       "from": "form-data@>=1.0.0-rc3 <1.1.0",
@@ -3206,16 +3206,16 @@
                       "from": "ini@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
                     },
-                    "is-property": {
-                      "version": "1.0.2",
-                      "from": "is-property@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                    },
                     "is-my-json-valid": {
                       "version": "2.13.1",
                       "from": "is-my-json-valid@>=2.12.4 <3.0.0",
                       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
                     },
+                    "is-property": {
+                      "version": "1.0.2",
+                      "from": "is-property@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                    },
                     "is-typedarray": {
                       "version": "1.0.0",
                       "from": "is-typedarray@>=1.0.0 <1.1.0",
@@ -3306,16 +3306,16 @@
                       "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
                     },
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    },
                     "mkdirp": {
                       "version": "0.5.1",
                       "from": "mkdirp@>=0.5.0 <0.6.0",
                       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
                     },
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    },
                     "ms": {
                       "version": "0.7.1",
                       "from": "ms@0.7.1",
@@ -3351,16 +3351,16 @@
                       "from": "path-is-absolute@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     },
-                    "pinkie-promise": {
-                      "version": "2.0.1",
-                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-                    },
                     "pinkie": {
                       "version": "2.0.4",
                       "from": "pinkie@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
                     },
+                    "pinkie-promise": {
+                      "version": "2.0.1",
+                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+                    },
                     "process-nextick-args": {
                       "version": "1.0.7",
                       "from": "process-nextick-args@>=1.0.6 <1.1.0",
@@ -3451,16 +3451,16 @@
                       "from": "util-deprecate@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                     },
-                    "verror": {
-                      "version": "1.3.6",
-                      "from": "verror@1.3.6",
-                      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-                    },
                     "wrappy": {
                       "version": "1.0.1",
                       "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     },
+                    "verror": {
+                      "version": "1.3.6",
+                      "from": "verror@1.3.6",
+                      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+                    },
                     "xtend": {
                       "version": "4.0.1",
                       "from": "xtend@>=4.0.0 <5.0.0",
@@ -3514,18 +3514,6 @@
                         }
                       }
                     },
-                    "sshpk": {
-                      "version": "1.8.3",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "from": "assert-plus@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-                        }
-                      }
-                    },
                     "tar-pack": {
                       "version": "3.1.3",
                       "from": "tar-pack@>=3.1.0 <3.2.0",
@@ -3537,6 +3525,18 @@
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
                         }
                       }
+                    },
+                    "sshpk": {
+                      "version": "1.8.3",
+                      "from": "sshpk@>=1.7.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "1.0.0",
+                          "from": "assert-plus@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+                        }
+                      }
                     }
                   }
                 },

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "2.53.0",
+  "version": "2.54.0",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "body-parser": "~1.14.0",
-    "camshaft": "0.22.0",
+    "camshaft": "0.23.0",
     "cartodb-psql": "~0.6.1",
     "cartodb-query-tables": "~0.1.0",
     "cartodb-redis": "~0.13.0",
@@ -39,7 +39,7 @@
     "step-profiler": "~0.3.0",
     "turbo-carto": "0.12.1",
     "underscore": "~1.6.0",
-    "windshaft": "2.3.0"
+    "windshaft": "2.4.0"
   },
   "devDependencies": {
     "istanbul": "~0.4.3",

test/acceptance/analysis/error-cases.js

@@ -204,9 +204,8 @@ describe('analysis-layers error cases', function() {
                 layergroupResult.errors_with_context[0].message,
                 'Analysis requires authentication with API key: permission denied.'
             );
-            assert.equal(layergroupResult.errors_with_context[0].context.layer.index, 0);
-            assert.equal(layergroupResult.errors_with_context[0].context.layer.id, 'HEAD');
-            assert.equal(layergroupResult.errors_with_context[0].context.layer.type, 'buffer');
+            assert.equal(layergroupResult.errors_with_context[0].analysis.id, 'HEAD');
+            assert.equal(layergroupResult.errors_with_context[0].analysis.type, 'buffer');
 
             testClient.drain(done);
         });
@@ -258,9 +257,8 @@ describe('analysis-layers error cases', function() {
 
             assert.equal(layergroupResult.errors_with_context[0].type, 'analysis');
             assert.equal(layergroupResult.errors_with_context[0].message, 'Missing required param "radius"');
-            assert.equal(layergroupResult.errors_with_context[0].context.layer.index, 0);
-            assert.equal(layergroupResult.errors_with_context[0].context.layer.id, 'HEAD');
-            assert.equal(layergroupResult.errors_with_context[0].context.layer.type, 'buffer');
+            assert.equal(layergroupResult.errors_with_context[0].analysis.id, 'HEAD');
+            assert.equal(layergroupResult.errors_with_context[0].analysis.type, 'buffer');
 
             testClient.drain(done);
         });

test/acceptance/analysis/regressions.js

@@ -0,0 +1,107 @@
+require('../../support/test_helper');
+
+var assert = require('../../support/assert');
+var TestClient = require('../../support/test-client');
+
+describe('analysis-layers error cases', function() {
+    it('should handle missing analysis nodes for layers', function(done) {
+        var mapConfig = {
+            "version": "1.5.0",
+            "layers": [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "cartocss": TestClient.CARTOCSS.POINTS,
+                        "cartocss_version": "2.1.1",
+                        "interactivity": [],
+                        "source": {
+                            "id": "a4"
+                        }
+                    }
+                },
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "cartocss": TestClient.CARTOCSS.POINTS,
+                        "cartocss_version": "2.1.0",
+                        "interactivity": [],
+                        "source": {
+                            "id": "b1"
+                        }
+                    }
+                }
+            ],
+            "dataviews": {
+                "74493a30-4679-4b72-a60c-b6f808b57c98": {
+                    "type": "histogram",
+                    "source": {
+                        "id": "b0"
+                    },
+                    "options": {
+                        "column": "customer_value",
+                        "bins": 10
+                    }
+                }
+            },
+            "analyses": [
+                {
+                    "id": "a4",
+                    "type": "intersection",
+                    "params": {
+                        "source": {
+                            "id": "a3",
+                            "type": "buffer",
+                            "params": {
+                                "source": {
+                                    "id": "a2",
+                                    "type": "centroid",
+                                    "params": {
+                                        "source": {
+                                            "id": "b1",
+                                            "type": "kmeans",
+                                            "params": {
+                                                "source": {
+                                                    "id": "b0",
+                                                    "type": "source",
+                                                    "params": {
+                                                        "query": "SELECT * FROM populated_places_simple_reduced"
+                                                    }
+                                                },
+                                                "clusters": 5
+                                            }
+                                        },
+                                        "category_column": "cluster_no"
+                                    }
+                                },
+                                "radius": 200000
+                            }
+                        },
+                        "target": {
+                            "id": "customer_home_locations",
+                            "type": "source",
+                            "params": {
+                                "query": "SELECT * FROM populated_places_simple_reduced"
+                            }
+                        }
+                    }
+                }
+            ]
+        };
+
+        var testClient = new TestClient(mapConfig, 1234);
+
+        testClient.getLayergroup(function(err, layergroupResult) {
+            assert.ok(!err, err);
+
+            assert.ok(layergroupResult);
+            assert.ok(layergroupResult.metadata);
+            var analyses = layergroupResult.metadata.analyses;
+            assert.ok(analyses);
+            assert.equal(analyses.length, 1);
+            assert.equal(Object.keys(analyses[0].nodes).length, 5);
+
+            testClient.drain(done);
+        });
+    });
+
+});

test/acceptance/ported/attributes.js

@@ -234,7 +234,7 @@ describe('attributes', function() {
                     '/**/ typeof test === \'function\' && ' +
                     'test({"errors":["Layer 0 has no exposed attributes"],' +
                     '"errors_with_context":[{' +
-                    '"type":"unknown","message":"Layer 0 has no exposed attributes","context":"unknown"' +
+                    '"type":"unknown","message":"Layer 0 has no exposed attributes"' +
                     '}]});'
                 );
                 return null;

test/acceptance/ported/multilayer_error_cases.js

@@ -61,7 +61,7 @@ describe('multilayer error cases', function() {
                 '/**/ typeof test === \'function\' && ' +
                 'test({"errors":["Missing layers array from layergroup config"],' +
                 '"errors_with_context":[{"type":"unknown",' +
-                '"message":"Missing layers array from layergroup config","context":"unknown"}]});'
+                '"message":"Missing layers array from layergroup config"}]});'
             );
             done();
         });

test/acceptance/turbo-cartocss/error-cases.js

@@ -114,16 +114,18 @@ describe('turbo-carto error cases', function() {
 
             assert.ok(layergroup.hasOwnProperty('errors'));
             assert.equal(layergroup.errors_with_context.length, 1);
-            assert.equal(layergroup.errors_with_context[0].type, 'turbo-carto');
+            assert.equal(layergroup.errors_with_context[0].type, 'layer');
+            assert.equal(layergroup.errors_with_context[0].subtype, 'turbo-carto');
             assert.ok(layergroup.errors_with_context[0].message.match(/^turbo-carto/));
             assert.ok(layergroup.errors_with_context[0].message.match(/unable\sto\scompute\sramp/i));
             assert.ok(layergroup.errors_with_context[0].message.match(/wadus_column/));
 
-            assert.equal(layergroup.errors_with_context[0].context.layer.index, 0);
-            assert.equal(layergroup.errors_with_context[0].context.layer.type, 'mapnik');
+            assert.equal(layergroup.errors_with_context[0].layer.id, 'layer0');
+            assert.equal(layergroup.errors_with_context[0].layer.index, 0);
+            assert.equal(layergroup.errors_with_context[0].layer.type, 'mapnik');
 
-            assert.equal(layergroup.errors_with_context[0].context.selector, '#populated_places_simple_reduced');
-            assert.deepEqual(layergroup.errors_with_context[0].context.source, {
+            assert.equal(layergroup.errors_with_context[0].layer.context.selector, '#populated_places_simple_reduced');
+            assert.deepEqual(layergroup.errors_with_context[0].layer.context.source, {
                 start: {
                     line: 10,
                     column: 3

test/acceptance/turbo-cartocss/regressions.js

@@ -87,7 +87,7 @@ describe('turbo-carto regressions', function() {
 
             var turboCartoError = layergroup.errors_with_context[0];
             assert.ok(turboCartoError);
-            assert.equal(turboCartoError.type, 'turbo-carto');
+            assert.equal(turboCartoError.type, 'layer');
             assert.ok(turboCartoError.message.match(/permission\sdenied\sfor\srelation\stest_table_private_1/));
 
             done();

test/support/sql/windshaft.test.sql

@@ -633,3 +633,18 @@ GRANT SELECT ON TABLE analysis_rent_listings TO :PUBLICUSER;
 
 --
 GRANT SELECT, UPDATE, INSERT, DELETE ON cdb_analysis_catalog TO :TESTUSER;
+
+create schema cdb_crankshaft;
+GRANT USAGE ON SCHEMA cdb_crankshaft TO :TESTUSER;
+CREATE TYPE kmeans_type as (cartodb_id numeric, cluster_no numeric);
+CREATE OR REPLACE FUNCTION cdb_crankshaft.CDB_KMeans(query text, no_clusters integer,no_init integer default 20)
+    RETURNS setof kmeans_type as $$
+    DECLARE r kmeans_type;
+    BEGIN
+    FOR r IN EXECUTE format('select cartodb_id, ceil(random() * 10) AS cluster_no from (%s) _cdb_query', query) loop
+        RETURN NEXT r;
+    END LOOP;
+    RETURN;
+    END;
+$$ LANGUAGE plpgsql;
+GRANT ALL ON FUNCTION cdb_crankshaft.CDB_KMeans(text, integer, integer) TO :TESTUSER;

test/support/test-client.js

@@ -33,6 +33,39 @@ module.exports.RESPONSE = {
     }
 };
 
+module.exports.CARTOCSS = {
+    POINTS: [
+        '#layer{',
+        '  marker-placement: point;',
+        '  marker-allow-overlap: true;',
+        '  marker-line-opacity: 0.2;',
+        '  marker-line-width: 0.5;',
+        '  marker-opacity: 1;',
+        '  marker-width: 5;',
+        '  marker-fill: red;',
+        '}'
+    ].join('\n'),
+
+    LINES: [
+        '#lines {',
+        '  line-color: black;',
+        '  line-width: 1;',
+        '  line-opacity: 1;',
+        '}'
+    ].join('\n'),
+
+    POLYGONS: [
+        '#layer {',
+        '  polygon-fill: red;',
+        '  polygon-opacity: 0.6;',
+        '  polygon-opacity: 0.7;',
+        '  line-color: #FFF;',
+        '  line-width: 0.5;',
+        '  line-opacity: 1;',
+        '}'
+    ].join('\n')
+};
+
 TestClient.prototype.getWidget = function(widgetName, params, callback) {
     var self = this;