aboutsummaryrefslogtreecommitdiffstats
path: root/test/ngRoute/directive/ngViewSpec.js
diff options
context:
space:
mode:
authorMatias Niemelä2013-08-28 19:18:33 -0400
committerMisko Hevery2013-09-03 17:06:49 -0700
commit4382df03fa1962aed027742c1b463406c40653c9 (patch)
tree833a70f04dcab4128f6a971a484bed9c7dc19fcf /test/ngRoute/directive/ngViewSpec.js
parentd11a34a35127ee2b29a000ba48ec07200f2a5e34 (diff)
downloadangular.js-4382df03fa1962aed027742c1b463406c40653c9.tar.bz2
fix(ngAnimate): cut down on extra $timeout calls
Diffstat (limited to 'test/ngRoute/directive/ngViewSpec.js')
-rw-r--r--test/ngRoute/directive/ngViewSpec.js10
1 files changed, 0 insertions, 10 deletions
diff --git a/test/ngRoute/directive/ngViewSpec.js b/test/ngRoute/directive/ngViewSpec.js
index 690243e7..818645ef 100644
--- a/test/ngRoute/directive/ngViewSpec.js
+++ b/test/ngRoute/directive/ngViewSpec.js
@@ -628,32 +628,22 @@ describe('ngView animations', function() {
$rootScope.$digest();
$animate.flushNext('enter'); //ngView
-
- $timeout.flush();
-
$animate.flushNext('enter'); //repeat 1
$animate.flushNext('enter'); //repeat 2
- $timeout.flush();
-
expect(element.text()).toEqual('12');
$location.path('/bar');
$rootScope.$digest();
$animate.flushNext('leave'); //ngView old
- $timeout.flush();
-
$animate.flushNext('enter'); //ngView new
- $timeout.flush();
expect(n(element.text())).toEqual(''); //this is midway during the animation
$animate.flushNext('enter'); //ngRepeat 3
$animate.flushNext('enter'); //ngRepeat 4
- $timeout.flush();
-
expect(element.text()).toEqual('34');
function n(text) {