johnrees
diff --git a/‎js/server/modules/org/arangodb/foxx/request_context.js
Lines changed: 2 additions & 1 deletion b/‎js/server/modules/org/arangodb/foxx/request_context.js
Lines changed: 2 additions & 1 deletion
diff --git a/‎js/server/tests/shell-foxx.js
Lines changed: 4 additions & 11 deletions b/‎js/server/tests/shell-foxx.js
Lines changed: 4 additions & 11 deletions
@@ -35,6 +35,7 @@ var SwaggerDocs = require("org/arangodb/foxx/swaggerDocs").Docs,
   internal = require("org/arangodb/foxx/internals"),
   toJSONSchema = require("org/arangodb/foxx/schema").toJSONSchema,
   is = require("org/arangodb/is"),
+  BadRequest = require("http-errors").BadRequest,
   UnauthorizedError = require("org/arangodb/foxx/authentication").UnauthorizedError;
 
 function createBodyParamExtractor(rootElement, paramName, allowInvalid) {
@@ -100,7 +101,7 @@ function validateOrThrow(raw, schema, allowInvalid) {
   }
   var result = joi.validate(raw, schema);
   if (result.error && !allowInvalid) {
-    throw result.error;
+    throw new BadRequest(result.error.message);
   }
   return result.value;
 }
 
@@ -964,9 +964,7 @@ function DocumentationAndConstraintsSpec () {
         paramName = 'flurb',
         description = stub(),
         requestBody = 'banana',
-        schema = joi.array().items({x: joi.number().integer().required()}),
-        called = false,
-        thrown = false;
+        schema = joi.array().items({x: joi.number().integer().required()});
 
       allow(req)
         .toReceive("body")
@@ -979,15 +977,10 @@ function DocumentationAndConstraintsSpec () {
         type: schema
       });
 
-      try {
-        var callback = transformRoute(routes[0].action);
-        callback(req, res);
-      } catch(e) {
-        thrown = true;
-      }
+      var callback = transformRoute(routes[0].action);
+      callback(req, res);
 
-      assertTrue(thrown);
-      assertFalse(called);
+      assertEqual(res.responseCode, 400);
     },
 
     testSetParamForUndocumentedBodyParam: function () {
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ var SwaggerDocs = require("org/arangodb/foxx/swaggerDocs").Docs,`
`35`	`35`	`internal = require("org/arangodb/foxx/internals"),`
`36`	`36`	`toJSONSchema = require("org/arangodb/foxx/schema").toJSONSchema,`
`37`	`37`	`is = require("org/arangodb/is"),`
	`38`	`+ BadRequest = require("http-errors").BadRequest,`
`38`	`39`	`UnauthorizedError = require("org/arangodb/foxx/authentication").UnauthorizedError;`
`39`	`40`
`40`	`41`	`function createBodyParamExtractor(rootElement, paramName, allowInvalid) {`
`@@ -100,7 +101,7 @@ function validateOrThrow(raw, schema, allowInvalid) {`
`100`	`101`	`}`
`101`	`102`	`var result = joi.validate(raw, schema);`
`102`	`103`	`if (result.error && !allowInvalid) {`
`103`		`- throw result.error;`
	`104`	`+ throw new BadRequest(result.error.message);`
`104`	`105`	`}`
`105`	`106`	`return result.value;`
`106`	`107`	`}`