feat(ngMock.$componentController): add helper to instantiate controllers for components

Closes angular#13683

Author: petebacondarwin

src/ng/compile.js

@@ -1054,7 +1054,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
    */
   this.component = function registerComponent(name, options) {
     var controller = options.controller || function() {};
-    this.$$componentControllers[name] = controller;
+    var ident = identifierForController(options.controller) || options.controllerAs || '$ctrl';
+    this.$$componentControllers[name] = { controller: controller, ident: ident};
 
     function factory($injector) {
       function makeInjectable(fn) {
@@ -1070,7 +1071,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       var template = (!options.template && !options.templateUrl ? '' : options.template);
       return {
         controller: controller,
-        controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl',
+        controllerAs: ident,
         template: makeInjectable(template),
         templateUrl: makeInjectable(options.templateUrl),
         transclude: options.transclude,

src/ngMock/angular-mocks.js

@@ -2166,18 +2166,24 @@ angular.mock.$ControllerDecorator = ['$delegate', function($delegate) {
  * @name $componentController
  * @description
  * A service that can be used to create instances of component controllers.
+ * <div class="alert alert-info">
+ * Be aware that the controller will be instantiated and attached to the scope as specified in
+ * the component definition object. That means that you must always provide a `$scope` object
+ * in the `locals` param.
+ * </div>
  * @param {string} componentName the name of the component whose controller we want to instantiate
  * @param {Object} locals Injection locals for Controller.
  * @param {Object=} bindings Properties to add to the controller before invoking the constructor. This is used
  *                           to simulate the `bindToController` feature and simplify certain kinds of tests.
+ * @param {string=} ident Override the property name to use when attaching the controller to the scope.
  * @return {Object} Instance of requested controller.
  */
 angular.mock.$ComponentControllerProvider = ['$compileProvider', function($compileProvider) {
   return {
     $get: ['$controller', function($controller) {
       return function $componentController(componentName, locals, bindings, ident) {
-        var controller = $compileProvider.$$componentControllers[componentName];
-        return $controller(controller, locals, bindings, ident);
+        var controllerInfo = $compileProvider.$$componentControllers[componentName];
+        return $controller(controllerInfo.controller, locals, bindings, ident || controllerInfo.ident);
       };
     }]
   };

test/ngMock/angular-mocksSpec.js

@@ -1875,6 +1875,7 @@ describe('ngMock', function() {
         var $scope = {};
         var ctrl = $componentController('test', { $scope: $scope, a: 'A', b: 'B' }, { x: 'X', y: 'Y' });
         expect(ctrl).toEqual({ $scope: $scope, a: 'A', b: 'B', x: 'X', y: 'Y' });
+        expect($scope.$ctrl).toBe(ctrl);
       });
     });
 
@@ -1894,6 +1895,7 @@ describe('ngMock', function() {
         var $scope = {};
         var ctrl = $componentController('test', { $scope: $scope, a: 'A', b: 'B' }, { x: 'X', y: 'Y' });
         expect(ctrl).toEqual({ $scope: $scope, a: 'A', b: 'B', x: 'X', y: 'Y' });
+        expect($scope.$ctrl).toBe(ctrl);
       });
     });
 
@@ -1913,6 +1915,7 @@ describe('ngMock', function() {
         var $scope = {};
         var ctrl = $componentController('test', { $scope: $scope, a: 'A', b: 'B' }, { x: 'X', y: 'Y' });
         expect(ctrl).toEqual({ $scope: $scope, a: 'A', b: 'B', x: 'X', y: 'Y' });
+        expect($scope.$ctrl).toBe(ctrl);
       });
     });
 
@@ -1932,9 +1935,10 @@ describe('ngMock', function() {
         var $scope = {};
         var ctrl = $componentController('test', { $scope: $scope, a: 'A', b: 'B' }, { x: 'X', y: 'Y' });
         expect(ctrl).toEqual({ $scope: $scope, a: 'A', b: 'B', x: 'X', y: 'Y' });
-        expect($scope.testCtrl instanceof TestController).toBe(true);
+        expect($scope.testCtrl).toBe(ctrl);
       });
-    });  });
+    });
+  });
 });