fixup! refactor and add test

Author: Narretz

src/ng/directive/ngSwitch.js

@@ -161,10 +161,10 @@ var ngSwitchDirective = ['$animate', '$compile', function($animate, $compile) {
       scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
         var i, ii;
 
-        for (i = 0, ii = previousLeaveAnimations.length; i < ii; ++i) {
-          $animate.cancel(previousLeaveAnimations[i]);
+        // Start with the last, in case the array is modified during the loop
+        while(previousLeaveAnimations.length) {
+          $animate.cancel(previousLeaveAnimations.pop());
         }
-        previousLeaveAnimations.length = 0;
 
         for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
           var selected = getBlockNodes(selectedElements[i].clone);

test/ng/directive/ngSwitchSpec.js

@@ -333,6 +333,36 @@ 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) {
+      var scope = $rootScope.$new();
+      scope.value = 'foo';
+
+      scope.$watch('value', () => {
+        if (scope.value === 'bar') {
+          scope.$evalAsync(function() {
+            scope.value = 'baz';
+          });
+        }
+      });
+
+      element = $compile(
+        '<div ng-switch="value">' +
+          '<div ng-switch-when="foo">FOO 1</div>' +
+          '<div ng-switch-when="foo">FOO 2</div>' +
+          '<div ng-switch-when="bar">BAR</div>' +
+          '<div ng-switch-when="baz">BAZ</div>' +
+        '</div>')(scope);
+
+      scope.$apply();
+      expect(element.text()).toBe('FOO 1FOO 2');
+
+      scope.$apply('value = "bar"');
+      expect(element.text()).toBe('BAZ');
+    })
+  );
+
+
   describe('ngSwitchWhen separator', function() {
     var $$rAF;