File tree Expand file tree Collapse file tree 1 file changed +6
-7
lines changed Expand file tree Collapse file tree 1 file changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -17,15 +17,13 @@ const createFixture = async (serviceManager) => {
17
17
stop : ( ) => { } ,
18
18
middlewares : _ . mapValues ( middlewares , ( service ) =>
19
19
_ . mapValues ( service , ( method ) => {
20
- let methodStub ;
21
-
22
20
if ( method . callback ) {
23
- methodStub = sinon . stub ( ) . returns ( sinon . stub ( ) . callsArg ( 2 ) ) ;
24
- methodStub . callback = true ;
25
- } else {
26
- methodStub = sinon . stub ( ) . callsArg ( 2 ) ;
21
+ const callbackStub = sinon . stub ( ) . returns ( sinon . stub ( ) . callsArg ( 2 ) ) ;
22
+ callbackStub . callback = true ;
23
+ return callbackStub ;
27
24
}
28
25
26
+ const methodStub = sinon . stub ( ) . callsArg ( 2 ) ;
29
27
methodStub . validations = _ . mapValues ( method . validations , ( ) => sinon . stub ( ) . callsArg ( 2 ) ) ;
30
28
31
29
return [ ...Object . values ( methodStub . validations ) , methodStub ] ;
@@ -84,7 +82,8 @@ const checkFixture = (fixture, expected) => {
84
82
if ( ! ( service in expected . middlewares ) ) expected . middlewares [ service ] = { } ;
85
83
Object . keys ( middlewares [ service ] ) . forEach ( ( method ) => {
86
84
const expressMiddlewares = middlewares [ service ] [ method ] ;
87
- const middlewareMethod = expressMiddlewares [ expressMiddlewares . length - 1 ] ;
85
+ // if no length -> callback middleware -> it's not an array
86
+ const middlewareMethod = expressMiddlewares . length ? expressMiddlewares [ expressMiddlewares . length - 1 ] : expressMiddlewares ;
88
87
89
88
if ( middlewareMethod . validations ) {
90
89
if ( ! validations . middlewares [ service ] ) validations . middlewares [ service ] = { } ;
You can’t perform that action at this time.
0 commit comments