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

Move error message handling test to unit

Browse Source
This commit is contained in:
Raul Ochoa 2015-09-17 12:48:29 +02:00
parent f9f6c8b700
commit 9139feaa30
3 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/cartodb/controllers/base.js
View File

@ -189,20 +189,24 @@ BaseController.prototype.sendError = function(req, res, err, label) {
statusCode = 200;
}
// See https://github.com/Vizzuality/Windshaft-cartodb/issues/68
var message = (_.isString(err) ? err : err.message) || 'Unknown error';
// Strip connection info, if any
message = message
// See https://github.com/CartoDB/Windshaft/issues/173
.replace(/Connection string: '[^']*'\\n/, '')
// See https://travis-ci.org/CartoDB/Windshaft/jobs/20703062#L1644
.replace(/is the server.*encountered/im, 'encountered');
var errorResponseBody = { errors: [message] };
var errorResponseBody = { errors: [errorMessage(err)] };
this.send(req, res, [errorResponseBody, statusCode]);
};
function errorMessage(err) {
// See https://github.com/Vizzuality/Windshaft-cartodb/issues/68
var message = (_.isString(err) ? err : err.message) || 'Unknown error';
// Strip connection info, if any
return message
// See https://github.com/CartoDB/Windshaft/issues/173
.replace(/Connection string: '[^']*'\n\s/im, '')
// See https://travis-ci.org/CartoDB/Windshaft/jobs/20703062#L1644
.replace(/is the server.*encountered/im, 'encountered');
}
module.exports.errorMessage = errorMessage;
function findStatusCode(err) {
var statusCode;
if ( err.http_status ) {

27
test/acceptance/ported/regressions.js
View File

@ -135,31 +135,4 @@ describe('regressions', function() {
testClient.createLayergroup(mapConfig, { server: server }, completed);
}
});
// See https://github.com/CartoDB/Windshaft/issues/173
it.skip("#173 does not send db details in connection error response", function(done) {
var mapConfig = testClient.defaultTableMapConfig('test_table');
var CustomOptions = _.clone(ServerOptions);
CustomOptions.grainstore = _.clone(CustomOptions.grainstore);
CustomOptions.grainstore.datasource = _.clone(CustomOptions.grainstore.datasource);
CustomOptions.grainstore.datasource.port = '666';
var options = {
statusCode: 400,
serverOptions: CustomOptions
};
testClient.createLayergroup(mapConfig, options, function(err, res, parsedBody) {
assert.ok(parsedBody.errors);
var msg = parsedBody.errors[0];
assert.ok(msg.match(/connect/), msg);
assert.ok(!msg.match(/666/), msg);
done();
});
});
});

24
test/unit/cartodb/error_messages.test.js Normal file
View File

@ -0,0 +1,24 @@
require('../../support/test_helper');
var assert = require('assert');
var BaseController = require('../../../lib/cartodb/controllers/base');
describe('error messages clean up', function() {
// See https://github.com/CartoDB/Windshaft/issues/173
it("#173 does not send db details in connection error response", function() {
var inMessage = [
"Postgis Plugin: Bad connection",
"Connection string: 'host=127.0.0.1 port=5432 dbname=test_windshaft_cartodb_user_1_db " +
"user=test_windshaft_cartodb_user_1 connect_timeout=4'",
" encountered during parsing of layer 'layer0' in Layer"
].join('\n');
var outMessage = BaseController.errorMessage(inMessage);
assert.ok(outMessage.match('connect'), outMessage);
assert.ok(!outMessage.match(/666/), outMessage);
});
});