From f61ff695192df2123ea086ddd5fe65e27e9b4e18 Mon Sep 17 00:00:00 2001
From: Matias Niemelä
Date: Tue, 6 Aug 2013 14:19:33 -0400
Subject: chore(ngAnimate): fix incomplete animation test

---
 test/ngAnimate/animateSpec.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'test')

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);
-- 
cgit v1.2.3