@@ -31,7 +31,7 @@ describe('WebSocketsController', () => {
3131 let provider : SocketServerProvider ,
3232 config : ApplicationConfig ,
3333 mockProvider : sinon . SinonMock ;
34-
34+ const messageHandlerCallback = ( ) => Promise . resolve ( ) ;
3535 const port = 90 ,
3636 namespace = '/' ;
3737 @WebSocketGateway ( port , { namespace } )
@@ -41,10 +41,12 @@ describe('WebSocketsController', () => {
4141 config = new ApplicationConfig ( new NoopAdapter ( ) ) ;
4242 provider = new SocketServerProvider ( null , config ) ;
4343 mockProvider = sinon . mock ( provider ) ;
44+ const contextCreator = sinon . createStubInstance ( WsContextCreator ) ;
45+ contextCreator . create . returns ( messageHandlerCallback ) ;
4446 instance = new WebSocketsController (
4547 provider ,
4648 config ,
47- sinon . createStubInstance ( WsContextCreator ) as any ,
49+ contextCreator as any ,
4850 ) ;
4951 } ) ;
5052 describe ( 'mergeGatewayAndServer' , ( ) => {
@@ -91,14 +93,21 @@ describe('WebSocketsController', () => {
9193 server ,
9294 hookServerToProperties : sinon . SinonSpy ,
9395 subscribeEvents : sinon . SinonSpy ;
96+ const handlerCallback = ( ) => { } ;
9497
9598 beforeEach ( ( ) => {
9699 gateway = new Test ( ) ;
97100 explorer = new GatewayMetadataExplorer ( new MetadataScanner ( ) ) ;
98101 mockExplorer = sinon . mock ( explorer ) ;
99102 ( instance as any ) . metadataExplorer = explorer ;
100103
101- handlers = [ 'test' ] ;
104+ handlers = [
105+ {
106+ message : 'message' ,
107+ methodName : 'methodName' ,
108+ callback : handlerCallback ,
109+ } ,
110+ ] ;
102111 server = { server : 'test' } ;
103112
104113 mockExplorer . expects ( 'explore' ) . returns ( handlers ) ;
@@ -115,7 +124,15 @@ describe('WebSocketsController', () => {
115124 } ) ;
116125 it ( 'should call "subscribeEvents" with expected arguments' , ( ) => {
117126 instance . subscribeToServerEvents ( gateway , namespace , port , '' ) ;
118- expect ( subscribeEvents . calledWith ( gateway , handlers , server ) ) ;
127+ expect ( subscribeEvents . firstCall . args [ 0 ] ) . to . be . equal ( gateway ) ;
128+ expect ( subscribeEvents . firstCall . args [ 2 ] ) . to . be . equal ( server ) ;
129+ expect ( subscribeEvents . firstCall . args [ 1 ] ) . to . be . eql ( [
130+ {
131+ message : 'message' ,
132+ methodName : 'methodName' ,
133+ callback : messageHandlerCallback ,
134+ } ,
135+ ] ) ;
119136 } ) ;
120137 } ) ;
121138 describe ( 'subscribeEvents' , ( ) => {
@@ -321,9 +338,9 @@ describe('WebSocketsController', () => {
321338 it ( 'should returns Promise<Observable>' , async ( ) => {
322339 const value = 100 ;
323340 expect (
324- await ( await instance . pickResult (
325- Promise . resolve ( Promise . resolve ( value ) ) ,
326- ) ) . toPromise ( ) ,
341+ await (
342+ await instance . pickResult ( Promise . resolve ( Promise . resolve ( value ) ) )
343+ ) . toPromise ( ) ,
327344 ) . to . be . eq ( 100 ) ;
328345 } ) ;
329346 } ) ;
@@ -332,9 +349,9 @@ describe('WebSocketsController', () => {
332349 it ( 'should returns Promise<Observable>' , async ( ) => {
333350 const value = 100 ;
334351 expect (
335- await ( await instance . pickResult (
336- Promise . resolve ( of ( value ) ) ,
337- ) ) . toPromise ( ) ,
352+ await (
353+ await instance . pickResult ( Promise . resolve ( of ( value ) ) )
354+ ) . toPromise ( ) ,
338355 ) . to . be . eq ( 100 ) ;
339356 } ) ;
340357 } ) ;
@@ -343,9 +360,9 @@ describe('WebSocketsController', () => {
343360 it ( 'should returns Promise<Observable>' , async ( ) => {
344361 const value = 100 ;
345362 expect (
346- await ( await instance . pickResult (
347- Promise . resolve ( value ) ,
348- ) ) . toPromise ( ) ,
363+ await (
364+ await instance . pickResult ( Promise . resolve ( value ) )
365+ ) . toPromise ( ) ,
349366 ) . to . be . eq ( 100 ) ;
350367 } ) ;
351368 } ) ;
0 commit comments