test(compile): apply discussed changes from #11326

Author: jamestalmage

test/ng/compileSpec.js

@@ -4197,7 +4197,7 @@ describe('$compile', function() {
     });
 
 
-    it('should respect controller return value', function() {
+    it('should respect explicit return value from controller', function() {
       module(function() {
         directive('logControllerProp', function(log) {
           return {
@@ -4219,65 +4219,123 @@ describe('$compile', function() {
     });
 
 
-    it('primitive controller return values are ignored', function() {
+    it('should get explicit return value of required parent controller', function() {
       module(function() {
-        directive('logControllerProp', function(log) {
+        directive('nested', function(log) {
           return {
-            controller: function($scope) {
-              this.foo = 'baz'; // value *will* be used.
-              return 'bar';
+            require: '^^?nested',
+            controller: function() {
+              return {foo: 'bar'};
             },
             link: function(scope, element, attrs, controller) {
-              log(controller.foo);
+              log(!!controller && controller.foo);
             }
           };
         });
       });
       inject(function(log, $compile, $rootScope) {
-        element = $compile('<log-controller-prop></log-controller-prop>')($rootScope);
-        expect(log).toEqual('baz');
-        expect(element.data('$logControllerPropController').foo).toEqual('baz');
+        element = $compile('<div nested><div nested></div></div>')($rootScope);
+
+        expect(log).toEqual('bar; false');
       });
     });
 
 
-    it('should get required parent controller', function() {
+    it('should respect explicit controller return value when using controllerAs', function() {
       module(function() {
+        directive('main', function() {
+          return {
+            templateUrl: 'main.html',
+            scope: {},
+            controller: function() {
+              this.name = 'lucas';
+              return {name: 'george'};
+            },
+            controllerAs: 'mainCtrl'
+          };
+        });
+      });
+      inject(function($templateCache, $compile, $rootScope) {
+        $templateCache.put('main.html', '<span>template:{{mainCtrl.name}}</span>');
+        element = $compile('<main/>')($rootScope);
+        $rootScope.$apply();
+        expect(element.text()).toBe('template:george');
+      });
+    });
+
+
+    it('transcluded children should receive explicit return value of parent controller', function() {
+      var expectedController;
+      module(function() {
+        directive('nester', valueFn({
+          transclude: 'content',
+          controller: function($transclude) {
+            this.foo = 'baz';
+            expectedController = {transclude:$transclude, foo: 'bar'};
+            return expectedController;
+          },
+          link: function(scope, el, attr, ctrl) {
+            ctrl.transclude(cloneAttach);
+            function cloneAttach(clone) {
+              el.append(clone);
+            }
+          }
+        }));
         directive('nested', function(log) {
           return {
-            require: '^^?nested',
-            controller: function($scope) {},
+            require: '^^nester',
             link: function(scope, element, attrs, controller) {
-              log(!!controller);
+              expect(controller).toBe(expectedController);
+              log('done');
+            }
+          };
+        });
+      });
+      inject(function(log, $compile) {
+        element = $compile('<div nester><div nested></div></div>')($rootScope);
+        $rootScope.$apply();
+        expect(log).toEqual('done');
+      });
+    });
+
+
+    it('explicit controller return values are ignored if they are primitives', function() {
+      module(function() {
+        directive('logControllerProp', function(log) {
+          return {
+            controller: function($scope) {
+              this.foo = 'baz'; // value *will* be used.
+              return 'bar';
+            },
+            link: function(scope, element, attrs, controller) {
+              log(controller.foo);
             }
           };
         });
       });
       inject(function(log, $compile, $rootScope) {
-        element = $compile('<div nested><div nested></div></div>')($rootScope);
-        expect(log).toEqual('true; false');
+        element = $compile('<log-controller-prop></log-controller-prop>')($rootScope);
+        expect(log).toEqual('baz');
+        expect(element.data('$logControllerPropController').foo).toEqual('baz');
       });
     });
 
 
-    it('should get explicit return value of required parent controller', function() {
+    it('should get required parent controller', function() {
       module(function() {
         directive('nested', function(log) {
           return {
             require: '^^?nested',
-            controller: function() {
-              return {foo: 'bar'};
-            },
+            controller: function($scope) {},
             link: function(scope, element, attrs, controller) {
-              log(!!controller && controller.foo);
+              log(!!controller);
             }
           };
         });
       });
       inject(function(log, $compile, $rootScope) {
         element = $compile('<div nested><div nested></div></div>')($rootScope);
-
-        expect(log).toEqual('bar; false');
+        expect(log).toEqual('true; false');
       });
     });
 
@@ -4590,30 +4648,6 @@ describe('$compile', function() {
     });
 
 
-    it('should respect explicit controller return value when using controllerAs', function() {
-      module(function() {
-        directive('main', function() {
-          return {
-            templateUrl: 'main.html',
-            transclude: true,
-            scope: {},
-            controller: function() {
-              this.name = 'lucas';
-              return {name: 'george'};
-            },
-            controllerAs: 'mainCtrl'
-          };
-        });
-      });
-      inject(function($templateCache, $compile, $rootScope) {
-        $templateCache.put('main.html', '<span>template:{{mainCtrl.name}} <div ng-transclude></div></span>');
-        element = $compile('<div main>transclude:{{mainCtrl.name}}</div>')($rootScope);
-        $rootScope.$apply();
-        expect(element.text()).toBe('template:george transclude:');
-      });
-    });
-
-
     it('should support controller alias', function() {
       module(function($controllerProvider) {
         $controllerProvider.register('MainCtrl', function() {
@@ -5615,40 +5649,6 @@ describe('$compile', function() {
         });
       });
 
-      it('should copy the explicit return value to all clones', function() {
-        module(function() {
-          directive('makeThree', valueFn({
-            transclude: 'content',
-            controller: function($transclude) {
-              this.foo = 'baz';
-              return {transclude:$transclude, foo: 'bar'};
-            },
-            link: function(scope, el, attr, ctrl) {
-              ctrl.transclude(cloneAttach);
-              ctrl.transclude(cloneAttach);
-              ctrl.transclude(cloneAttach);
-
-              function cloneAttach(clone) {
-                el.append(clone);
-              }
-            }
-          }));
-
-          directive('nested', function(log) {
-            return {
-              require: '^^makeThree',
-              link: function(scope, element, attrs, controller) {
-                log(controller.foo);
-              }
-            };
-          });
-        });
-        inject(function(log, $compile) {
-          element = $compile('<div make-three><div nested></div></div>')($rootScope);
-          $rootScope.$apply();
-          expect(log).toEqual('bar; bar; bar');
-        });
-      });
 
       it('should provide the $transclude controller local as 5th argument to the pre and post-link function', function() {
         var ctrlTransclude, preLinkTransclude, postLinkTransclude;