diff --git a/NEWS.md b/NEWS.md index 252a57ff..79117943 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,7 +3,7 @@ Bug fixes: -* ... +* Survive presence of malformed CartoCSS in redis (#94) 1.5.0 -- 2013-11-19 ------------------- diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index bb1dcd9f..761f6949 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -9,10 +9,10 @@ "version": "1.3.3" }, "windshaft": { - "version": "0.14.3", + "version": "0.14.4", "dependencies": { "grainstore": { - "version": "0.14.2", + "version": "0.15.1", "dependencies": { "carto": { "version": "0.9.5-cdb2", @@ -45,14 +45,6 @@ "mapnik-reference": { "version": "5.0.7" }, - "hiredis": { - "version": "0.1.15", - "dependencies": { - "bindings": { - "version": "1.1.1" - } - } - }, "millstone": { "version": "0.6.8", "dependencies": { @@ -148,7 +140,7 @@ "version": "0.1.1", "dependencies": { "fstream": { - "version": "0.1.24", + "version": "0.1.25", "dependencies": { "rimraf": { "version": "2.2.2" @@ -247,8 +239,7 @@ } }, "tilelive-mapnik": { - "version": "0.5.0-cdb2", - "from": "git://github.com/Vizzuality/tilelive-mapnik.git#0.5.0-cdb2", + "version": "0.6.4", "dependencies": { "eio": { "version": "0.2.2" @@ -289,11 +280,19 @@ "semver": { "version": "1.1.4" }, + "redis": { + "version": "0.8.6" + }, "strftime": { "version": "0.6.2" }, - "redis": { - "version": "0.8.6" + "hiredis": { + "version": "0.1.15", + "dependencies": { + "bindings": { + "version": "1.1.0" + } + } }, "mocha": { "version": "1.14.0", diff --git a/package.json b/package.json index 603bec8c..59013bb5 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "node-varnish": "0.1.1", "underscore" : "~1.3.3", - "windshaft" : "~0.14.3", + "windshaft" : "~0.14.4", "step": "0.0.x", "request": "2.9.202", "cartodb-redis": "~0.1.0", diff --git a/test/acceptance/server.js b/test/acceptance/server.js index 95a4eac2..33248fb5 100644 --- a/test/acceptance/server.js +++ b/test/acceptance/server.js @@ -164,8 +164,8 @@ suite('server', function() { }); // See https://github.com/CartoDB/Windshaft-cartodb/issues/94 - test.skip("get'ing unrenderable style", function(done) { - var base_key = 'map_style|'+test_database+'|my_table'; + test("get'ing unrenderable style", function(done) { + var base_key = 'map_style|'+test_database+'|issue94'; var style = '#s{bogus}'; Step( function checkRedis() { @@ -183,7 +183,7 @@ suite('server', function() { var next = this; assert.response(server, { headers: {host: 'localhost'}, - url: '/tiles/my_table/style', + url: '/tiles/issue94/style', method: 'GET' }, {}, function(res) { next(null, res); }); },