File tree Expand file tree Collapse file tree 3 files changed +23
-6
lines changed
Expand file tree Collapse file tree 3 files changed +23
-6
lines changed Original file line number Diff line number Diff line change 11import app from './' ; < % if ( filters . mongoose ) { % >
22import mongoose from 'mongoose' ; < % } % >
33
4- after ( function ( done ) {
5- app . angularFullstack . on ( 'close' , ( ) => done ( ) ) ; < % if ( filters . mongoose ) { % >
6- mongoose . connection . close ( ) ; < % } % >
7- app . angularFullstack . close ( ) ;
4+ after ( function ( ) {
5+ return Promise . all ( [
6+ // Add any promises here for processes that need to be closed before the tests can finish
7+ < % if ( filters . mongoose ) { % >
8+ new Promise ( resolve => {
9+ mongoose . connection . close ( resolve ) ;
10+ } ) , < % } % >
11+ new Promise(resolve => {
12+ app . angularFullstack . close ( resolve ) ;
13+ } ),
14+ < % _ if ( filters . ws ) { - % >
15+ new Promise(resolve => {
16+ app . primus . end ( resolve ) ;
17+ } ),< % } % >
18+ ]);
819} ) ;
Original file line number Diff line number Diff line change @@ -45,14 +45,20 @@ function startServer() {
4545< % if ( filters . sequelize ) { % >
4646sqldb.sequelize.sync()
4747 < % _ if ( filters . ws ) { - % >
48- .then(wsInitPromise)< % } % >
48+ .then(wsInitPromise)
49+ .then(primus => {
50+ app . primus = primus ;
51+ } )< % } % >
4952 .then(startServer)
5053 .catch(err => {
5154 console . log ( 'Server failed to start due to error: %s' , err ) ;
5255 } );
5356< % } else { % >
5457< % _ if ( filters . ws ) { - % >
5558wsInitPromise
59+ . then ( primus => {
60+ app . primus = primus ;
61+ } )
5662 . then ( startServer )
5763 . catch ( err => {
5864 console . log ( 'Server failed to start due to error: %s' , err ) ;
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ export default function initWebSocketServer(server) {
5353 primus . save ( path . join ( __dirname , '../../client/components/socket/primus.js' ) , err => {
5454 if ( err ) return reject ( err ) ;
5555
56- resolve ( ) ;
56+ resolve ( primus ) ;
5757 } ) ;
5858 } ) ;
5959}
You can’t perform that action at this time.
0 commit comments