cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Survive presence of malformed CartoCSS in redis

Browse Source 
Closes #94, enable relative testcase
This commit is contained in:
Sandro Santilli 2013-11-28 18:31:37 +01:00
parent 5298f4b517
commit a9d9b765e8
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.md
View File

@ -3,7 +3,7 @@
Bug fixes: Bug fixes:
* ... * Survive presence of malformed CartoCSS in redis (#94)
1.5.0 -- 2013-11-19 1.5.0 -- 2013-11-19
------------------- -------------------

29
npm-shrinkwrap.json generated
View File

@ -9,10 +9,10 @@
"version": "1.3.3" "version": "1.3.3"
}, },
"windshaft": { "windshaft": {
"version": "0.14.3", "version": "0.14.4",
"dependencies": { "dependencies": {
"grainstore": { "grainstore": {
"version": "0.14.2", "version": "0.15.1",
"dependencies": { "dependencies": {
"carto": { "carto": {
"version": "0.9.5-cdb2", "version": "0.9.5-cdb2",
@ -45,14 +45,6 @@
"mapnik-reference": { "mapnik-reference": {
"version": "5.0.7" "version": "5.0.7"
}, },
"hiredis": {
"version": "0.1.15",
"dependencies": {
"bindings": {
"version": "1.1.1"
}
}
},
"millstone": { "millstone": {
"version": "0.6.8", "version": "0.6.8",
"dependencies": { "dependencies": {
@ -148,7 +140,7 @@
"version": "0.1.1", "version": "0.1.1",
"dependencies": { "dependencies": {
"fstream": { "fstream": {
"version": "0.1.24", "version": "0.1.25",
"dependencies": { "dependencies": {
"rimraf": { "rimraf": {
"version": "2.2.2" "version": "2.2.2"
@ -247,8 +239,7 @@
} }
}, },
"tilelive-mapnik": { "tilelive-mapnik": {
"version": "0.5.0-cdb2", "version": "0.6.4",
"from": "git://github.com/Vizzuality/tilelive-mapnik.git#0.5.0-cdb2",
"dependencies": { "dependencies": {
"eio": { "eio": {
"version": "0.2.2" "version": "0.2.2"
@ -289,11 +280,19 @@
"semver": { "semver": {
"version": "1.1.4" "version": "1.1.4"
}, },
"redis": {
"version": "0.8.6"
},
"strftime": { "strftime": {
"version": "0.6.2" "version": "0.6.2"
}, },
"redis": { "hiredis": {
"version": "0.8.6" "version": "0.1.15",
"dependencies": {
"bindings": {
"version": "1.1.0"
}
}
}, },
"mocha": { "mocha": {
"version": "1.14.0", "version": "1.14.0",

2
package.json
View File

@ -24,7 +24,7 @@
"dependencies": { "dependencies": {
"node-varnish": "0.1.1", "node-varnish": "0.1.1",
"underscore" : "~1.3.3", "underscore" : "~1.3.3",
"windshaft" : "~0.14.3", "windshaft" : "~0.14.4",
"step": "0.0.x", "step": "0.0.x",
"request": "2.9.202", "request": "2.9.202",
"cartodb-redis": "~0.1.0", "cartodb-redis": "~0.1.0",

6
test/acceptance/server.js
View File

@ -164,8 +164,8 @@ suite('server', function() {
}); });
// See https://github.com/CartoDB/Windshaft-cartodb/issues/94 // See https://github.com/CartoDB/Windshaft-cartodb/issues/94
test.skip("get'ing unrenderable style", function(done) { test("get'ing unrenderable style", function(done) {
var base_key = 'map_style|'+test_database+'|my_table'; var base_key = 'map_style|'+test_database+'|issue94';
var style = '#s{bogus}'; var style = '#s{bogus}';
Step( Step(
function checkRedis() { function checkRedis() {
@ -183,7 +183,7 @@ suite('server', function() {
var next = this; var next = this;
assert.response(server, { assert.response(server, {
headers: {host: 'localhost'}, headers: {host: 'localhost'},
url: '/tiles/my_table/style', url: '/tiles/issue94/style',
method: 'GET' method: 'GET'
}, {}, function(res) { next(null, res); }); }, {}, function(res) { next(null, res); });
}, },