' +
@@ -272,70 +239,84 @@ describe('ngAnimate integration tests', function() {
$compile(element)($rootScope);
$rootScope.$digest();
- expect($animate.reflows).toBe(0);
+
+ var outer = element;
+ var inner = element.find('div');
$rootScope.exp = true;
$rootScope.items = [1,2,3,4,5,6,7,8,9,10];
$rootScope.$digest();
+ expect(outer).not.toHaveClass('parent');
+ expect(inner).not.toHaveClass('parent2');
- // 2 parents + 10 items = 12
- expect($animate.reflows).toBe(12);
- });
- });
+ assertTotalRepeats(0);
- it('should issue a reflow for each element and also its children', function() {
- module('ngAnimateMock');
- inject(function($animate, $compile, $rootScope, $rootElement, $document) {
- element = jqLite(
- '
'
- );
+ $$rAF.flush();
+ expect(outer).toHaveClass('parent');
- $rootElement.append(element);
- jqLite($document[0].body).append($rootElement);
+ assertTotalRepeats(0);
- $compile(element)($rootScope);
- $rootScope.$digest();
- expect($animate.reflows).toBe(0);
+ $$rAF.flush();
+ expect(inner).toHaveClass('parent2');
- $rootScope.exp = true;
- $rootScope.$digest();
+ assertTotalRepeats(10);
- // there is one element's expression in there that is false
- expect($animate.reflows).toBe(6);
+ function assertTotalRepeats(total) {
+ expect(inner[0].querySelectorAll('div.ng-enter').length).toBe(total);
+ }
});
});
- it('should always issue atleast one reflow incase there are no parent class-based animations', function() {
+ it('should pack level elements into their own RAF flush', function() {
module('ngAnimateMock');
inject(function($animate, $compile, $rootScope, $rootElement, $document) {
+ ss.addRule('.inner', 'transition:2s linear all;');
+
element = jqLite(
- '
' +
- '{{ item }}' +
+ '
' +
+ '
' +
+ '
' +
+ '
' +
+ '
' +
'
'
);
$rootElement.append(element);
jqLite($document[0].body).append($rootElement);
-
$compile(element)($rootScope);
$rootScope.$digest();
- expect($animate.reflows).toBe(0);
+
+ assertGroupHasClass(query('outer'), 'on', true);
+ expect(query('inner').length).toBe(0);
$rootScope.exp = true;
- $rootScope.items = [1,2,3,4,5,6,7,8,9,10];
$rootScope.$digest();
- expect($animate.reflows).toBe(10);
+ assertGroupHasClass(query('outer'), 'on', true);
+ assertGroupHasClass(query('inner'), 'ng-enter', true);
+
+ $animate.flush();
+
+ assertGroupHasClass(query('outer'), 'on');
+ assertGroupHasClass(query('inner'), 'ng-enter');
+
+ function query(className) {
+ return element[0].querySelectorAll('.' + className);
+ }
+
+ function assertGroupHasClass(elms, className, not) {
+ for (var i = 0; i < elms.length; i++) {
+ var assert = expect(jqLite(elms[i]));
+ (not ? assert.not : assert).toHaveClass(className);
+ }
+ }
});
});
});
@@ -470,6 +451,7 @@ describe('ngAnimate integration tests', function() {
}
$rootScope.$digest();
+ $animate.flush();
expect(endParentAnimationFn).toBeTruthy();
@@ -534,6 +516,7 @@ describe('ngAnimate integration tests', function() {
}
$rootScope.$digest();
+ $animate.flush();
expect(endParentAnimationFn).toBeTruthy();
diff --git a/test/ngAnimate/rafSchedulerSpec.js b/test/ngAnimate/rafSchedulerSpec.js
new file mode 100644
index 000000000000..16c7906534a4
--- /dev/null
+++ b/test/ngAnimate/rafSchedulerSpec.js
@@ -0,0 +1,143 @@
+'use strict';
+
+describe("$$rAFScheduler", function() {
+
+ beforeEach(module('ngAnimate'));
+
+ it('should accept an array of tasks and run the first task immediately',
+ inject(function($$rAFScheduler) {
+
+ var taskSpy = jasmine.createSpy();
+ var tasks = [taskSpy];
+ $$rAFScheduler([tasks]);
+ expect(taskSpy).toHaveBeenCalled();
+ }));
+
+ it('should run tasks based on how many RAFs have run in comparison to the task index',
+ inject(function($$rAFScheduler, $$rAF) {
+
+ var i, tasks = [];
+
+ for (i = 0; i < 5; i++) {
+ tasks.push([jasmine.createSpy()]);
+ }
+
+ $$rAFScheduler(tasks);
+
+ for (i = 1; i < 5; i++) {
+ var taskSpy = tasks[i][0];
+ expect(taskSpy).not.toHaveBeenCalled();
+ $$rAF.flush();
+ expect(taskSpy).toHaveBeenCalled();
+ }
+ }));
+
+ it('should space out subarrays by a RAF and run the internals in parallel',
+ inject(function($$rAFScheduler, $$rAF) {
+
+ var spies = {
+ a: jasmine.createSpy(),
+ b: jasmine.createSpy(),
+ c: jasmine.createSpy(),
+
+ x: jasmine.createSpy(),
+ y: jasmine.createSpy(),
+ z: jasmine.createSpy()
+ };
+
+ var items = [[spies.a, spies.x],
+ [spies.b, spies.y],
+ [spies.c, spies.z]];
+
+ expect(spies.a).not.toHaveBeenCalled();
+ expect(spies.x).not.toHaveBeenCalled();
+
+ $$rAFScheduler(items);
+
+ expect(spies.a).toHaveBeenCalled();
+ expect(spies.x).toHaveBeenCalled();
+
+
+ expect(spies.b).not.toHaveBeenCalled();
+ expect(spies.y).not.toHaveBeenCalled();
+
+ $$rAF.flush();
+
+ expect(spies.b).toHaveBeenCalled();
+ expect(spies.y).toHaveBeenCalled();
+
+
+ expect(spies.c).not.toHaveBeenCalled();
+ expect(spies.z).not.toHaveBeenCalled();
+
+ $$rAF.flush();
+
+ expect(spies.c).toHaveBeenCalled();
+ expect(spies.z).toHaveBeenCalled();
+ }));
+
+ describe('.waitUntilQuiet', function() {
+
+ it('should run the `last` provided function when a RAF fully passes',
+ inject(function($$rAFScheduler, $$rAF) {
+
+ var q1 = jasmine.createSpy();
+ $$rAFScheduler.waitUntilQuiet(q1);
+
+ expect(q1).not.toHaveBeenCalled();
+
+ var q2 = jasmine.createSpy();
+ $$rAFScheduler.waitUntilQuiet(q2);
+
+ expect(q1).not.toHaveBeenCalled();
+ expect(q2).not.toHaveBeenCalled();
+
+ var q3 = jasmine.createSpy();
+ $$rAFScheduler.waitUntilQuiet(q3);
+
+ expect(q1).not.toHaveBeenCalled();
+ expect(q2).not.toHaveBeenCalled();
+ expect(q3).not.toHaveBeenCalled();
+
+ $$rAF.flush();
+
+ expect(q1).not.toHaveBeenCalled();
+ expect(q2).not.toHaveBeenCalled();
+ expect(q3).toHaveBeenCalled();
+ }));
+
+ it('should always execute itself before the next RAF task tick occurs', function() {
+ module(provideLog);
+ inject(function($$rAFScheduler, $$rAF, log) {
+ var quietFn = log.fn('quiet');
+ var tasks = [
+ [log.fn('task1')],
+ [log.fn('task2')],
+ [log.fn('task3')],
+ [log.fn('task4')]
+ ];
+
+ $$rAFScheduler(tasks);
+ expect(log).toEqual(['task1']);
+
+ $$rAFScheduler.waitUntilQuiet(quietFn);
+ expect(log).toEqual(['task1']);
+
+ $$rAF.flush();
+
+ expect(log).toEqual(['task1', 'quiet', 'task2']);
+
+ $$rAF.flush();
+
+ expect(log).toEqual(['task1', 'quiet', 'task2', 'task3']);
+
+ $$rAFScheduler.waitUntilQuiet(quietFn);
+
+ $$rAF.flush();
+
+ expect(log).toEqual(['task1', 'quiet', 'task2', 'task3', 'quiet', 'task4']);
+ });
+ });
+ });
+
+});
diff --git a/test/ngRoute/directive/ngViewSpec.js b/test/ngRoute/directive/ngViewSpec.js
index a2601d5dd335..39ab1a934fea 100644
--- a/test/ngRoute/directive/ngViewSpec.js
+++ b/test/ngRoute/directive/ngViewSpec.js
@@ -749,7 +749,7 @@ describe('ngView animations', function() {
);
it('should render ngClass on ngView',
- inject(function($compile, $rootScope, $templateCache, $animate, $location, $timeout) {
+ inject(function($compile, $rootScope, $templateCache, $animate, $location) {
var item;
$rootScope.tpl = 'one';
@@ -759,6 +759,7 @@ describe('ngView animations', function() {
$location.path('/foo');
$rootScope.$digest();
+ $animate.flush();
//we don't care about the enter animation
$animate.queue.shift();
@@ -775,6 +776,8 @@ describe('ngView animations', function() {
expect($animate.queue.shift().event).toBe('addClass');
expect($animate.queue.shift().event).toBe('removeClass');
+ $animate.flush();
+
expect(item.hasClass('classy')).toBe(false);
expect(item.hasClass('boring')).toBe(true);