@@ -62,7 +62,7 @@ module.exports = {
6262 setUp : async ( callback ) => {
6363 try {
6464 const dbUri = await mongoServer . getConnectionString ( ) ;
65- mongoose . connect ( dbUri ) ;
65+ await mongoose . connect ( dbUri , { useNewUrlParser : true , useCreateIndex : true } ) ;
6666
6767 mongoose . connection . on ( 'error' , ( err ) => {
6868 // eslint-disable-next-line no-console
@@ -71,22 +71,26 @@ module.exports = {
7171 console . error ( `MongoDB connection error: ${ err } ` ) ;
7272 throw err ;
7373 } ) ;
74+ } catch ( err ) {
75+ callback ( err ) ;
76+ }
7477
78+ try {
7579 // conveniently, these static methods go around our authorization hooks
7680 await mongoose . connection . collections . newusers . drop ( ) ;
7781 await mongoose . connection . collections . cars . drop ( ) ;
78-
79- const user1 = await new User ( userSeed1 ) . save ( { authLevel : false } ) ;
80- const user2 = await new User ( userSeed2 ) . save ( { authLevel : false } ) ;
81- user1 . best_friend = user2 ;
82- await user1 . save ( { authLevel : false } ) ;
83- userDocs = [ user1 , user2 ] ;
84- await new Car ( carSeed1 ) . save ( { authLevel : false } ) ;
85- await new Car ( carSeed2 ) . save ( { authLevel : false } ) ;
86- callback ( ) ;
87- } catch ( err ) {
88- callback ( err ) ;
82+ } catch ( err2 ) {
83+ // swallow exception
8984 }
85+
86+ const user1 = await new User ( userSeed1 ) . save ( { authLevel : false } ) ;
87+ const user2 = await new User ( userSeed2 ) . save ( { authLevel : false } ) ;
88+ user1 . best_friend = user2 ;
89+ await user1 . save ( { authLevel : false } ) ;
90+ userDocs = [ user1 , user2 ] ;
91+ await new Car ( carSeed1 ) . save ( { authLevel : false } ) ;
92+ await new Car ( carSeed2 ) . save ( { authLevel : false } ) ;
93+ callback ( ) ;
9094 } ,
9195 Disable : {
9296 find : async ( test ) => {
0 commit comments