From 0ea6c46516830bae7d8ee9aa2526052afa1d128d Mon Sep 17 00:00:00 2001
From: Anthony Ciccarello <aciccarello@users.noreply.github.com>
Date: Tue, 12 Apr 2016 09:42:42 -0400
Subject: [PATCH] Add ControllerService to angular-mocks (#8889)

* Add ControllerService to angular-mocks

The definition in angular.d.ts changed that used to included this definition.
Needed because of 69d2fb9

* Added unit tests for controller service mock
---
 angularjs/angular-mocks-tests.ts |  9 +++++++++
 angularjs/angular-mocks.d.ts     | 12 ++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/angularjs/angular-mocks-tests.ts b/angularjs/angular-mocks-tests.ts
index 86bbe6c94..294bcf898 100644
--- a/angularjs/angular-mocks-tests.ts
+++ b/angularjs/angular-mocks-tests.ts
@@ -87,6 +87,15 @@ logCall = logService.warn;
 
 logs = logCall.logs;
 
+///////////////////////////////////////
+// ControllerService mock
+///////////////////////////////////////
+var $controller: ng.IControllerService;
+$controller(class TestController {}, {}, {myBinding: 'works!'});
+$controller(function TestController() {}, {someLocal: 42}, {myBinding: 'works!'});
+$controller('TestController', {}, {myBinding: 'works!'});
+
+
 ///////////////////////////////////////
 // IComponentControllerService
 ///////////////////////////////////////
diff --git a/angularjs/angular-mocks.d.ts b/angularjs/angular-mocks.d.ts
index 429c7b526..c97471e5b 100644
--- a/angularjs/angular-mocks.d.ts
+++ b/angularjs/angular-mocks.d.ts
@@ -97,6 +97,18 @@ declare namespace angular {
         logs: string[];
     }
 
+    ///////////////////////////////////////////////////////////////////////////
+    // ControllerService mock
+    // see https://docs.angularjs.org/api/ngMock/service/$controller
+    // This interface extends http://docs.angularjs.org/api/ng.$controller
+    ///////////////////////////////////////////////////////////////////////////
+    interface IControllerService {
+      // Although the documentation doesn't state this, locals are optional
+      <T>(controllerConstructor: new (...args: any[]) => T, locals?: any, bindings?: any): T;
+      <T>(controllerConstructor: Function, locals?: any, bindings?: any): T;
+      <T>(controllerName: string, locals?: any, bindings?: any): T;
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // ComponentControllerService
     // see https://docs.angularjs.org/api/ngMock/service/$componentController