@@ -13,6 +13,9 @@ module.exports = function(options) {
1313 } ) ;
1414
1515 afterEach ( function ( ) {
16+ if ( sinon . clock ) {
17+ sinon . clock . uninstall ( ) ;
18+ }
1619 sinon . restore ( ) ;
1720 } ) ;
1821
@@ -517,7 +520,7 @@ function commonTests(options) {
517520 } ) ;
518521
519522 it ( 'pollDebounce option reduces subsequent poll interval' , function ( done ) {
520- var clock = sinon . useFakeTimers ( ) ;
523+ var clock = util . useFakeTimers ( ) ;
521524 var connection = this . backend . connect ( ) ;
522525 this . backend . db . canPollDoc = function ( ) {
523526 return false ;
@@ -539,7 +542,7 @@ function commonTests(options) {
539542 connection . get ( 'items' , i . toString ( ) ) . on ( 'error' , done ) . create ( { } , function ( err ) {
540543 if ( err ) return done ( err ) ;
541544 counter ++ ;
542- if ( counter === 9 ) clock . tickAsync ( 10000 ) ;
545+ if ( counter === 9 ) clock . tick ( 10000 ) ;
543546 } ) ;
544547 }
545548 }
@@ -561,12 +564,12 @@ function commonTests(options) {
561564 // event firing the first time, while sharedb is definitely
562565 // debouncing
563566 connection . get ( 'items' , '0' ) . on ( 'error' , done ) . create ( { } , function ( ) {
564- clock . tickAsync ( 3000 ) ;
567+ clock . tick ( 3000 ) ;
565568 } ) ;
566569 } ) ;
567570
568571 it ( 'db.pollDebounce option reduces subsequent poll interval' , function ( done ) {
569- var clock = sinon . useFakeTimers ( ) ;
572+ var clock = util . useFakeTimers ( ) ;
570573 var connection = this . backend . connect ( ) ;
571574 this . backend . db . canPollDoc = function ( ) {
572575 return false ;
@@ -589,7 +592,7 @@ function commonTests(options) {
589592 connection . get ( 'items' , i . toString ( ) ) . on ( 'error' , done ) . create ( { } , function ( err ) {
590593 if ( err ) return done ( err ) ;
591594 counter ++ ;
592- if ( counter === 9 ) clock . tickAsync ( 10000 ) ;
595+ if ( counter === 9 ) clock . tick ( 10000 ) ;
593596 } ) ;
594597 }
595598 }
@@ -611,12 +614,12 @@ function commonTests(options) {
611614 // event firing the first time, while sharedb is definitely
612615 // debouncing
613616 connection . get ( 'items' , '0' ) . on ( 'error' , done ) . create ( { } , function ( ) {
614- clock . tickAsync ( 3000 ) ;
617+ clock . tick ( 3000 ) ;
615618 } ) ;
616619 } ) ;
617620
618621 it ( 'pollInterval updates a subscribed query after an unpublished create' , function ( done ) {
619- var clock = sinon . useFakeTimers ( ) ;
622+ var clock = util . useFakeTimers ( ) ;
620623 var connection = this . backend . connect ( ) ;
621624 this . backend . suppressPublish = true ;
622625 var query = connection . createSubscribeQuery (
@@ -626,7 +629,7 @@ function commonTests(options) {
626629 function ( err ) {
627630 if ( err ) return done ( err ) ;
628631 connection . get ( 'dogs' , 'fido' ) . on ( 'error' , done ) . create ( { } , function ( ) {
629- clock . tickAsync ( 51 ) ;
632+ clock . tick ( 51 ) ;
630633 } ) ;
631634 }
632635 ) ;
@@ -638,15 +641,15 @@ function commonTests(options) {
638641 } ) ;
639642
640643 it ( 'db.pollInterval updates a subscribed query after an unpublished create' , function ( done ) {
641- var clock = sinon . useFakeTimers ( ) ;
644+ var clock = util . useFakeTimers ( ) ;
642645 var connection = this . backend . connect ( ) ;
643646 this . backend . suppressPublish = true ;
644647 this . backend . db . pollDebounce = 0 ;
645648 this . backend . db . pollInterval = 50 ;
646649 var query = connection . createSubscribeQuery ( 'dogs' , this . matchAllDbQuery , null , function ( err ) {
647650 if ( err ) return done ( err ) ;
648651 connection . get ( 'dogs' , 'fido' ) . on ( 'error' , done ) . create ( { } , function ( ) {
649- clock . tickAsync ( 51 ) ;
652+ clock . tick ( 51 ) ;
650653 } ) ;
651654 } ) ;
652655 query . on ( 'error' , done ) ;
@@ -657,7 +660,7 @@ function commonTests(options) {
657660 } ) ;
658661
659662 it ( 'pollInterval captures additional unpublished creates' , function ( done ) {
660- var clock = sinon . useFakeTimers ( ) ;
663+ var clock = util . useFakeTimers ( ) ;
661664 var connection = this . backend . connect ( ) ;
662665 this . backend . suppressPublish = true ;
663666 var count = 0 ;
@@ -667,7 +670,7 @@ function commonTests(options) {
667670 var doc = connection . get ( 'dogs' , count . toString ( ) ) . on ( 'error' , done ) ;
668671 doc . create ( { } , function ( e ) {
669672 if ( e ) return done ( e ) ;
670- clock . tickAsync ( 2000 ) ;
673+ clock . tick ( 2000 ) ;
671674 } ) ;
672675 } ) ;
673676 query . on ( 'error' , done ) ;
@@ -677,10 +680,10 @@ function commonTests(options) {
677680 var doc = connection . get ( 'dogs' , count . toString ( ) ) . on ( 'error' , done ) ;
678681 doc . create ( { } , function ( e ) {
679682 if ( e ) return done ( e ) ;
680- clock . tickAsync ( 10000 ) ;
683+ clock . tick ( 10000 ) ;
681684 } ) ;
682685 } ) ;
683- clock . tickAsync ( 1 ) ;
686+ clock . tick ( 1 ) ;
684687 } ) ;
685688
686689 it ( 'query extra is returned to client' , function ( done ) {
0 commit comments