diff options
Diffstat (limited to 'test/ng/directive/ngIncludeSpec.js')
| -rw-r--r-- | test/ng/directive/ngIncludeSpec.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/ng/directive/ngIncludeSpec.js b/test/ng/directive/ngIncludeSpec.js index ebb35147..9f37d1fe 100644 --- a/test/ng/directive/ngIncludeSpec.js +++ b/test/ng/directive/ngIncludeSpec.js @@ -368,7 +368,7 @@ describe('ngInclude', function() { expect(autoScrollSpy).not.toHaveBeenCalled(); expect($animate.queue.shift().event).toBe('enter'); - $timeout.flush(); + $animate.triggerCallbacks(); expect(autoScrollSpy).toHaveBeenCalledOnce(); })); @@ -385,7 +385,7 @@ describe('ngInclude', function() { }); expect($animate.queue.shift().event).toBe('enter'); - $timeout.flush(); + $animate.triggerCallbacks(); $rootScope.$apply(function () { $rootScope.tpl = 'another.html'; @@ -394,7 +394,7 @@ describe('ngInclude', function() { expect($animate.queue.shift().event).toBe('leave'); expect($animate.queue.shift().event).toBe('enter'); - $timeout.flush(); + $animate.triggerCallbacks(); $rootScope.$apply(function() { $rootScope.tpl = 'template.html'; @@ -403,7 +403,7 @@ describe('ngInclude', function() { expect($animate.queue.shift().event).toBe('leave'); expect($animate.queue.shift().event).toBe('enter'); - $timeout.flush(); + $animate.triggerCallbacks(); expect(autoScrollSpy).toHaveBeenCalled(); expect(autoScrollSpy.callCount).toBe(3); @@ -419,7 +419,7 @@ describe('ngInclude', function() { }); expect($animate.queue.shift().event).toBe('enter'); - $timeout.flush(); + $animate.triggerCallbacks(); expect(autoScrollSpy).not.toHaveBeenCalled(); })); @@ -435,7 +435,7 @@ describe('ngInclude', function() { }); expect($animate.queue.shift().event).toBe('enter'); - $timeout.flush(); + $animate.triggerCallbacks(); $rootScope.$apply(function () { $rootScope.tpl = 'template.html'; @@ -457,7 +457,7 @@ describe('ngInclude', function() { $rootScope.$apply("tpl = 'template.html'"); expect($animate.queue.shift().event).toBe('enter'); - $timeout.flush(); + $animate.triggerCallbacks(); expect(autoScrollSpy).toHaveBeenCalledOnce(); })); |
