fix(ngSwitch): use the correct transclusion scope

If an ngSwitchWhen or ngSwitchDefault directive is on an element that also
contains a transclusion directive (such as ngRepeat) the new scope should
be the one provided by the bound transclusion function.

Previously we were incorrectly creating a simple child of the main ngSwitch
scope.

Closes angular#8235

Author: petebacondarwin

src/ng/directive/ngSwitch.js

@@ -166,9 +166,8 @@ var ngSwitchDirective = ['$animate', function($animate) {
         if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
           scope.$eval(attr.change);
           forEach(selectedTranscludes, function(selectedTransclude) {
-            var selectedScope = scope.$new();
-            selectedScopes.push(selectedScope);
-            selectedTransclude.transclude(selectedScope, function(caseElement) {
+            selectedTransclude.transclude(function(caseElement, selectedScope) {
+              selectedScopes.push(selectedScope);
               var anchor = selectedTransclude.element;
 
               selectedElements.push(caseElement);

test/ng/directive/ngSwitchSpec.js

@@ -241,7 +241,7 @@ describe('ngSwitch', function() {
     $rootScope.url = 'x';
     $rootScope.$apply();
     expect(getChildScope()).toBeUndefined();
-    expect(child1.$destroy).toHaveBeenCalledOnce();
+    expect(child1.$destroy).toHaveBeenCalled();
 
     $rootScope.url = 'a';
     $rootScope.$apply();
@@ -251,6 +251,28 @@ describe('ngSwitch', function() {
   }));
 
 
+  it("should use the correct transclusion scope if there is a transclude directive on the ng-swith-when/ng-switch-default element", inject(function($rootScope, $compile) {
+    element = $compile(
+      '<div ng-switch="foo">' +
+          '<pre ng-switch-when="item1" ng-repeat="bar in bars">' +
+              'foo = {{foo}}' +
+              'bar = {{bar}}' +
+              '$index = {{$index}}' +
+          '</pre>' +
+      '</div>'
+    )($rootScope);
+    $rootScope.$apply('foo="item1";bars=["one", "two"]');
+    expect(element.text()).toEqual(
+      'foo = item1' +
+      'bar = one' +
+      '$index = 0' +
+      'foo = item1' +
+      'bar = two' +
+      '$index = 1'
+    );
+  }));
+
+
   it('should not leak jq data when compiled but not attached to parent when parent is destroyed',
       inject(function($rootScope, $compile) {
     element = $compile(