From a0073da4b3bfcc11b4c2dc3ba5d7d3e560857f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= <dgaubert@cartodb.com>
Date: Wed, 9 Mar 2016 11:48:07 +0100
Subject: [PATCH] Added regression test for turbo-cartocss' integration

---
 .../utils/style/turbo-cartocss-adapter.js     |  7 +--
 test/acceptance/multilayer_server.js          |  4 +-
 test/acceptance/turbo-cartocss-regressions.js | 62 +++++++++++--------
 3 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/lib/cartodb/utils/style/turbo-cartocss-adapter.js b/lib/cartodb/utils/style/turbo-cartocss-adapter.js
index 873f8a2d..44500c9e 100644
--- a/lib/cartodb/utils/style/turbo-cartocss-adapter.js
+++ b/lib/cartodb/utils/style/turbo-cartocss-adapter.js
@@ -36,12 +36,11 @@ TurboCartocssAdapter.prototype._parseCartoCss = function (username, layer, callb
     }
 
     this.turboCartocssParser.process(username, layer.options.cartocss, layer.options.sql, function (err, cartocss) {
-        if (err) {
-            return callback(err);
+        // Ignore turbo-cartocss errors and continue
+        if (!err && cartocss) {
+            layer.options.cartocss = cartocss;
         }
 
-        layer.options.cartocss = cartocss;
-
         callback(null, layer);
     });
 };
diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js
index 1594d1ac..e443f3aa 100644
--- a/test/acceptance/multilayer_server.js
+++ b/test/acceptance/multilayer_server.js
@@ -71,8 +71,8 @@ describe('tests from old api translated to multilayer', function() {
             },
             function(res) {
                 var parsed = JSON.parse(res.body);
-                assert.ok(parsed.errors[0]);
-                assert.ok(parsed.errors[0].match(/Unclosed block/));
+                assert.ok(parsed.errors[0].match(/^style0/));
+                assert.ok(parsed.errors[0].match(/missing closing/));
                 done();
             }
         );
diff --git a/test/acceptance/turbo-cartocss-regressions.js b/test/acceptance/turbo-cartocss-regressions.js
index c429645b..52d55b35 100644
--- a/test/acceptance/turbo-cartocss-regressions.js
+++ b/test/acceptance/turbo-cartocss-regressions.js
@@ -31,35 +31,43 @@ function makeMapconfig(cartocss) {
     };
 }
 
-describe.skip('turbo-cartocss regressions', function() {
+describe('turbo-cartocss regressions', function() {
+
+    var cartocss = [
+        "/** simple visualization */",
+        "",
+        "Map {",
+        "  buffer-size: 256;",
+        "}",
+        "",
+        "#county_points_with_population{",
+        "  marker-fill-opacity: 0.1;",
+        "  marker-line-color:#FFFFFF;//#CF1C90;",
+        "  marker-line-width: 0;",
+        "  marker-line-opacity: 0.3;",
+        "  marker-placement: point;",
+        "  marker-type: ellipse;",
+        "  //marker-comp-op: overlay;",
+        "  marker-width: [price];",
+        "  [zoom=5]{marker-width: [price]*2;}",
+        "  [zoom=6]{marker-width: [price]*4;}",
+        "  marker-fill: #000000;",
+        "  marker-allow-overlap: true;",
+        "  ",
+        "",
+        "}"
+    ].join('\n');
+
+    beforeEach(function () {
+        this.testClient = new TestClient(makeMapconfig(cartocss));
+    });
+
+    afterEach(function (done) {
+        this.testClient.drain(done);
+    });
 
     it('should accept // comments', function(done) {
-        var cartocss = [
-            "/** simple visualization */",
-            "",
-            "Map {",
-            "  buffer-size: 256;",
-            "}",
-            "",
-            "#county_points_with_population{",
-            "  marker-fill-opacity: 0.1;",
-            "  marker-line-color:#FFFFFF;//#CF1C90;",
-            "  marker-line-width: 0;",
-            "  marker-line-opacity: 0.3;",
-            "  marker-placement: point;",
-            "  marker-type: ellipse;",
-            "  //marker-comp-op: overlay;",
-            "  marker-width: [price];",
-            "  [zoom=5]{marker-width: [price]*2;}",
-            "  [zoom=6]{marker-width: [price]*4;}",
-            "  marker-fill: #000000;",
-            "  marker-allow-overlap: true;",
-            "  ",
-            "",
-            "}"
-        ].join('\n');
-        var testClient = new TestClient(makeMapconfig(cartocss));
-        testClient.createLayergroup(function(err) {
+        this.testClient.getTile(0, 0, 0, function(err) {
             assert.ok(!err, err);
             done();
         });