From f6c519a9e7d1e032a264d49c031d9294d5cbd4f9 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 24 Feb 2016 02:18:55 +0100
Subject: [PATCH] Upgrade windshaft to 1.13.0

---
 npm-shrinkwrap.json                  | 14 +++++++-------
 package.json                         |  2 +-
 test/acceptance/multilayer_server.js |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 7a99a79d..b07f7742 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -75,7 +75,7 @@
         },
         "type-is": {
           "version": "1.6.11",
-          "from": "type-is@>=1.6.6 <1.7.0",
+          "from": "type-is@>=1.6.10 <1.7.0",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.11.tgz",
           "dependencies": {
             "media-typer": {
@@ -85,7 +85,7 @@
             },
             "mime-types": {
               "version": "2.1.10",
-              "from": "mime-types@>=2.1.9 <2.2.0",
+              "from": "mime-types@>=2.1.2 <2.2.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
               "dependencies": {
                 "mime-db": {
@@ -837,9 +837,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.12.0",
-      "from": "windshaft@1.12.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.12.0.tgz",
+      "version": "1.13.0",
+      "from": "windshaft@1.13.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.0.tgz",
       "dependencies": {
         "abaculus": {
           "version": "1.1.0-cdb4",
@@ -3730,8 +3730,8 @@
           "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.4.tgz"
         },
         "turbo-cartocss": {
-          "version": "0.2.0",
-          "from": "turbo-cartocss@>=0.2.0 <0.3.0",
+          "version": "0.4.0",
+          "from": "turbo-cartocss@>=0.4.0 <0.5.0",
           "dependencies": {
             "browser-request": {
               "version": "0.3.3",
diff --git a/package.json b/package.json
index d44f8620..0ac790fa 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "1.12.0",
+        "windshaft": "1.13.0",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",
diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js
index 544aea6c..4d7d77b7 100644
--- a/test/acceptance/multilayer_server.js
+++ b/test/acceptance/multilayer_server.js
@@ -70,8 +70,7 @@ describe('tests from old api translated to multilayer', function() {
             },
             function(res) {
                 var parsed = JSON.parse(res.body);
-                assert.ok(parsed.errors[0].match(/^style0/));
-                assert.ok(parsed.errors[0].match(/missing closing/));
+                assert.ok(parsed.errors[0].match(/<css input>:1:1: Unclosed block/));
                 done();
             }
         );