test(compile): additional tests for controllers with explicit return values.

Includes tests for controllers that:
 - explicitly return primitives
 - are attached to scope using `controllerAs`
 - transclude contents

Author: jamestalmage

src/ng/compile.js

@@ -1974,8 +1974,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                 // Remove and re-install bindToController bindings
                 thisLinkFn.$$destroyBindings();
                 thisLinkFn.$$destroyBindings =
-                  initializeDirectiveBindings(scope, attrs, controllerResult,
-                    bindings, scopeDirective);
+                  initializeDirectiveBindings(scope, attrs, controllerResult, bindings, scopeDirective);
               }
             }
           }

test/ng/compileSpec.js

@@ -4219,6 +4219,28 @@ describe('$compile', function() {
     });
 
 
+    it('primitive controller return values are ignored', 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('<log-controller-prop></log-controller-prop>')($rootScope);
+        expect(log).toEqual('baz');
+        expect(element.data('$logControllerPropController').foo).toEqual('baz');
+      });
+    });
+
+
     it('should get required parent controller', function() {
       module(function() {
         directive('nested', function(log) {
@@ -4238,6 +4260,28 @@ describe('$compile', function() {
     });
 
 
+    it('should get explicit return value of required parent controller', function() {
+      module(function() {
+        directive('nested', function(log) {
+          return {
+            require: '^^?nested',
+            controller: function() {
+              return {foo: 'bar'};
+            },
+            link: function(scope, element, attrs, controller) {
+              log(!!controller && controller.foo);
+            }
+          };
+        });
+      });
+      inject(function(log, $compile, $rootScope) {
+        element = $compile('<div nested><div nested></div></div>')($rootScope);
+
+        expect(log).toEqual('bar; false');
+      });
+    });
+
+
     it('should get required parent controller when the question mark precedes the ^^', function() {
       module(function() {
         directive('nested', function(log) {
@@ -4546,6 +4590,30 @@ 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() {
@@ -5547,6 +5615,41 @@ 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;
         module(function() {