diff options
| author | Matias Niemelä | 2013-08-06 14:19:33 -0400 | 
|---|---|---|
| committer | Misko Hevery | 2013-08-09 14:39:58 -0700 | 
| commit | f61ff695192df2123ea086ddd5fe65e27e9b4e18 (patch) | |
| tree | bfdf54ca1de60958495cfb568a6b2358f3447d12 /test | |
| parent | 87405e25ae935eefd673e70ffd6144a5f455b662 (diff) | |
| download | angular.js-f61ff695192df2123ea086ddd5fe65e27e9b4e18.tar.bz2 | |
chore(ngAnimate): fix incomplete animation test
Diffstat (limited to 'test')
| -rw-r--r-- | test/ngAnimate/animateSpec.js | 15 | 
1 files changed, 4 insertions, 11 deletions
| diff --git a/test/ngAnimate/animateSpec.js b/test/ngAnimate/animateSpec.js index 25f4dccc..e5ade9f3 100644 --- a/test/ngAnimate/animateSpec.js +++ b/test/ngAnimate/animateSpec.js @@ -1485,18 +1485,14 @@ describe("ngAnimate", function() {        expect(element.hasClass('hiding')).toBe(false);        $animate.addClass(element, 'ng-hide'); -      return        if($sniffer.transitions) {          expect(element).toBeShown(); //still showing          $timeout.flush();          expect(element).toBeShown(); +        $timeout.flushNext(5555);        } -      $timeout.flushNext(555); -      if($sniffer.transitions) { -        expect(element).toBeShown(); -        $timeout.flushNext(5000); -      } +      $timeout.flush();        expect(element).toBeHidden();        expect(element.hasClass('showing')).toBe(false); @@ -1507,12 +1503,9 @@ describe("ngAnimate", function() {          expect(element).toBeHidden();          $timeout.flush();          expect(element).toBeHidden(); +        $timeout.flushNext(5580);        } -      $timeout.flushNext(25); -      if($sniffer.transitions) { -        expect(element).toBeHidden(); -        $timeout.flushNext(5000); -      } +      $timeout.flush();        expect(element).toBeShown();        expect(element.hasClass('showing')).toBe(true); | 
