Merge pull request #585 from CartoDB/fix-map-validator-basemap

Fix issues related to rollout
This commit is contained in:
Daniel 2016-11-05 14:35:06 +01:00 committed by GitHub
commit abe02db6c6
4 changed files with 236 additions and 232 deletions

View File

@ -3,6 +3,10 @@
## 2.81.1 ## 2.81.1
Released 2016-mm-dd Released 2016-mm-dd
Announcements:
- Upgrades windshaft to [2.6.2](https://github.com/CartoDB/windshaft/releases/tag/2.6.2).
- Upgrades camshaft to [0.46.3](https://github.com/CartoDB/camshaft/releases/tag/0.46.3).
## 2.81.0 ## 2.81.0
Released 2016-11-02 Released 2016-11-02

456
npm-shrinkwrap.json generated

File diff suppressed because it is too large Load Diff

View File

@ -20,7 +20,7 @@
], ],
"dependencies": { "dependencies": {
"body-parser": "~1.14.0", "body-parser": "~1.14.0",
"camshaft": "0.46.2", "camshaft": "0.46.3",
"cartodb-psql": "~0.6.1", "cartodb-psql": "~0.6.1",
"cartodb-query-tables": "~0.1.0", "cartodb-query-tables": "~0.1.0",
"cartodb-redis": "0.13.1", "cartodb-redis": "0.13.1",
@ -39,7 +39,7 @@
"step-profiler": "~0.3.0", "step-profiler": "~0.3.0",
"turbo-carto": "0.18.0", "turbo-carto": "0.18.0",
"underscore": "~1.6.0", "underscore": "~1.6.0",
"windshaft": "2.6.1", "windshaft": "2.6.2",
"yargs": "~5.0.0" "yargs": "~5.0.0"
}, },
"devDependencies": { "devDependencies": {

View File

@ -257,7 +257,7 @@ describe('multilayer error cases', function() {
layers: [ layers: [
{ options: { { options: {
sql: 'select * from test_table limit 1', sql: 'select * from test_table limit 1',
cartocss: '#test_table::outline[nonexistent="one"], [nonexistent="two"] { marker-fill: red; }', cartocss: '#test_table::outline[address="one"], [address="two"] { marker-fill: red; }',
cartocss_version: '2.0.2', cartocss_version: '2.0.2',
interactivity: [ 'cartodb_id' ], interactivity: [ 'cartodb_id' ],
geom_column: 'the_geom' geom_column: 'the_geom'
@ -282,7 +282,7 @@ describe('multilayer error cases', function() {
var parsed = JSON.parse(res.body); var parsed = JSON.parse(res.body);
assert.equal(parsed.errors.length, 1); assert.equal(parsed.errors.length, 1);
var error = parsed.errors[0]; var error = parsed.errors[0];
assert.ok(error.match(/column "nonexistent" does not exist/m), error); assert.ok(error.match(/column "address" does not exist/m), error);
done(); done();
}); });
}); });