2
2
var test = require ( './shared' ) . assert ;
3
3
var setupDatabase = require ( './shared' ) . setupDatabase ;
4
4
var fs = require ( 'fs' ) ;
5
+ var expect = require ( 'chai' ) . expect ;
5
6
6
7
describe ( 'Cursor' , function ( ) {
7
8
before ( function ( ) {
@@ -2285,7 +2286,9 @@ describe('Cursor', function() {
2285
2286
collection
2286
2287
) {
2287
2288
test . equal ( null , err ) ;
2288
- var closed = false ;
2289
+
2290
+ var closeCount = 0 ;
2291
+ var errorOccurred = false ;
2289
2292
2290
2293
var count = 100 ;
2291
2294
// Just hammer the server
@@ -2302,16 +2305,20 @@ describe('Cursor', function() {
2302
2305
} ) ;
2303
2306
2304
2307
stream . on ( 'error' , function ( err ) {
2305
- test . ok ( err != null ) ;
2308
+ expect ( err ) . to . exist ;
2309
+ errorOccurred = true ;
2306
2310
} ) ;
2307
2311
2308
- stream . on ( 'end' , function ( ) {
2309
- closed = true ;
2310
- } ) ;
2312
+ var validator = ( ) => {
2313
+ closeCount ++ ;
2314
+ if ( closeCount === 2 ) {
2315
+ expect ( errorOccurred ) . to . equal ( true ) ;
2316
+ done ( ) ;
2317
+ }
2318
+ } ;
2311
2319
2312
- stream . on ( 'close' , function ( ) {
2313
- closed = true ;
2314
- } ) ;
2320
+ stream . on ( 'end' , validator ) ;
2321
+ stream . on ( 'close' , validator ) ;
2315
2322
2316
2323
// Just hammer the server
2317
2324
for ( var i = 0 ; i < 100 ; i ++ ) {
@@ -2322,14 +2329,7 @@ describe('Cursor', function() {
2322
2329
} ) ;
2323
2330
}
2324
2331
2325
- setTimeout ( function ( ) {
2326
- client . close ( ) ;
2327
-
2328
- setTimeout ( function ( ) {
2329
- test . equal ( true , closed ) ;
2330
- done ( ) ;
2331
- } , 5000 ) ;
2332
- } , 800 ) ;
2332
+ setTimeout ( ( ) => client . close ( ) , 800 ) ;
2333
2333
}
2334
2334
} ) ;
2335
2335
}
0 commit comments