chore(ngAnimate): fix incomplete animation test

This commit is contained in:
Matias Niemelä 2013-08-06 14:19:33 -04:00 committed by Misko Hevery
parent 87405e25ae
commit f61ff69519

View file

@ -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);