@@ -61,30 +61,26 @@ describe('setInterval', function() {
61
61
} ) ;
62
62
63
63
it ( 'should not cancel the task after invoke the setInterval callback' , ( done ) => {
64
- const logs : string [ ] = [ ] ;
65
- const hasTaskSpy = jasmine . createSpy ( 'hasTask' ) ;
64
+ const logs : HasTaskState [ ] = [ ] ;
66
65
const zone = Zone . current . fork ( {
67
66
name : 'interval' ,
68
67
onHasTask :
69
68
( delegate : ZoneDelegate , currentZone : Zone , targetZone : Zone , hasTask : HasTaskState ) => {
70
- hasTaskSpy ( hasTask ) ;
69
+ logs . push ( hasTask ) ;
71
70
return delegate . hasTask ( targetZone , hasTask ) ;
72
71
}
73
72
} ) ;
74
73
75
74
zone . run ( ( ) => {
76
- const timerId = setInterval ( ( ) => {
77
- logs . push ( 'interval invoked' ) ;
78
- } , 100 ) ;
75
+ const timerId = setInterval ( ( ) => { } , 100 ) ;
79
76
( global as any ) [ Zone . __symbol__ ( 'setTimeout' ) ] ( ( ) => {
80
77
expect ( logs . length > 0 ) . toBeTruthy ( ) ;
81
- expect ( hasTaskSpy )
82
- . toHaveBeenCalledWith (
83
- { microTask : false , macroTask : true , eventTask : false , change : 'macroTask' } ) ;
78
+ expect ( logs ) . toEqual (
79
+ [ { microTask : false , macroTask : true , eventTask : false , change : 'macroTask' } ] ) ;
84
80
clearInterval ( timerId ) ;
85
- expect ( hasTaskSpy . calls . allArgs ( ) ) . toEqual ( [
86
- [ { microTask : false , macroTask : true , eventTask : false , change : 'macroTask' } ] ,
87
- [ { microTask : false , macroTask : false , eventTask : false , change : 'macroTask' } ]
81
+ expect ( logs ) . toEqual ( [
82
+ { microTask : false , macroTask : true , eventTask : false , change : 'macroTask' } ,
83
+ { microTask : false , macroTask : false , eventTask : false , change : 'macroTask' }
88
84
] ) ;
89
85
done ( ) ;
90
86
} , 300 ) ;
0 commit comments