@@ -12,16 +12,34 @@ $.each( $.effects.effect, function( effect ) {
1212 module ( "effect." + effect ) ;
1313 test ( "show/hide" , function ( ) {
1414 var hidden = $ ( "div.hidden" ) ;
15- expect ( 3 ) ;
15+ expect ( 8 ) ;
1616 stop ( ) ;
17- hidden . show ( effect , animateTime , function ( ) {
17+
18+ var count = 0 ,
19+ test = 0 ;
20+
21+ function queueTest ( fn ) {
22+ count ++ ;
23+ var point = count ;
24+ return function ( next ) {
25+ test ++ ;
26+ equals ( point , test , "Queue function fired in order" ) ;
27+ if ( fn ) {
28+ fn ( )
29+ } else {
30+ setTimeout ( next , animateTime ) ;
31+ }
32+ }
33+ }
34+
35+ hidden . queue ( queueTest ( ) ) . show ( effect , animateTime , queueTest ( function ( ) {
1836 equal ( hidden . css ( "display" ) , "block" , "Hidden is shown after .show(\"" + effect + "\", time)" ) ;
19- } ) . hide ( effect , animateTime , function ( ) {
37+ } ) ) . queue ( queueTest ( ) ) . hide ( effect , animateTime , queueTest ( function ( ) {
2038 equal ( hidden . css ( "display" ) , "none" , "Back to hidden after .hide(\"" + effect + "\", time)" ) ;
21- } ) . queue ( function ( next ) {
39+ } ) ) . queue ( queueTest ( function ( next ) {
2240 deepEqual ( hidden . queue ( ) , [ "inprogress" ] , "Only the inprogress sentinel remains" )
2341 start ( ) ;
24- } ) ;
42+ } ) ) ;
2543 } ) ;
2644} ) ;
2745
0 commit comments