Merge pull request #387 from CartoDB/upgrade-windshaft

Upgrade windshaft and regenerate npm-shrinkwrap.json

NEWS.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## 2.25.3
+## 2.26.0
+
+Released 2016-mm-dd
+
+Announcements:
+ - Upgrades windshaft to [1.13.0](https://github.com/CartoDB/Windshaft/releases/tag/1.13.0)
 
 
 ## 2.25.2

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.25.3",
+    "version": "2.26.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -26,7 +26,7 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "1.11.1",
+        "windshaft": "1.13.0",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",

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();
             }
         );