@@ -8,9 +8,6 @@ import {Get} from "../../src/decorator/Get";
88import { QueryParam } from "../../src/decorator/QueryParam" ;
99import { ResponseClassTransformOptions } from "../../src/decorator/ResponseClassTransformOptions" ;
1010import { RoutingControllersOptions } from "../../src/RoutingControllersOptions" ;
11- import { ExpressErrorMiddlewareInterface } from "../../src/driver/express/ExpressErrorMiddlewareInterface" ;
12- import { Middleware } from "../../src/decorator/Middleware" ;
13- import { KoaMiddlewareInterface } from "../../src/driver/koa/KoaMiddlewareInterface" ;
1411
1512const chakram = require ( "chakram" ) ;
1613const expect = chakram . expect ;
@@ -238,44 +235,13 @@ describe("parameters auto-validation", () => {
238235 } ) ;
239236
240237 const options : RoutingControllersOptions = {
241- validation : true ,
242- defaultErrorHandler : false
238+ validation : true
243239 } ;
244240
245241 let expressApp : any , koaApp : any ;
246- before ( done => {
247-
248- @Middleware ( { type : "after" } )
249- class ExpressErrorHandler implements ExpressErrorMiddlewareInterface {
250-
251- error ( error : any , request : any , response : any , next : ( err ?: any ) => any ) : void {
252- response . statusCode = 400 ;
253- response . send ( error . paramName ) ;
254- next ( ) ;
255- }
256- }
257-
258- expressApp = createExpressServer ( options )
259- . listen ( 3001 , done ) ;
260- } ) ;
242+ before ( done => expressApp = createExpressServer ( options ) . listen ( 3001 , done ) ) ;
261243 after ( done => expressApp . close ( done ) ) ;
262- before ( done => {
263-
264- @Middleware ( { type : "before" } )
265- class KoaErrorHandler implements KoaMiddlewareInterface {
266-
267- async use ( context : any , next : ( err ?: any ) => Promise < any > ) : Promise < any > {
268- try {
269- await next ( ) ;
270- } catch ( e ) {
271- context . body = e . paramName ;
272- context . status = 400 ;
273- }
274- }
275- }
276-
277- koaApp = createKoaServer ( options ) . listen ( 3002 , done ) ;
278- } ) ;
244+ before ( done => koaApp = createKoaServer ( options ) . listen ( 3002 , done ) ) ;
279245 after ( done => koaApp . close ( done ) ) ;
280246
281247 const invalidFilter = {
@@ -284,8 +250,7 @@ describe("parameters auto-validation", () => {
284250
285251 assertRequest ( [ 3001 , 3002 ] , "get" , `user?filter=${ JSON . stringify ( invalidFilter ) } ` , response => {
286252 expect ( response ) . to . have . status ( 400 ) ;
287- expect ( response . body ) . to . equal ( "filter" ) ;
253+ expect ( response . body . paramName ) . to . equal ( "filter" ) ;
288254 } ) ;
289255 } ) ;
290-
291256} ) ;
0 commit comments