File tree 3 files changed +23
-6
lines changed
3 files changed +23
-6
lines changed Original file line number Diff line number Diff line change 1
1
import app from './' ; < % if ( filters . mongoose ) { % >
2
2
import mongoose from 'mongoose' ; < % } % >
3
3
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
+ ]);
8
19
} ) ;
Original file line number Diff line number Diff line change @@ -45,14 +45,20 @@ function startServer() {
45
45
< % if ( filters . sequelize ) { % >
46
46
sqldb.sequelize.sync()
47
47
< % _ if ( filters . ws ) { - % >
48
- .then(wsInitPromise)< % } % >
48
+ .then(wsInitPromise)
49
+ .then(primus => {
50
+ app . primus = primus ;
51
+ } )< % } % >
49
52
.then(startServer)
50
53
.catch(err => {
51
54
console . log ( 'Server failed to start due to error: %s' , err ) ;
52
55
} );
53
56
< % } else { % >
54
57
< % _ if ( filters . ws ) { - % >
55
58
wsInitPromise
59
+ . then ( primus => {
60
+ app . primus = primus ;
61
+ } )
56
62
. then ( startServer )
57
63
. catch ( err => {
58
64
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) {
53
53
primus . save ( path . join ( __dirname , '../../client/components/socket/primus.js' ) , err => {
54
54
if ( err ) return reject ( err ) ;
55
55
56
- resolve ( ) ;
56
+ resolve ( primus ) ;
57
57
} ) ;
58
58
} ) ;
59
59
}
You can’t perform that action at this time.
0 commit comments