From c9245cf759108add2a10ffca4d41b1c68c1e8c76 Mon Sep 17 00:00:00 2001 From: Matias Niemelä Date: Mon, 24 Feb 2014 15:12:38 -0500 Subject: test($animate): ensure staggering timeout tests are secure --- test/ngAnimate/animateSpec.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'test/ngAnimate/animateSpec.js') diff --git a/test/ngAnimate/animateSpec.js b/test/ngAnimate/animateSpec.js index 27eeb112..55ec4ae8 100644 --- a/test/ngAnimate/animateSpec.js +++ b/test/ngAnimate/animateSpec.js @@ -1259,7 +1259,15 @@ describe("ngAnimate", function() { } //(stagger * index) + (duration + delay) * 150% - $timeout.flush(9500); //0.5 * 4 + 5 * 1.5 = 9500; + //0.5 * 4 + 5 * 1.5 = 9500; + //9500 - 7500 = 2000 + $timeout.flush(1999); //remove 1999 more + + for(var i = 0; i < 5; i++) { + expect(kids[i].hasClass('ng-enter-active')).toBe(true); + } + + $timeout.flush(1); //up to 2000ms for(var i = 0; i < 5; i++) { expect(kids[i].hasClass('ng-enter-active')).toBe(false); -- cgit v1.2.3