squash: flush rAF for tests that have more than one match for the current switch

Without flushing the $$rAF, the ngSwitch leave animations are not completed on their own,
but are instead completed when the next switch change finds them unfinished and calls
cancel on them. This causes the done callbacks to be called synchronously instead of
asynchronously.

Author: Narretz

test/ng/directive/ngSwitchSpec.js

@@ -36,7 +36,7 @@ describe('ngSwitch', function() {
   }));
 
 
-  it('should show all switch-whens that match the current value', inject(function($rootScope, $compile) {
+  it('should show all switch-whens that match the current value', inject(function($rootScope, $compile, $$rAF) {
     element = $compile(
       '<ul ng-switch="select">' +
         '<li ng-switch-when="1">first:{{name}}</li>' +
@@ -54,14 +54,18 @@ describe('ngSwitch', function() {
     $rootScope.name = 'shyam';
     $rootScope.$apply();
     expect(element.text()).toEqual('first:shyam, first too:shyam');
+
     $rootScope.select = 2;
     $rootScope.$apply();
+    $$rAF.flush();
     expect(element.text()).toEqual('second:shyam');
     $rootScope.name = 'misko';
     $rootScope.$apply();
     expect(element.text()).toEqual('second:misko');
+
     $rootScope.select = true;
     $rootScope.$apply();
+    $$rAF.flush();
     expect(element.text()).toEqual('true:misko');
   }));
 
@@ -278,7 +282,7 @@ describe('ngSwitch', function() {
   }));
 
 
-  it('should properly support case labels with different numbers of transclude fns', inject(function($rootScope, $compile) {
+  it('should properly support case labels with different numbers of transclude fns', inject(function($rootScope, $compile, $$rAF) {
     element = $compile(
       '<div ng-switch="mode">' +
         '<p ng-switch-when="a">Block1</p>' +
@@ -292,16 +296,18 @@ describe('ngSwitch', function() {
 
     $rootScope.$apply('mode = "b"');
     expect(element.children().length).toBe(1);
+    $$rAF.flush();
 
     $rootScope.$apply('mode = "a"');
     expect(element.children().length).toBe(2);
+    $$rAF.flush();
 
     $rootScope.$apply('mode = "b"');
     expect(element.children().length).toBe(1);
   }));
 
 
-  it('should not trigger a digest when an element is removed', inject(function($$rAF, $compile, $rootScope, $timeout) {
+  it('should not trigger a digest after an element is removed', inject(function($$rAF, $compile, $rootScope, $timeout) {
     var spy = spyOn($rootScope, '$digest').and.callThrough();
 
     $rootScope.select = 1;
@@ -328,6 +334,12 @@ describe('ngSwitch', function() {
 
 
   describe('ngSwitchWhen separator', function() {
+    var $$rAF;
+
+    beforeEach(inject(function(_$$rAF_) {
+      $$rAF = _$$rAF_;
+    }));
+
     it('should be possible to define a separator', inject(function($rootScope, $compile) {
       element = $compile(
         '<div ng-switch="mode">' +
@@ -341,9 +353,13 @@ describe('ngSwitch', function() {
       expect(element.children().length).toBe(2);
       expect(element.text()).toBe('Block1|Block2|');
       $rootScope.$apply('mode = "b"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block1|');
       $rootScope.$apply('mode = "c"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block3|');
     }));
@@ -362,9 +378,13 @@ describe('ngSwitch', function() {
       expect(element.children().length).toBe(2);
       expect(element.text()).toBe('Block1|Block2|');
       $rootScope.$apply('mode = ""');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block1|');
       $rootScope.$apply('mode = "c"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block3|');
     }));
@@ -383,9 +403,13 @@ describe('ngSwitch', function() {
       expect(element.children().length).toBe(2);
       expect(element.text()).toBe('Block1|Block2|');
       $rootScope.$apply('mode = "b"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block1|');
       $rootScope.$apply('mode = "c"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block3|');
     }));
@@ -404,9 +428,13 @@ describe('ngSwitch', function() {
       expect(element.children().length).toBe(2);
       expect(element.text()).toBe('Block1|Block2|');
       $rootScope.$apply('mode = "b|a"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block1|');
       $rootScope.$apply('mode = "c"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block3|');
     }));
@@ -425,9 +453,13 @@ describe('ngSwitch', function() {
       expect(element.children().length).toBe(2);
       expect(element.text()).toBe('Block1|Block2|');
       $rootScope.$apply('mode = "b"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block1|');
       $rootScope.$apply('mode = "c"');
+      $$rAF.flush();
+
       expect(element.children().length).toBe(1);
       expect(element.text()).toBe('Block3|');
     }));