aboutsummaryrefslogtreecommitdiffstats
path: root/test/ng/directive/ngSwitchSpec.js
diff options
context:
space:
mode:
authorMatias Niemelä2014-01-22 19:21:05 -0500
committerMatias Niemelä2014-02-06 01:21:41 -0500
commit906fdad0f95465842e336e057ea97d0633712189 (patch)
tree0993034fe2ce43ad090203c7d2390662536d1d91 /test/ng/directive/ngSwitchSpec.js
parenta8c1d9c97804f7df98150456c2702fd39e3a22f0 (diff)
downloadangular.js-906fdad0f95465842e336e057ea97d0633712189.tar.bz2
fix(mocks): remove usage of $animate.flushNext in favour of queing
The flushNext method of testing is difficult and highly coupled with the behavior of ngAnimate's $animate workflow. It is much better instead to just queue all $animate animation calls into a queue collection which is available on the $animate service when mock.animate is included as a module within test code.
Diffstat (limited to 'test/ng/directive/ngSwitchSpec.js')
-rw-r--r--test/ng/directive/ngSwitchSpec.js20
1 files changed, 12 insertions, 8 deletions
diff --git a/test/ng/directive/ngSwitchSpec.js b/test/ng/directive/ngSwitchSpec.js
index e4cd483c..a8c91359 100644
--- a/test/ng/directive/ngSwitchSpec.js
+++ b/test/ng/directive/ngSwitchSpec.js
@@ -255,8 +255,9 @@ describe('ngSwitch animations', function() {
$scope.val = 'one';
$scope.$digest();
- item = $animate.flushNext('enter').element;
- expect(item.text()).toBe('one');
+ item = $animate.queue.shift();
+ expect(item.event).toBe('enter');
+ expect(item.element.text()).toBe('one');
}));
@@ -276,17 +277,20 @@ describe('ngSwitch animations', function() {
$scope.val = 'two';
$scope.$digest();
- item = $animate.flushNext('enter').element;
- expect(item.text()).toBe('two');
+ item = $animate.queue.shift();
+ expect(item.event).toBe('enter');
+ expect(item.element.text()).toBe('two');
$scope.val = 'three';
$scope.$digest();
- item = $animate.flushNext('leave').element;
- expect(item.text()).toBe('two');
+ item = $animate.queue.shift();
+ expect(item.event).toBe('leave');
+ expect(item.element.text()).toBe('two');
- item = $animate.flushNext('enter').element;
- expect(item.text()).toBe('three');
+ item = $animate.queue.shift();
+ expect(item.event).toBe('enter');
+ expect(item.element.text()).toBe('three');
}));
});