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

Remove comments

Browse Source
This commit is contained in:
Raul Ochoa 2015-03-30 13:30:44 +02:00
parent 41521b6776
commit 2161bbf8e9
1 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/acceptance/server.js
View File

@ -2,7 +2,6 @@ var assert = require('../support/assert');
var _ = require('underscore');
var redis = require('redis');
var querystring = require('querystring');
var semver = require('semver');
var step = require('step');
var helper = require(__dirname + '/../support/test_helper');
@ -19,12 +18,6 @@ var cdbQueryTablesFromPostgresEnabledValue = true;
suite('server', function() {
/////////////////////////////////////////////////////////////////////////////////
//
// GET UNSUPPORTED
//
/////////////////////////////////////////////////////////////////////////////////
// TODO: I guess this should be a 404 instead...
test("get call to server returns 200", function(done){
step(
@ -48,12 +41,6 @@ suite('server', function() {
);
});
/////////////////////////////////////////////////////////////////////////////////
//
// GET VERSION
//
/////////////////////////////////////////////////////////////////////////////////
test("get call to server returns 200", function(done){
assert.response(server, {
url: '/version',
@ -83,33 +70,7 @@ suite.skip('server old_api', function() {
var redis_client = redis.createClient(global.environment.redis.port);
var sqlapi_server;
var mapnik_version = global.environment.mapnik_version || server.getVersion().mapnik;
var test_database = _.template(global.environment.postgres_auth_user, {user_id:1}) + '_db';
var default_style;
if ( semver.satisfies(mapnik_version, '<2.1.0') ) {
// 2.0.0 default
default_style = '#<%= table %>{marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;' +
'marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;' +
'marker-type: ellipse;marker-allow-overlap: true;}';
}
else if ( semver.satisfies(mapnik_version, '<2.2.0') ) {
// 2.1.0 default
default_style = '#<%= table %>[mapnik-geometry-type=1] {marker-fill: #FF6600;marker-opacity: 1;' +
'marker-width: 16;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;' +
'marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}' +
'#<%= table %>[mapnik-geometry-type=2] {line-color:#FF6600; line-width:1; line-opacity: 0.7;}' +
'#<%= table %>[mapnik-geometry-type=3] {polygon-fill:#FF6600; polygon-opacity: 0.7; line-opacity:1;' +
' line-color: #FFFFFF;}';
}
else {
// 2.2.0+ default
default_style = '#<%= table %>["mapnik::geometry_type"=1] {marker-fill: #FF6600;marker-opacity: 1;' +
'marker-width: 16;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;' +
'marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}' +
'#<%= table %>["mapnik::geometry_type"=2] {line-color:#FF6600; line-width:1; line-opacity: 0.7;}' +
'#<%= table %>["mapnik::geometry_type"=3] {polygon-fill:#FF6600; polygon-opacity: 0.7; line-opacity:1;' +
' line-color: #FFFFFF;}';
}
// A couple of styles to use during testing
var test_style_black_200 = "#test_table{marker-fill:black;marker-line-color:red;marker-width:10}";