Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-07-30 20:03:42 +02:00
parent f7ed62b04c 72fefa71fc
commit 40c1ec0dec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/server/modules/org/arangodb/foxx/request_context.js
View File

@ -35,7 +35,7 @@ var SwaggerDocs = require("org/arangodb/foxx/swaggerDocs").Docs,
internal = require("org/arangodb/foxx/internals"), internal = require("org/arangodb/foxx/internals"),
toJSONSchema = require("org/arangodb/foxx/schema").toJSONSchema, toJSONSchema = require("org/arangodb/foxx/schema").toJSONSchema,
is = require("org/arangodb/is"), is = require("org/arangodb/is"),
BadRequest = require("http-errors").BadRequest, UnprocessableEntity = require("http-errors").UnprocessableEntity,
UnauthorizedError = require("org/arangodb/foxx/authentication").UnauthorizedError; UnauthorizedError = require("org/arangodb/foxx/authentication").UnauthorizedError;
function createBodyParamExtractor(rootElement, paramName, allowInvalid) { function createBodyParamExtractor(rootElement, paramName, allowInvalid) {
@ -101,7 +101,7 @@ function validateOrThrow(raw, schema, allowInvalid) {
} }
var result = joi.validate(raw, schema); var result = joi.validate(raw, schema);
if (result.error && !allowInvalid) { if (result.error && !allowInvalid) {
throw new BadRequest(result.error.message.replace(/^"value"/, 'Request body')); throw new UnprocessableEntity(result.error.message.replace(/^"value"/, 'Request body'));
} }
return result.value; return result.value;
} }

2
js/server/tests/shell-foxx.js
View File

@ -982,7 +982,7 @@ function DocumentationAndConstraintsSpec () {
callback(req, res); callback(req, res);
assertFalse(called); assertFalse(called);
assertEqual(res.responseCode, 400); assertEqual(res.responseCode, 422);
}, },
testSetParamForUndocumentedBodyParam: function () { testSetParamForUndocumentedBodyParam: function () {