fixup! simplify tests

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, $$rAF) {
+  it('should show all switch-whens that match the current value', inject(function($rootScope, $compile) {
     element = $compile(
       '<ul ng-switch="select">' +
         '<li ng-switch-when="1">first:{{name}}</li>' +
@@ -57,15 +57,13 @@ describe('ngSwitch', function() {
 
     $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');
   }));
 
@@ -282,7 +280,7 @@ describe('ngSwitch', function() {
   }));
 
 
-  it('should properly support case labels with different numbers of transclude fns', inject(function($rootScope, $compile, $$rAF) {
+  it('should properly support case labels with different numbers of transclude fns', inject(function($rootScope, $compile) {
     element = $compile(
       '<div ng-switch="mode">' +
         '<p ng-switch-when="a">Block1</p>' +
@@ -296,11 +294,9 @@ 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);
@@ -324,7 +320,9 @@ describe('ngSwitch', function() {
     $rootScope.$apply();
     spy.calls.reset();
     expect(element.text()).toEqual('second');
-    // The animation completion is async even without actual animations
+    // If ngSwitch re-introduces code that triggers a digest after an element is removed (in an
+    // animation .then callback), flushing the queue ensures the callback will be called, and the test
+    // fails
     $$rAF.flush();
 
     expect(spy).not.toHaveBeenCalled();
@@ -334,7 +332,7 @@ describe('ngSwitch', function() {
 
 
   it('should handle changes to the switch value in a digest loop with multiple value matches',
-    inject(function($$rAF, $compile, $rootScope, $timeout) {
+    inject(function($compile, $rootScope) {
       var scope = $rootScope.$new();
       scope.value = 'foo';
 
@@ -364,11 +362,6 @@ 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(
@@ -383,12 +376,10 @@ 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|');
@@ -408,12 +399,10 @@ 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|');
@@ -433,12 +422,10 @@ 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|');
@@ -458,12 +445,10 @@ 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|');
@@ -483,12 +468,10 @@ 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|');