fixup! feat(compiler): respect preAssignBindingsEnabled state

Author: mgol

src/core/services/compiler/compiler.js

@@ -88,7 +88,6 @@ angular
  *
  */
 MdCompilerProvider.$inject = ['$compileProvider'];
-/** @this */
 function MdCompilerProvider($compileProvider) {
 
   var provider = this;
@@ -97,8 +96,8 @@ function MdCompilerProvider($compileProvider) {
    * @ngdoc method
    * @name  $mdCompilerProvider#respectPreAssignBindingsEnabled
    *
-   * @param {boolean=} enabled update the respectPreAssignBindingsEnabled state if provided, otherwise just return
-   * the current mdPreAssignBindingsEnabled state
+   * @param {boolean=} respected update the respectPreAssignBindingsEnabled state if provided, otherwise just return
+   * the current Material preAssignBindingsEnabled state
    * @returns {*} current value if used as getter or itself (chaining) if used as setter
    *
    * @kind function
@@ -130,18 +129,12 @@ function MdCompilerProvider($compileProvider) {
    * `$compileProvider.preAssignBindingsEnabled()` is set to `false` (i.e. default behavior in AngularJS 1.6.0 or newer)
    * makes it hard to unit test Material Dialog/Toast controllers using the `$controller` helper as it always follows
    * the `$compileProvider.preAssignBindingsEnabled()` value.
-   *
-   * @deprecated
-   * sinceVersion="1.2.0"
-   * removeVersion="1.3.0"
-   *
-   * This method and the option to assign the bindings before calling the controller's constructor
-   * will be removed in v1.3.0.
    */
+  // TODO change it to `true` in Material 1.2.
   var respectPreAssignBindingsEnabled = false;
-  this.respectPreAssignBindingsEnabled = function(enabled) {
-    if (angular.isDefined(enabled)) {
-      respectPreAssignBindingsEnabled = enabled;
+  this.respectPreAssignBindingsEnabled = function(respected) {
+    if (angular.isDefined(respected)) {
+      respectPreAssignBindingsEnabled = respected;
       return this;
     }
 
@@ -163,16 +156,11 @@ function MdCompilerProvider($compileProvider) {
    * Note that this doesn't affect directives/components created via regular AngularJS methods which constitute most
    * Material & user-created components; their behavior can be checked via `$compileProvider.preAssignBindingsEnabled()`
    * in AngularJS `>=1.5.10 <1.7.0`.
-   *
-   * @deprecated
-   * sinceVersion="1.2.0"
-   * removeVersion="1.3.0"
-   *
-   * This method will be removed in v1.3.0.
    */
   this.preAssignBindingsEnabled = function() {
     if (!respectPreAssignBindingsEnabled) {
       // respectPreAssignBindingsEnabled === false
+      // We're ignoring the AngularJS `$compileProvider.preAssignBindingsEnabled()` value in this case.
       return true;
     }
 

src/core/services/compiler/compiler.spec.js

@@ -167,6 +167,7 @@ describe('$mdCompiler service', function() {
   [
       {respectPreAssignBindingsEnabled: true},
       {respectPreAssignBindingsEnabled: false},
+      // TODO change `equivalentTo` to `true` in Material 1.2.
       {respectPreAssignBindingsEnabled: '"default"', equivalentTo: false}
   ].forEach(function(options) {
     var realRespectPreAssignBindingsEnabled = options.respectPreAssignBindingsEnabled;
@@ -175,13 +176,15 @@ describe('$mdCompiler service', function() {
       realRespectPreAssignBindingsEnabled;
 
     describe('with respectPreAssignBindingsEnabled set to ' + realRespectPreAssignBindingsEnabled, function() {
+      var $mdCompilerProvider;
       var preAssignBindingsEnabledInAngularJS = angular.version.minor < 6;
 
       beforeEach(function() {
-        module(function($mdCompilerProvider) {
-          console.log(angular.version, preAssignBindingsEnabledInAngularJS);
+        module(function(_$mdCompilerProvider_) {
+          $mdCompilerProvider = _$mdCompilerProvider_;
+
           // Don't set the value so that the default state can be tested.
-          if (realRespectPreAssignBindingsEnabled === true || realRespectPreAssignBindingsEnabled === false) {
+          if (typeof realRespectPreAssignBindingsEnabled === 'boolean') {
             $mdCompilerProvider.respectPreAssignBindingsEnabled(realRespectPreAssignBindingsEnabled);
           }
         });
@@ -202,13 +205,33 @@ describe('$mdCompiler service', function() {
         return compileData;
       }
 
+      it('should call $onInit even if bindToController is set to false', function() {
+        var isInstantiated = false;
+
+        function TestController($scope, name) {
+          isInstantiated = true;
+          expect($scope.$apply).toBeTruthy();
+          expect(name).toBe('Bob');
+        }
+
+        TestController.prototype.$onInit = jasmine.createSpy('$onInit');
+
+        compileAndLink({
+          template: 'hello',
+          controller: TestController,
+          bindToController: false,
+          locals: {name: 'Bob'}
+        });
+
+        expect(TestController.prototype.$onInit).toHaveBeenCalledTimes(1);
+        expect(isInstantiated).toBe(true);
+      });
+
       // Bindings are not preassigned only if we respect the AngularJS config and they're
       // disabled there. This logic will change in Material 1.2.0.
       if (respectPreAssignBindingsEnabled && !preAssignBindingsEnabledInAngularJS) {
         it('$mdCompileProvider.preAssignBindingsEnabled should report bindings are not pre-assigned', function() {
-          module(function($mdCompilerProvider) {
-            expect($mdCompilerProvider.preAssignBindingsEnabled()).toBe(false);
-          });
+          expect($mdCompilerProvider.preAssignBindingsEnabled()).toBe(false);
         });
 
         it('disabled should assign bindings after constructor', function() {
@@ -239,9 +262,7 @@ describe('$mdCompiler service', function() {
         });
       } else {
         it('$mdCompileProvider.preAssignBindingsEnabled should report bindings are pre-assigned', function() {
-          module(function($mdCompilerProvider) {
-            expect($mdCompilerProvider.preAssignBindingsEnabled()).toBe(false);
-          });
+          expect($mdCompilerProvider.preAssignBindingsEnabled()).toBe(true);
         });
 
         it('enabled should assign bindings at instantiation', function() {