diff options
| author | Matias Niemelàˆ | 2013-04-09 18:33:16 -0400 |
|---|---|---|
| committer | Misko Hevery | 2013-04-11 14:15:20 -0700 |
| commit | 1351ba2632b5011ad6eaddf004a7f0411bea8453 (patch) | |
| tree | 2afaf00419536007ee6330a3ff047708e931d5b5 /src/ngMock/angular-mocks.js | |
| parent | 5476cb6e9b6d7a16e3a86585bc2db5e63b16cd4d (diff) | |
| download | angular.js-1351ba2632b5011ad6eaddf004a7f0411bea8453.tar.bz2 | |
fix(ngAnimate): skip animation on first render
Diffstat (limited to 'src/ngMock/angular-mocks.js')
| -rw-r--r-- | src/ngMock/angular-mocks.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index 94f099a6..14a1f09e 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -628,7 +628,9 @@ angular.mock.createMockWindow = function() { if (setTimeoutQueue.length > 0) { return { process: function() { - setTimeoutQueue.shift().fn(); + var tick = setTimeoutQueue.shift(); + expect(tick.delay).toEqual(delay); + tick.fn(); } }; } else { |