From 50af955d250186eedc1ee5cbc6b7e837d36b55b9 Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Sun, 11 Dec 2016 22:10:45 +0200
Subject: [PATCH 1/3] refactor(testabilityPatch): remove code duplication

---
 test/helpers/testabilityPatch.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/helpers/testabilityPatch.js b/test/helpers/testabilityPatch.js
index d589ac2c67df..91fd5661d516 100644
--- a/test/helpers/testabilityPatch.js
+++ b/test/helpers/testabilityPatch.js
@@ -391,8 +391,7 @@ function generateInputCompilerHelper(helper) {
       };
 
       helper.changeInputValueTo = function(value) {
-        helper.inputElm.val(value);
-        browserTrigger(helper.inputElm, $sniffer.hasEvent('input') ? 'input' : 'change');
+        helper.changeGivenInputTo(helper.inputElm, value);
       };
 
       helper.changeGivenInputTo = function(inputElm, value) {

From 4ac35eb53cecb8865f2f262c27c76788a019dab2 Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Sun, 11 Dec 2016 22:11:16 +0200
Subject: [PATCH 2/3] fix(ngModelOptions): work correctly when on the template
 of `replace` directives

Previously, in order for `ngModel` and `ngModelOptions` to work correctly
together, the latter's pre-linking function should be run before the former's
pre-linking function. This was typically what happened, except when `ngModel`
was used on an element which also had a `replace` directive, whose template
included `ngModelOptions`. In that case, the order was reversed.

This commit fixes it by moving the initialization logic of `ngModelOptions` from
its pre-linking function to its controller's `$onInit()` lifecycle hook.

Fixes #15492
---
 src/ng/directive/ngModelOptions.js      |   27 +-
 test/ng/directive/ngModelOptionsSpec.js | 1345 ++++++++++++-----------
 2 files changed, 705 insertions(+), 667 deletions(-)

diff --git a/src/ng/directive/ngModelOptions.js b/src/ng/directive/ngModelOptions.js
index 91b138a241ee..4f25e3a06129 100644
--- a/src/ng/directive/ngModelOptions.js
+++ b/src/ng/directive/ngModelOptions.js
@@ -331,19 +331,28 @@ defaultModelOptions = new ModelOptions({
  *
  */
 var ngModelOptionsDirective = function() {
+  NgModelOptionsController.$inject = ['$attrs', '$scope'];
+  function NgModelOptionsController($attrs, $scope) {
+    this.$$attrs = $attrs;
+    this.$$scope = $scope;
+ }
+  NgModelOptionsController.prototype = {
+    $onInit: function() {
+      var parentCtrl = this.parentOptionsCtrl;
+      var parentOptions = parentCtrl ? parentCtrl.$options : defaultModelOptions;
+      var modelOptionsDefinition = this.$$scope.$eval(this.$$attrs.ngModelOptions);
+
+      this.$options = parentOptions.createChild(modelOptionsDefinition);
+    }
+  };
+
   return {
     restrict: 'A',
     // ngModelOptions needs to run before ngModel and input directives
     priority: 10,
-    require: ['ngModelOptions', '?^^ngModelOptions'],
-    controller: function NgModelOptionsController() {},
-    link: {
-      pre: function ngModelOptionsPreLinkFn(scope, element, attrs, ctrls) {
-        var optionsCtrl = ctrls[0];
-        var parentOptions = ctrls[1] ? ctrls[1].$options : defaultModelOptions;
-        optionsCtrl.$options = parentOptions.createChild(scope.$eval(attrs.ngModelOptions));
-      }
-    }
+    require: {parentOptionsCtrl: '?^^ngModelOptions'},
+    bindToController: true,
+    controller: NgModelOptionsController
   };
 };
 
diff --git a/test/ng/directive/ngModelOptionsSpec.js b/test/ng/directive/ngModelOptionsSpec.js
index ad5d0f7e7cfb..62ff8779f3b2 100644
--- a/test/ng/directive/ngModelOptionsSpec.js
+++ b/test/ng/directive/ngModelOptionsSpec.js
@@ -19,817 +19,846 @@ describe('ngModelOptions', function() {
 
   describe('directive', function() {
 
-    var helper = {}, $rootScope, $compile, $timeout, $q;
-
-    generateInputCompilerHelper(helper);
-
-    beforeEach(inject(function(_$compile_, _$rootScope_, _$timeout_, _$q_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-      $timeout = _$timeout_;
-      $q = _$q_;
-    }));
-
-
-    describe('should fall back to `defaultModelOptions`', function() {
-      it('if there is no `ngModelOptions` directive', function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" />');
-
-        var inputOptions = $rootScope.form.alias.$options;
-        expect(inputOptions.getOption('updateOn')).toEqual(defaultModelOptions.getOption('updateOn'));
-        expect(inputOptions.getOption('updateOnDefault')).toEqual(defaultModelOptions.getOption('updateOnDefault'));
-        expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
-        expect(inputOptions.getOption('getterSetter')).toEqual(defaultModelOptions.getOption('getterSetter'));
-        expect(inputOptions.getOption('allowInvalid')).toEqual(defaultModelOptions.getOption('allowInvalid'));
-        expect(inputOptions.getOption('timezone')).toEqual(defaultModelOptions.getOption('timezone'));
-      });
+    describe('basic usage', function() {
 
+      var helper = {}, $rootScope, $compile, $timeout, $q;
 
-      it('if `ngModelOptions` on the same element does not specify the option', function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ng-model-options="{ updateOn: \'blur\' }"/>');
+      generateInputCompilerHelper(helper);
 
-        var inputOptions = $rootScope.form.alias.$options;
-        expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
-        expect(inputOptions.getOption('updateOnDefault')).toBe(false);
-        expect(inputOptions.getOption('updateOnDefault')).not.toEqual(defaultModelOptions.getOption('updateOnDefault'));
-      });
+      beforeEach(inject(function(_$compile_, _$rootScope_, _$timeout_, _$q_) {
+        $compile = _$compile_;
+        $rootScope = _$rootScope_;
+        $timeout = _$timeout_;
+        $q = _$q_;
+      }));
 
 
-      it('if the first `ngModelOptions` ancestor does not specify the option', function() {
-        var form = $compile('<form name="form" ng-model-options="{ updateOn: \'blur\' }">' +
-                                  '<input name="alias" ng-model="x">' +
-                                '</form>')($rootScope);
-        var inputOptions = $rootScope.form.alias.$options;
+      describe('should fall back to `defaultModelOptions`', function() {
+        it('if there is no `ngModelOptions` directive', function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" />');
 
-        expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
-        expect(inputOptions.getOption('updateOnDefault')).toBe(false);
-        expect(inputOptions.getOption('updateOnDefault')).not.toEqual(defaultModelOptions.getOption('updateOnDefault'));
-        dealoc(form);
-      });
-    });
+          var inputOptions = $rootScope.form.alias.$options;
+          expect(inputOptions.getOption('updateOn')).toEqual(defaultModelOptions.getOption('updateOn'));
+          expect(inputOptions.getOption('updateOnDefault')).toEqual(defaultModelOptions.getOption('updateOnDefault'));
+          expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
+          expect(inputOptions.getOption('getterSetter')).toEqual(defaultModelOptions.getOption('getterSetter'));
+          expect(inputOptions.getOption('allowInvalid')).toEqual(defaultModelOptions.getOption('allowInvalid'));
+          expect(inputOptions.getOption('timezone')).toEqual(defaultModelOptions.getOption('timezone'));
+        });
 
 
-    describe('sharing and inheritance', function() {
+        it('if `ngModelOptions` on the same element does not specify the option', function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ng-model-options="{ updateOn: \'blur\' }"/>');
 
-      it('should not inherit options from ancestor `ngModelOptions` directives by default', function() {
-        var container = $compile(
-                  '<div ng-model-options="{ allowInvalid: true }">' +
-                    '<form ng-model-options="{ updateOn: \'blur\' }">' +
-                      '<input ng-model-options="{ updateOn: \'default\' }">' +
-                    '</form>' +
-                  '</div>')($rootScope);
+          var inputOptions = $rootScope.form.alias.$options;
+          expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
+          expect(inputOptions.getOption('updateOnDefault')).toBe(false);
+          expect(inputOptions.getOption('updateOnDefault')).not.toEqual(defaultModelOptions.getOption('updateOnDefault'));
+        });
 
-        var form = container.find('form');
-        var input = container.find('input');
 
-        var containerOptions = container.controller('ngModelOptions').$options;
-        var formOptions = form.controller('ngModelOptions').$options;
-        var inputOptions = input.controller('ngModelOptions').$options;
+        it('if the first `ngModelOptions` ancestor does not specify the option', function() {
+          var form = $compile('<form name="form" ng-model-options="{ updateOn: \'blur\' }">' +
+                                    '<input name="alias" ng-model="x">' +
+                                  '</form>')($rootScope);
+          var inputOptions = $rootScope.form.alias.$options;
 
-        expect(containerOptions.getOption('allowInvalid')).toEqual(true);
-        expect(formOptions.getOption('allowInvalid')).toEqual(false);
-        expect(inputOptions.getOption('allowInvalid')).toEqual(false);
+          expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
+          expect(inputOptions.getOption('updateOnDefault')).toBe(false);
+          expect(inputOptions.getOption('updateOnDefault')).not.toEqual(defaultModelOptions.getOption('updateOnDefault'));
+          dealoc(form);
+        });
+      });
 
-        expect(containerOptions.getOption('updateOn')).toEqual('');
-        expect(containerOptions.getOption('updateOnDefault')).toEqual(true);
-        expect(formOptions.getOption('updateOn')).toEqual('blur');
-        expect(formOptions.getOption('updateOnDefault')).toEqual(false);
-        expect(inputOptions.getOption('updateOn')).toEqual('');
-        expect(inputOptions.getOption('updateOnDefault')).toEqual(true);
 
-        dealoc(container);
-      });
+      describe('sharing and inheritance', function() {
 
-      it('should inherit options that are marked with "$inherit" from the nearest ancestor `ngModelOptions` directive', function() {
-        var container = $compile(
-                  '<div ng-model-options="{ allowInvalid: true }">' +
-                    '<form ng-model-options="{ updateOn: \'blur\', allowInvalid: \'$inherit\' }">' +
-                      '<input ng-model-options="{ updateOn: \'default\' }">' +
-                    '</form>' +
-                  '</div>')($rootScope);
-
-        var form = container.find('form');
-        var input = container.find('input');
-
-        var containerOptions = container.controller('ngModelOptions').$options;
-        var formOptions = form.controller('ngModelOptions').$options;
-        var inputOptions = input.controller('ngModelOptions').$options;
-
-        expect(containerOptions.getOption('allowInvalid')).toEqual(true);
-        expect(formOptions.getOption('allowInvalid')).toEqual(true);
-        expect(inputOptions.getOption('allowInvalid')).toEqual(false);
-
-        expect(containerOptions.getOption('updateOn')).toEqual('');
-        expect(containerOptions.getOption('updateOnDefault')).toEqual(true);
-        expect(formOptions.getOption('updateOn')).toEqual('blur');
-        expect(formOptions.getOption('updateOnDefault')).toEqual(false);
-        expect(inputOptions.getOption('updateOn')).toEqual('');
-        expect(inputOptions.getOption('updateOnDefault')).toEqual(true);
-
-        dealoc(container);
-      });
+        it('should not inherit options from ancestor `ngModelOptions` directives by default', function() {
+          var container = $compile(
+                    '<div ng-model-options="{ allowInvalid: true }">' +
+                      '<form ng-model-options="{ updateOn: \'blur\' }">' +
+                        '<input ng-model-options="{ updateOn: \'default\' }">' +
+                      '</form>' +
+                    '</div>')($rootScope);
 
-      it('should inherit all unspecified options if the options object contains a `"*"` property with value "$inherit"', function() {
-        var container = $compile(
-                  '<div ng-model-options="{ allowInvalid: true, debounce: 100, updateOn: \'keyup\' }">' +
-                    '<form ng-model-options="{ updateOn: \'blur\', \'*\': \'$inherit\' }">' +
-                      '<input ng-model-options="{ updateOn: \'default\' }">' +
-                    '</form>' +
-                  '</div>')($rootScope);
-
-        var form = container.find('form');
-        var input = container.find('input');
-
-        var containerOptions = container.controller('ngModelOptions').$options;
-        var formOptions = form.controller('ngModelOptions').$options;
-        var inputOptions = input.controller('ngModelOptions').$options;
-
-        expect(containerOptions.getOption('allowInvalid')).toEqual(true);
-        expect(formOptions.getOption('allowInvalid')).toEqual(true);
-        expect(inputOptions.getOption('allowInvalid')).toEqual(false);
-
-        expect(containerOptions.getOption('debounce')).toEqual(100);
-        expect(formOptions.getOption('debounce')).toEqual(100);
-        expect(inputOptions.getOption('debounce')).toEqual(0);
-
-        expect(containerOptions.getOption('updateOn')).toEqual('keyup');
-        expect(containerOptions.getOption('updateOnDefault')).toEqual(false);
-        expect(formOptions.getOption('updateOn')).toEqual('blur');
-        expect(formOptions.getOption('updateOnDefault')).toEqual(false);
-        expect(inputOptions.getOption('updateOn')).toEqual('');
-        expect(inputOptions.getOption('updateOnDefault')).toEqual(true);
-
-        dealoc(container);
-      });
+          var form = container.find('form');
+          var input = container.find('input');
 
-      it('should correctly inherit default and another specified event for `updateOn`', function() {
-        var container = $compile(
-                  '<div ng-model-options="{updateOn: \'default blur\'}">' +
-                    '<input ng-model-options="{\'*\': \'$inherit\'}">' +
-                  '</div>')($rootScope);
+          var containerOptions = container.controller('ngModelOptions').$options;
+          var formOptions = form.controller('ngModelOptions').$options;
+          var inputOptions = input.controller('ngModelOptions').$options;
 
-        var input = container.find('input');
-        var inputOptions = input.controller('ngModelOptions').$options;
+          expect(containerOptions.getOption('allowInvalid')).toEqual(true);
+          expect(formOptions.getOption('allowInvalid')).toEqual(false);
+          expect(inputOptions.getOption('allowInvalid')).toEqual(false);
 
-        expect(inputOptions.getOption('updateOn')).toEqual('blur');
-        expect(inputOptions.getOption('updateOnDefault')).toEqual(true);
+          expect(containerOptions.getOption('updateOn')).toEqual('');
+          expect(containerOptions.getOption('updateOnDefault')).toEqual(true);
+          expect(formOptions.getOption('updateOn')).toEqual('blur');
+          expect(formOptions.getOption('updateOnDefault')).toEqual(false);
+          expect(inputOptions.getOption('updateOn')).toEqual('');
+          expect(inputOptions.getOption('updateOnDefault')).toEqual(true);
 
-        dealoc(container);
-      });
+          dealoc(container);
+        });
 
+        it('should inherit options that are marked with "$inherit" from the nearest ancestor `ngModelOptions` directive', function() {
+          var container = $compile(
+                    '<div ng-model-options="{ allowInvalid: true }">' +
+                      '<form ng-model-options="{ updateOn: \'blur\', allowInvalid: \'$inherit\' }">' +
+                        '<input ng-model-options="{ updateOn: \'default\' }">' +
+                      '</form>' +
+                    '</div>')($rootScope);
+
+          var form = container.find('form');
+          var input = container.find('input');
+
+          var containerOptions = container.controller('ngModelOptions').$options;
+          var formOptions = form.controller('ngModelOptions').$options;
+          var inputOptions = input.controller('ngModelOptions').$options;
+
+          expect(containerOptions.getOption('allowInvalid')).toEqual(true);
+          expect(formOptions.getOption('allowInvalid')).toEqual(true);
+          expect(inputOptions.getOption('allowInvalid')).toEqual(false);
+
+          expect(containerOptions.getOption('updateOn')).toEqual('');
+          expect(containerOptions.getOption('updateOnDefault')).toEqual(true);
+          expect(formOptions.getOption('updateOn')).toEqual('blur');
+          expect(formOptions.getOption('updateOnDefault')).toEqual(false);
+          expect(inputOptions.getOption('updateOn')).toEqual('');
+          expect(inputOptions.getOption('updateOnDefault')).toEqual(true);
+
+          dealoc(container);
+        });
 
-      it('should `updateOnDefault` as well if we have `updateOn: "$inherit"`', function() {
-        var container = $compile(
-                  '<div ng-model-options="{updateOn: \'keyup\'}">' +
-                    '<input ng-model-options="{updateOn: \'$inherit\'}">' +
+        it('should inherit all unspecified options if the options object contains a `"*"` property with value "$inherit"', function() {
+          var container = $compile(
+                    '<div ng-model-options="{ allowInvalid: true, debounce: 100, updateOn: \'keyup\' }">' +
+                      '<form ng-model-options="{ updateOn: \'blur\', \'*\': \'$inherit\' }">' +
+                        '<input ng-model-options="{ updateOn: \'default\' }">' +
+                      '</form>' +
+                    '</div>')($rootScope);
+
+          var form = container.find('form');
+          var input = container.find('input');
+
+          var containerOptions = container.controller('ngModelOptions').$options;
+          var formOptions = form.controller('ngModelOptions').$options;
+          var inputOptions = input.controller('ngModelOptions').$options;
+
+          expect(containerOptions.getOption('allowInvalid')).toEqual(true);
+          expect(formOptions.getOption('allowInvalid')).toEqual(true);
+          expect(inputOptions.getOption('allowInvalid')).toEqual(false);
+
+          expect(containerOptions.getOption('debounce')).toEqual(100);
+          expect(formOptions.getOption('debounce')).toEqual(100);
+          expect(inputOptions.getOption('debounce')).toEqual(0);
+
+          expect(containerOptions.getOption('updateOn')).toEqual('keyup');
+          expect(containerOptions.getOption('updateOnDefault')).toEqual(false);
+          expect(formOptions.getOption('updateOn')).toEqual('blur');
+          expect(formOptions.getOption('updateOnDefault')).toEqual(false);
+          expect(inputOptions.getOption('updateOn')).toEqual('');
+          expect(inputOptions.getOption('updateOnDefault')).toEqual(true);
+
+          dealoc(container);
+        });
+
+        it('should correctly inherit default and another specified event for `updateOn`', function() {
+          var container = $compile(
                     '<div ng-model-options="{updateOn: \'default blur\'}">' +
+                      '<input ng-model-options="{\'*\': \'$inherit\'}">' +
+                    '</div>')($rootScope);
+
+          var input = container.find('input');
+          var inputOptions = input.controller('ngModelOptions').$options;
+
+          expect(inputOptions.getOption('updateOn')).toEqual('blur');
+          expect(inputOptions.getOption('updateOnDefault')).toEqual(true);
+
+          dealoc(container);
+        });
+
+
+        it('should `updateOnDefault` as well if we have `updateOn: "$inherit"`', function() {
+          var container = $compile(
+                    '<div ng-model-options="{updateOn: \'keyup\'}">' +
                       '<input ng-model-options="{updateOn: \'$inherit\'}">' +
-                    '</div>' +
-                  '</div>')($rootScope);
+                      '<div ng-model-options="{updateOn: \'default blur\'}">' +
+                        '<input ng-model-options="{updateOn: \'$inherit\'}">' +
+                      '</div>' +
+                    '</div>')($rootScope);
 
-        var input1 = container.find('input').eq(0);
-        var inputOptions1 = input1.controller('ngModelOptions').$options;
+          var input1 = container.find('input').eq(0);
+          var inputOptions1 = input1.controller('ngModelOptions').$options;
 
-        expect(inputOptions1.getOption('updateOn')).toEqual('keyup');
-        expect(inputOptions1.getOption('updateOnDefault')).toEqual(false);
+          expect(inputOptions1.getOption('updateOn')).toEqual('keyup');
+          expect(inputOptions1.getOption('updateOnDefault')).toEqual(false);
 
-        var input2 = container.find('input').eq(1);
-        var inputOptions2 = input2.controller('ngModelOptions').$options;
+          var input2 = container.find('input').eq(1);
+          var inputOptions2 = input2.controller('ngModelOptions').$options;
 
-        expect(inputOptions2.getOption('updateOn')).toEqual('blur');
-        expect(inputOptions2.getOption('updateOnDefault')).toEqual(true);
+          expect(inputOptions2.getOption('updateOn')).toEqual('blur');
+          expect(inputOptions2.getOption('updateOnDefault')).toEqual(true);
 
-        dealoc(container);
-      });
+          dealoc(container);
+        });
 
 
-      it('should make a copy of the options object', function() {
-        $rootScope.options = {updateOn: 'default'};
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="options"' +
-            '/>');
-        expect($rootScope.options).toEqual({updateOn: 'default'});
-        expect($rootScope.form.alias.$options).not.toBe($rootScope.options);
-      });
+        it('should make a copy of the options object', function() {
+          $rootScope.options = {updateOn: 'default'};
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="options"' +
+              '/>');
+          expect($rootScope.options).toEqual({updateOn: 'default'});
+          expect($rootScope.form.alias.$options).not.toBe($rootScope.options);
+        });
+
+        it('should be retrieved from an ancestor element containing an `ngModelOptions` directive', function() {
+          var doc = $compile(
+              '<form name="test" ' +
+                  'ng-model-options="{ debounce: 10000, updateOn: \'blur\' }" >' +
+                '<input type="text" ng-model="name" name="alias" />' +
+              '</form>')($rootScope);
+          $rootScope.$digest();
+
+          var inputElm = doc.find('input');
+          helper.changeGivenInputTo(inputElm, 'a');
+          expect($rootScope.name).toEqual(undefined);
+          browserTrigger(inputElm, 'blur');
+          expect($rootScope.name).toBeUndefined();
+          $timeout.flush(2000);
+          expect($rootScope.name).toBeUndefined();
+          $timeout.flush(9000);
+          expect($rootScope.name).toEqual('a');
+          dealoc(doc);
+        });
 
-      it('should be retrieved from an ancestor element containing an `ngModelOptions` directive', function() {
-        var doc = $compile(
-            '<form name="test" ' +
-                'ng-model-options="{ debounce: 10000, updateOn: \'blur\' }" >' +
-              '<input type="text" ng-model="name" name="alias" />' +
-            '</form>')($rootScope);
-        $rootScope.$digest();
-
-        var inputElm = doc.find('input');
-        helper.changeGivenInputTo(inputElm, 'a');
-        expect($rootScope.name).toEqual(undefined);
-        browserTrigger(inputElm, 'blur');
-        expect($rootScope.name).toBeUndefined();
-        $timeout.flush(2000);
-        expect($rootScope.name).toBeUndefined();
-        $timeout.flush(9000);
-        expect($rootScope.name).toEqual('a');
-        dealoc(doc);
+        it('should allow sharing options between multiple inputs', function() {
+          $rootScope.options = {updateOn: 'default'};
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name1" name="alias1" ' +
+                'ng-model-options="options"' +
+              '/>' +
+              '<input type="text" ng-model="name2" name="alias2" ' +
+                'ng-model-options="options"' +
+              '/>');
+
+          helper.changeGivenInputTo(inputElm.eq(0), 'a');
+          helper.changeGivenInputTo(inputElm.eq(1), 'b');
+          expect($rootScope.name1).toEqual('a');
+          expect($rootScope.name2).toEqual('b');
+        });
       });
 
-      it('should allow sharing options between multiple inputs', function() {
-        $rootScope.options = {updateOn: 'default'};
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name1" name="alias1" ' +
-              'ng-model-options="options"' +
-            '/>' +
-            '<input type="text" ng-model="name2" name="alias2" ' +
-              'ng-model-options="options"' +
-            '/>');
 
-        helper.changeGivenInputTo(inputElm.eq(0), 'a');
-        helper.changeGivenInputTo(inputElm.eq(1), 'b');
-        expect($rootScope.name1).toEqual('a');
-        expect($rootScope.name2).toEqual('b');
-      });
-    });
+      describe('updateOn', function() {
+        it('should allow overriding the model update trigger event on text inputs', function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="{ updateOn: \'blur\' }"' +
+              '/>');
 
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toBeUndefined();
+          browserTrigger(inputElm, 'blur');
+          expect($rootScope.name).toEqual('a');
+        });
 
-    describe('updateOn', function() {
-      it('should allow overriding the model update trigger event on text inputs', function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="{ updateOn: \'blur\' }"' +
-            '/>');
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toBeUndefined();
-        browserTrigger(inputElm, 'blur');
-        expect($rootScope.name).toEqual('a');
-      });
+        it('should not dirty the input if nothing was changed before updateOn trigger', function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="{ updateOn: \'blur\' }"' +
+              '/>');
 
+          browserTrigger(inputElm, 'blur');
+          expect($rootScope.form.alias.$pristine).toBeTruthy();
+        });
 
-      it('should not dirty the input if nothing was changed before updateOn trigger', function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="{ updateOn: \'blur\' }"' +
-            '/>');
 
-        browserTrigger(inputElm, 'blur');
-        expect($rootScope.form.alias.$pristine).toBeTruthy();
-      });
+        it('should allow overriding the model update trigger event on text areas', function() {
+          var inputElm = helper.compileInput(
+              '<textarea ng-model="name" name="alias" ' +
+                'ng-model-options="{ updateOn: \'blur\' }"' +
+              '/>');
 
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toBeUndefined();
+          browserTrigger(inputElm, 'blur');
+          expect($rootScope.name).toEqual('a');
+        });
 
-      it('should allow overriding the model update trigger event on text areas', function() {
-        var inputElm = helper.compileInput(
-            '<textarea ng-model="name" name="alias" ' +
-              'ng-model-options="{ updateOn: \'blur\' }"' +
-            '/>');
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toBeUndefined();
-        browserTrigger(inputElm, 'blur');
-        expect($rootScope.name).toEqual('a');
-      });
+        it('should bind the element to a list of events', function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="{ updateOn: \'blur mousemove\' }"' +
+              '/>');
 
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toBeUndefined();
+          browserTrigger(inputElm, 'blur');
+          expect($rootScope.name).toEqual('a');
 
-      it('should bind the element to a list of events', function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="{ updateOn: \'blur mousemove\' }"' +
-            '/>');
+          helper.changeInputValueTo('b');
+          expect($rootScope.name).toEqual('a');
+          browserTrigger(inputElm, 'mousemove');
+          expect($rootScope.name).toEqual('b');
+        });
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toBeUndefined();
-        browserTrigger(inputElm, 'blur');
-        expect($rootScope.name).toEqual('a');
 
-        helper.changeInputValueTo('b');
-        expect($rootScope.name).toEqual('a');
-        browserTrigger(inputElm, 'mousemove');
-        expect($rootScope.name).toEqual('b');
-      });
+        it('should allow keeping the default update behavior on text inputs', function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="{ updateOn: \'default\' }"' +
+              '/>');
 
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toEqual('a');
+        });
 
-      it('should allow keeping the default update behavior on text inputs', function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="{ updateOn: \'default\' }"' +
-            '/>');
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toEqual('a');
-      });
+        it('should allow overriding the model update trigger event on checkboxes', function() {
+          var inputElm = helper.compileInput(
+              '<input type="checkbox" ng-model="checkbox" ' +
+                'ng-model-options="{ updateOn: \'blur\' }"' +
+              '/>');
 
+          browserTrigger(inputElm, 'click');
+          expect($rootScope.checkbox).toBeUndefined();
 
-      it('should allow overriding the model update trigger event on checkboxes', function() {
-        var inputElm = helper.compileInput(
-            '<input type="checkbox" ng-model="checkbox" ' +
-              'ng-model-options="{ updateOn: \'blur\' }"' +
-            '/>');
+          browserTrigger(inputElm, 'blur');
+          expect($rootScope.checkbox).toBe(true);
 
-        browserTrigger(inputElm, 'click');
-        expect($rootScope.checkbox).toBeUndefined();
+          browserTrigger(inputElm, 'click');
+          expect($rootScope.checkbox).toBe(true);
+        });
 
-        browserTrigger(inputElm, 'blur');
-        expect($rootScope.checkbox).toBe(true);
 
-        browserTrigger(inputElm, 'click');
-        expect($rootScope.checkbox).toBe(true);
-      });
+        it('should allow keeping the default update behavior on checkboxes', function() {
+          var inputElm = helper.compileInput(
+              '<input type="checkbox" ng-model="checkbox" ' +
+                'ng-model-options="{ updateOn: \'blur default\' }"' +
+              '/>');
 
+          browserTrigger(inputElm, 'click');
+          expect($rootScope.checkbox).toBe(true);
 
-      it('should allow keeping the default update behavior on checkboxes', function() {
-        var inputElm = helper.compileInput(
-            '<input type="checkbox" ng-model="checkbox" ' +
-              'ng-model-options="{ updateOn: \'blur default\' }"' +
-            '/>');
+          browserTrigger(inputElm, 'click');
+          expect($rootScope.checkbox).toBe(false);
+        });
 
-        browserTrigger(inputElm, 'click');
-        expect($rootScope.checkbox).toBe(true);
 
-        browserTrigger(inputElm, 'click');
-        expect($rootScope.checkbox).toBe(false);
-      });
+        it('should allow overriding the model update trigger event on radio buttons', function() {
+          var inputElm = helper.compileInput(
+              '<input type="radio" ng-model="color" value="white" ' +
+                'ng-model-options="{ updateOn: \'blur\'}"' +
+              '/>' +
+              '<input type="radio" ng-model="color" value="red" ' +
+                'ng-model-options="{ updateOn: \'blur\'}"' +
+              '/>' +
+              '<input type="radio" ng-model="color" value="blue" ' +
+                'ng-model-options="{ updateOn: \'blur\'}"' +
+              '/>');
 
+          $rootScope.$apply('color = \'white\'');
+          browserTrigger(inputElm[2], 'click');
+          expect($rootScope.color).toBe('white');
 
-      it('should allow overriding the model update trigger event on radio buttons', function() {
-        var inputElm = helper.compileInput(
-            '<input type="radio" ng-model="color" value="white" ' +
-              'ng-model-options="{ updateOn: \'blur\'}"' +
-            '/>' +
-            '<input type="radio" ng-model="color" value="red" ' +
-              'ng-model-options="{ updateOn: \'blur\'}"' +
-            '/>' +
-            '<input type="radio" ng-model="color" value="blue" ' +
-              'ng-model-options="{ updateOn: \'blur\'}"' +
-            '/>');
+          browserTrigger(inputElm[2], 'blur');
+          expect($rootScope.color).toBe('blue');
 
-        $rootScope.$apply('color = \'white\'');
-        browserTrigger(inputElm[2], 'click');
-        expect($rootScope.color).toBe('white');
+        });
 
-        browserTrigger(inputElm[2], 'blur');
-        expect($rootScope.color).toBe('blue');
 
+        it('should allow keeping the default update behavior on radio buttons', function() {
+          var inputElm = helper.compileInput(
+              '<input type="radio" ng-model="color" value="white" ' +
+                'ng-model-options="{ updateOn: \'blur default\' }"' +
+              '/>' +
+              '<input type="radio" ng-model="color" value="red" ' +
+                'ng-model-options="{ updateOn: \'blur default\' }"' +
+              '/>' +
+              '<input type="radio" ng-model="color" value="blue" ' +
+                'ng-model-options="{ updateOn: \'blur default\' }"' +
+              '/>');
+
+          $rootScope.$apply('color = \'white\'');
+          browserTrigger(inputElm[2], 'click');
+          expect($rootScope.color).toBe('blue');
+        });
       });
 
 
-      it('should allow keeping the default update behavior on radio buttons', function() {
-        var inputElm = helper.compileInput(
-            '<input type="radio" ng-model="color" value="white" ' +
-              'ng-model-options="{ updateOn: \'blur default\' }"' +
-            '/>' +
-            '<input type="radio" ng-model="color" value="red" ' +
-              'ng-model-options="{ updateOn: \'blur default\' }"' +
-            '/>' +
-            '<input type="radio" ng-model="color" value="blue" ' +
-              'ng-model-options="{ updateOn: \'blur default\' }"' +
-            '/>');
+      describe('debounce', function() {
+        it('should trigger only after timeout in text inputs', function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="{ debounce: 10000 }"' +
+              '/>');
 
-        $rootScope.$apply('color = \'white\'');
-        browserTrigger(inputElm[2], 'click');
-        expect($rootScope.color).toBe('blue');
-      });
-    });
+          helper.changeInputValueTo('a');
+          helper.changeInputValueTo('b');
+          helper.changeInputValueTo('c');
+          expect($rootScope.name).toEqual(undefined);
+          $timeout.flush(2000);
+          expect($rootScope.name).toEqual(undefined);
+          $timeout.flush(9000);
+          expect($rootScope.name).toEqual('c');
+        });
 
 
-    describe('debounce', function() {
-      it('should trigger only after timeout in text inputs', function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="{ debounce: 10000 }"' +
-            '/>');
+        it('should trigger only after timeout in checkboxes', function() {
+          var inputElm = helper.compileInput(
+              '<input type="checkbox" ng-model="checkbox" ' +
+                'ng-model-options="{ debounce: 10000 }"' +
+              '/>');
 
-        helper.changeInputValueTo('a');
-        helper.changeInputValueTo('b');
-        helper.changeInputValueTo('c');
-        expect($rootScope.name).toEqual(undefined);
-        $timeout.flush(2000);
-        expect($rootScope.name).toEqual(undefined);
-        $timeout.flush(9000);
-        expect($rootScope.name).toEqual('c');
-      });
+          browserTrigger(inputElm, 'click');
+          expect($rootScope.checkbox).toBeUndefined();
+          $timeout.flush(2000);
+          expect($rootScope.checkbox).toBeUndefined();
+          $timeout.flush(9000);
+          expect($rootScope.checkbox).toBe(true);
+        });
 
 
-      it('should trigger only after timeout in checkboxes', function() {
-        var inputElm = helper.compileInput(
-            '<input type="checkbox" ng-model="checkbox" ' +
-              'ng-model-options="{ debounce: 10000 }"' +
-            '/>');
+        it('should trigger only after timeout in radio buttons', function() {
+          var inputElm = helper.compileInput(
+              '<input type="radio" ng-model="color" value="white" />' +
+              '<input type="radio" ng-model="color" value="red" ' +
+                'ng-model-options="{ debounce: 20000 }"' +
+              '/>' +
+              '<input type="radio" ng-model="color" value="blue" ' +
+                'ng-model-options="{ debounce: 30000 }"' +
+              '/>');
+
+          browserTrigger(inputElm[0], 'click');
+          expect($rootScope.color).toBe('white');
+          browserTrigger(inputElm[1], 'click');
+          expect($rootScope.color).toBe('white');
+          $timeout.flush(12000);
+          expect($rootScope.color).toBe('white');
+          $timeout.flush(10000);
+          expect($rootScope.color).toBe('red');
 
-        browserTrigger(inputElm, 'click');
-        expect($rootScope.checkbox).toBeUndefined();
-        $timeout.flush(2000);
-        expect($rootScope.checkbox).toBeUndefined();
-        $timeout.flush(9000);
-        expect($rootScope.checkbox).toBe(true);
-      });
+        });
 
 
-      it('should trigger only after timeout in radio buttons', function() {
-        var inputElm = helper.compileInput(
-            '<input type="radio" ng-model="color" value="white" />' +
-            '<input type="radio" ng-model="color" value="red" ' +
-              'ng-model-options="{ debounce: 20000 }"' +
-            '/>' +
-            '<input type="radio" ng-model="color" value="blue" ' +
-              'ng-model-options="{ debounce: 30000 }"' +
-            '/>');
+        it('should not trigger digest while debouncing', function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="{ debounce: 10000 }"' +
+              '/>');
 
-        browserTrigger(inputElm[0], 'click');
-        expect($rootScope.color).toBe('white');
-        browserTrigger(inputElm[1], 'click');
-        expect($rootScope.color).toBe('white');
-        $timeout.flush(12000);
-        expect($rootScope.color).toBe('white');
-        $timeout.flush(10000);
-        expect($rootScope.color).toBe('red');
+          var watchSpy = jasmine.createSpy('watchSpy');
+          $rootScope.$watch(watchSpy);
 
-      });
+          helper.changeInputValueTo('a');
+          expect(watchSpy).not.toHaveBeenCalled();
 
+          $timeout.flush(10000);
+          expect(watchSpy).toHaveBeenCalled();
+        });
 
-      it('should not trigger digest while debouncing', function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="{ debounce: 10000 }"' +
-            '/>');
 
-        var watchSpy = jasmine.createSpy('watchSpy');
-        $rootScope.$watch(watchSpy);
+        it('should allow selecting different debounce timeouts for each event',
+          function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="{' +
+                  'updateOn: \'default blur mouseup\', ' +
+                  'debounce: { default: 10000, blur: 5000 }' +
+                '}"' +
+              '/>');
+
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toBeUndefined();
+          $timeout.flush(6000);
+          expect($rootScope.name).toBeUndefined();
+          $timeout.flush(4000);
+          expect($rootScope.name).toEqual('a');
+
+          helper.changeInputValueTo('b');
+          browserTrigger(inputElm, 'blur');
+          $timeout.flush(4000);
+          expect($rootScope.name).toEqual('a');
+          $timeout.flush(2000);
+          expect($rootScope.name).toEqual('b');
+
+          helper.changeInputValueTo('c');
+          browserTrigger(helper.inputElm, 'mouseup');
+          // counter-intuitively `default` in `debounce` is a catch-all
+          expect($rootScope.name).toEqual('b');
+          $timeout.flush(10000);
+          expect($rootScope.name).toEqual('c');
+        });
 
-        helper.changeInputValueTo('a');
-        expect(watchSpy).not.toHaveBeenCalled();
 
-        $timeout.flush(10000);
-        expect(watchSpy).toHaveBeenCalled();
-      });
+        it('should trigger immediately for the event if not listed in the debounce list',
+          function() {
+          var inputElm = helper.compileInput(
+              '<input type="text" ng-model="name" name="alias" ' +
+                'ng-model-options="{' +
+                  'updateOn: \'default blur foo\', ' +
+                  'debounce: { blur: 5000 }' +
+                '}"' +
+              '/>');
 
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toEqual('a');
 
-      it('should allow selecting different debounce timeouts for each event',
-        function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="{' +
-                'updateOn: \'default blur mouseup\', ' +
-                'debounce: { default: 10000, blur: 5000 }' +
-              '}"' +
+          helper.changeInputValueTo('b');
+          browserTrigger(inputElm, 'foo');
+          expect($rootScope.name).toEqual('b');
+        });
+
+        it('should allow selecting different debounce timeouts for each event on checkboxes', function() {
+          var inputElm = helper.compileInput('<input type="checkbox" ng-model="checkbox" ' +
+            'ng-model-options="{ ' +
+              'updateOn: \'default blur\', debounce: { default: 10000, blur: 5000 } }"' +
             '/>');
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toBeUndefined();
-        $timeout.flush(6000);
-        expect($rootScope.name).toBeUndefined();
-        $timeout.flush(4000);
-        expect($rootScope.name).toEqual('a');
-
-        helper.changeInputValueTo('b');
-        browserTrigger(inputElm, 'blur');
-        $timeout.flush(4000);
-        expect($rootScope.name).toEqual('a');
-        $timeout.flush(2000);
-        expect($rootScope.name).toEqual('b');
-
-        helper.changeInputValueTo('c');
-        browserTrigger(helper.inputElm, 'mouseup');
-        // counter-intuitively `default` in `debounce` is a catch-all
-        expect($rootScope.name).toEqual('b');
-        $timeout.flush(10000);
-        expect($rootScope.name).toEqual('c');
-      });
+          inputElm[0].checked = false;
+          browserTrigger(inputElm, 'click');
+          expect($rootScope.checkbox).toBeUndefined();
+          $timeout.flush(8000);
+          expect($rootScope.checkbox).toBeUndefined();
+          $timeout.flush(3000);
+          expect($rootScope.checkbox).toBe(true);
+          inputElm[0].checked = true;
+          browserTrigger(inputElm, 'click');
+          browserTrigger(inputElm, 'blur');
+          $timeout.flush(3000);
+          expect($rootScope.checkbox).toBe(true);
+          $timeout.flush(3000);
+          expect($rootScope.checkbox).toBe(false);
+        });
 
 
-      it('should trigger immediately for the event if not listed in the debounce list',
-        function() {
-        var inputElm = helper.compileInput(
-            '<input type="text" ng-model="name" name="alias" ' +
-              'ng-model-options="{' +
-                'updateOn: \'default blur foo\', ' +
-                'debounce: { blur: 5000 }' +
-              '}"' +
+        it('should allow selecting 0 for non-default debounce timeouts for each event on checkboxes', function() {
+          var inputElm = helper.compileInput('<input type="checkbox" ng-model="checkbox" ' +
+            'ng-model-options="{ ' +
+              'updateOn: \'default blur\', debounce: { default: 10000, blur: 0 } }"' +
             '/>');
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toEqual('a');
+          inputElm[0].checked = false;
+          browserTrigger(inputElm, 'click');
+          expect($rootScope.checkbox).toBeUndefined();
+          $timeout.flush(8000);
+          expect($rootScope.checkbox).toBeUndefined();
+          $timeout.flush(3000);
+          expect($rootScope.checkbox).toBe(true);
+          inputElm[0].checked = true;
+          browserTrigger(inputElm, 'click');
+          browserTrigger(inputElm, 'blur');
+          $timeout.flush(0);
+          expect($rootScope.checkbox).toBe(false);
+        });
 
-        helper.changeInputValueTo('b');
-        browserTrigger(inputElm, 'foo');
-        expect($rootScope.name).toEqual('b');
-      });
 
-      it('should allow selecting different debounce timeouts for each event on checkboxes', function() {
-        var inputElm = helper.compileInput('<input type="checkbox" ng-model="checkbox" ' +
-          'ng-model-options="{ ' +
-            'updateOn: \'default blur\', debounce: { default: 10000, blur: 5000 } }"' +
-          '/>');
-
-        inputElm[0].checked = false;
-        browserTrigger(inputElm, 'click');
-        expect($rootScope.checkbox).toBeUndefined();
-        $timeout.flush(8000);
-        expect($rootScope.checkbox).toBeUndefined();
-        $timeout.flush(3000);
-        expect($rootScope.checkbox).toBe(true);
-        inputElm[0].checked = true;
-        browserTrigger(inputElm, 'click');
-        browserTrigger(inputElm, 'blur');
-        $timeout.flush(3000);
-        expect($rootScope.checkbox).toBe(true);
-        $timeout.flush(3000);
-        expect($rootScope.checkbox).toBe(false);
-      });
+        it('should flush debounced events when calling $commitViewValue directly', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" name="alias" ' +
+              'ng-model-options="{ debounce: 1000 }" />');
 
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toEqual(undefined);
+          $rootScope.form.alias.$commitViewValue();
+          expect($rootScope.name).toEqual('a');
+        });
 
-      it('should allow selecting 0 for non-default debounce timeouts for each event on checkboxes', function() {
-        var inputElm = helper.compileInput('<input type="checkbox" ng-model="checkbox" ' +
-          'ng-model-options="{ ' +
-            'updateOn: \'default blur\', debounce: { default: 10000, blur: 0 } }"' +
-          '/>');
-
-        inputElm[0].checked = false;
-        browserTrigger(inputElm, 'click');
-        expect($rootScope.checkbox).toBeUndefined();
-        $timeout.flush(8000);
-        expect($rootScope.checkbox).toBeUndefined();
-        $timeout.flush(3000);
-        expect($rootScope.checkbox).toBe(true);
-        inputElm[0].checked = true;
-        browserTrigger(inputElm, 'click');
-        browserTrigger(inputElm, 'blur');
-        $timeout.flush(0);
-        expect($rootScope.checkbox).toBe(false);
-      });
+        it('should cancel debounced events when calling $commitViewValue', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" name="alias" ' +
+              'ng-model-options="{ debounce: 1000 }"/>');
 
+          helper.changeInputValueTo('a');
+          $rootScope.form.alias.$commitViewValue();
+          expect($rootScope.name).toEqual('a');
 
-      it('should flush debounced events when calling $commitViewValue directly', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" name="alias" ' +
-            'ng-model-options="{ debounce: 1000 }" />');
+          $rootScope.form.alias.$setPristine();
+          $timeout.flush(1000);
+          expect($rootScope.form.alias.$pristine).toBeTruthy();
+        });
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toEqual(undefined);
-        $rootScope.form.alias.$commitViewValue();
-        expect($rootScope.name).toEqual('a');
-      });
 
-      it('should cancel debounced events when calling $commitViewValue', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" name="alias" ' +
-            'ng-model-options="{ debounce: 1000 }"/>');
+        it('should reset input val if rollbackViewValue called during pending update', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" name="alias" ' +
+              'ng-model-options="{ updateOn: \'blur\' }" />');
+
+          helper.changeInputValueTo('a');
+          expect(inputElm.val()).toBe('a');
+          $rootScope.form.alias.$rollbackViewValue();
+          expect(inputElm.val()).toBe('');
+          browserTrigger(inputElm, 'blur');
+          expect(inputElm.val()).toBe('');
+        });
 
-        helper.changeInputValueTo('a');
-        $rootScope.form.alias.$commitViewValue();
-        expect($rootScope.name).toEqual('a');
 
-        $rootScope.form.alias.$setPristine();
-        $timeout.flush(1000);
-        expect($rootScope.form.alias.$pristine).toBeTruthy();
-      });
+        it('should allow canceling pending updates', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" name="alias" ' +
+              'ng-model-options="{ updateOn: \'blur\' }" />');
+
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toEqual(undefined);
+          $rootScope.form.alias.$rollbackViewValue();
+          expect($rootScope.name).toEqual(undefined);
+          browserTrigger(inputElm, 'blur');
+          expect($rootScope.name).toEqual(undefined);
+        });
 
 
-      it('should reset input val if rollbackViewValue called during pending update', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" name="alias" ' +
-            'ng-model-options="{ updateOn: \'blur\' }" />');
+        it('should allow canceling debounced updates', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" name="alias" ' +
+              'ng-model-options="{ debounce: 10000 }" />');
+
+          helper.changeInputValueTo('a');
+          expect($rootScope.name).toEqual(undefined);
+          $timeout.flush(2000);
+          $rootScope.form.alias.$rollbackViewValue();
+          expect($rootScope.name).toEqual(undefined);
+          $timeout.flush(10000);
+          expect($rootScope.name).toEqual(undefined);
+        });
 
-        helper.changeInputValueTo('a');
-        expect(inputElm.val()).toBe('a');
-        $rootScope.form.alias.$rollbackViewValue();
-        expect(inputElm.val()).toBe('');
-        browserTrigger(inputElm, 'blur');
-        expect(inputElm.val()).toBe('');
-      });
 
+        it('should handle model updates correctly even if rollbackViewValue is not invoked', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" name="alias" ' +
+              'ng-model-options="{ updateOn: \'blur\' }" />');
 
-      it('should allow canceling pending updates', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" name="alias" ' +
-            'ng-model-options="{ updateOn: \'blur\' }" />');
+          helper.changeInputValueTo('a');
+          $rootScope.$apply('name = \'b\'');
+          browserTrigger(inputElm, 'blur');
+          expect($rootScope.name).toBe('b');
+        });
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toEqual(undefined);
-        $rootScope.form.alias.$rollbackViewValue();
-        expect($rootScope.name).toEqual(undefined);
-        browserTrigger(inputElm, 'blur');
-        expect($rootScope.name).toEqual(undefined);
-      });
 
+        it('should reset input val if rollbackViewValue called during debounce', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" name="alias" ' +
+              'ng-model-options="{ debounce: 2000 }" />');
+
+          helper.changeInputValueTo('a');
+          expect(inputElm.val()).toBe('a');
+          $rootScope.form.alias.$rollbackViewValue();
+          expect(inputElm.val()).toBe('');
+          $timeout.flush(3000);
+          expect(inputElm.val()).toBe('');
+        });
+      });
 
-      it('should allow canceling debounced updates', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" name="alias" ' +
-            'ng-model-options="{ debounce: 10000 }" />');
 
-        helper.changeInputValueTo('a');
-        expect($rootScope.name).toEqual(undefined);
-        $timeout.flush(2000);
-        $rootScope.form.alias.$rollbackViewValue();
-        expect($rootScope.name).toEqual(undefined);
-        $timeout.flush(10000);
-        expect($rootScope.name).toEqual(undefined);
-      });
+      describe('getterSetter', function() {
+        it('should not try to invoke a model if getterSetter is false', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" ' +
+              'ng-model-options="{ getterSetter: false }" />');
 
+          var spy = $rootScope.name = jasmine.createSpy('setterSpy');
+          helper.changeInputValueTo('a');
+          expect(spy).not.toHaveBeenCalled();
+          expect(inputElm.val()).toBe('a');
+        });
 
-      it('should handle model updates correctly even if rollbackViewValue is not invoked', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" name="alias" ' +
-            'ng-model-options="{ updateOn: \'blur\' }" />');
 
-        helper.changeInputValueTo('a');
-        $rootScope.$apply('name = \'b\'');
-        browserTrigger(inputElm, 'blur');
-        expect($rootScope.name).toBe('b');
-      });
+        it('should not try to invoke a model if getterSetter is not set', function() {
+          var inputElm = helper.compileInput('<input type="text" ng-model="name" />');
 
+          var spy = $rootScope.name = jasmine.createSpy('setterSpy');
+          helper.changeInputValueTo('a');
+          expect(spy).not.toHaveBeenCalled();
+          expect(inputElm.val()).toBe('a');
+        });
 
-      it('should reset input val if rollbackViewValue called during debounce', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" name="alias" ' +
-            'ng-model-options="{ debounce: 2000 }" />');
 
-        helper.changeInputValueTo('a');
-        expect(inputElm.val()).toBe('a');
-        $rootScope.form.alias.$rollbackViewValue();
-        expect(inputElm.val()).toBe('');
-        $timeout.flush(3000);
-        expect(inputElm.val()).toBe('');
-      });
-    });
+        it('should try to invoke a function model if getterSetter is true', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" ' +
+              'ng-model-options="{ getterSetter: true }" />');
 
+          var spy = $rootScope.name = jasmine.createSpy('setterSpy').and.callFake(function() {
+            return 'b';
+          });
+          $rootScope.$apply();
+          expect(inputElm.val()).toBe('b');
 
-    describe('getterSetter', function() {
-      it('should not try to invoke a model if getterSetter is false', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" ' +
-            'ng-model-options="{ getterSetter: false }" />');
+          helper.changeInputValueTo('a');
+          expect(inputElm.val()).toBe('b');
+          expect(spy).toHaveBeenCalledWith('a');
+          expect($rootScope.name).toBe(spy);
+        });
 
-        var spy = $rootScope.name = jasmine.createSpy('setterSpy');
-        helper.changeInputValueTo('a');
-        expect(spy).not.toHaveBeenCalled();
-        expect(inputElm.val()).toBe('a');
-      });
 
+        it('should assign to non-function models if getterSetter is true', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="name" ' +
+              'ng-model-options="{ getterSetter: true }" />');
 
-      it('should not try to invoke a model if getterSetter is not set', function() {
-        var inputElm = helper.compileInput('<input type="text" ng-model="name" />');
+          $rootScope.name = 'c';
+          helper.changeInputValueTo('d');
+          expect(inputElm.val()).toBe('d');
+          expect($rootScope.name).toBe('d');
+        });
 
-        var spy = $rootScope.name = jasmine.createSpy('setterSpy');
-        helper.changeInputValueTo('a');
-        expect(spy).not.toHaveBeenCalled();
-        expect(inputElm.val()).toBe('a');
-      });
 
+        it('should fail on non-assignable model binding if getterSetter is false', function() {
+          expect(function() {
+            var inputElm = helper.compileInput('<input type="text" ng-model="accessor(user, \'name\')" />');
+          }).toThrowMinErr('ngModel', 'nonassign', 'Expression \'accessor(user, \'name\')\' is non-assignable.');
+        });
 
-      it('should try to invoke a function model if getterSetter is true', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" ' +
-            'ng-model-options="{ getterSetter: true }" />');
 
-        var spy = $rootScope.name = jasmine.createSpy('setterSpy').and.callFake(function() {
-          return 'b';
+        it('should not fail on non-assignable model binding if getterSetter is true', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="accessor(user, \'name\')" ' +
+              'ng-model-options="{ getterSetter: true }" />');
         });
-        $rootScope.$apply();
-        expect(inputElm.val()).toBe('b');
 
-        helper.changeInputValueTo('a');
-        expect(inputElm.val()).toBe('b');
-        expect(spy).toHaveBeenCalledWith('a');
-        expect($rootScope.name).toBe(spy);
+
+        it('should invoke a model in the correct context if getterSetter is true', function() {
+          var inputElm = helper.compileInput(
+            '<input type="text" ng-model="someService.getterSetter" ' +
+              'ng-model-options="{ getterSetter: true }" />');
+
+          $rootScope.someService = {
+            value: 'a',
+            getterSetter: function(newValue) {
+              this.value = newValue || this.value;
+              return this.value;
+            }
+          };
+          spyOn($rootScope.someService, 'getterSetter').and.callThrough();
+          $rootScope.$apply();
+
+          expect(inputElm.val()).toBe('a');
+          expect($rootScope.someService.getterSetter).toHaveBeenCalledWith();
+          expect($rootScope.someService.value).toBe('a');
+
+          helper.changeInputValueTo('b');
+          expect($rootScope.someService.getterSetter).toHaveBeenCalledWith('b');
+          expect($rootScope.someService.value).toBe('b');
+
+          $rootScope.someService.value = 'c';
+          $rootScope.$apply();
+          expect(inputElm.val()).toBe('c');
+          expect($rootScope.someService.getterSetter).toHaveBeenCalledWith();
+        });
       });
 
 
-      it('should assign to non-function models if getterSetter is true', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="name" ' +
-            'ng-model-options="{ getterSetter: true }" />');
+      describe('allowInvalid', function() {
+        it('should assign invalid values to the scope if allowInvalid is true', function() {
+          var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" maxlength="1" ' +
+                      'ng-model-options="{allowInvalid: true}" />');
+          helper.changeInputValueTo('12345');
 
-        $rootScope.name = 'c';
-        helper.changeInputValueTo('d');
-        expect(inputElm.val()).toBe('d');
-        expect($rootScope.name).toBe('d');
-      });
+          expect($rootScope.value).toBe('12345');
+          expect(inputElm).toBeInvalid();
+        });
 
 
-      it('should fail on non-assignable model binding if getterSetter is false', function() {
-        expect(function() {
-          var inputElm = helper.compileInput('<input type="text" ng-model="accessor(user, \'name\')" />');
-        }).toThrowMinErr('ngModel', 'nonassign', 'Expression \'accessor(user, \'name\')\' is non-assignable.');
-      });
+        it('should not assign not parsable values to the scope if allowInvalid is true', function() {
+          var inputElm = helper.compileInput('<input type="number" name="input" ng-model="value" ' +
+                      'ng-model-options="{allowInvalid: true}" />', {
+            valid: false,
+            badInput: true
+          });
+          helper.changeInputValueTo('abcd');
 
+          expect($rootScope.value).toBeUndefined();
+          expect(inputElm).toBeInvalid();
+        });
 
-      it('should not fail on non-assignable model binding if getterSetter is true', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="accessor(user, \'name\')" ' +
-            'ng-model-options="{ getterSetter: true }" />');
-      });
 
+        it('should update the scope before async validators execute if allowInvalid is true', function() {
+          var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" ' +
+                      'ng-model-options="{allowInvalid: true}" />');
+          var defer;
+          $rootScope.form.input.$asyncValidators.promiseValidator = function(value) {
+            defer = $q.defer();
+            return defer.promise;
+          };
+          helper.changeInputValueTo('12345');
+
+          expect($rootScope.value).toBe('12345');
+          expect($rootScope.form.input.$pending.promiseValidator).toBe(true);
+          defer.reject();
+          $rootScope.$digest();
+          expect($rootScope.value).toBe('12345');
+          expect(inputElm).toBeInvalid();
+        });
 
-      it('should invoke a model in the correct context if getterSetter is true', function() {
-        var inputElm = helper.compileInput(
-          '<input type="text" ng-model="someService.getterSetter" ' +
-            'ng-model-options="{ getterSetter: true }" />');
-
-        $rootScope.someService = {
-          value: 'a',
-          getterSetter: function(newValue) {
-            this.value = newValue || this.value;
-            return this.value;
-          }
-        };
-        spyOn($rootScope.someService, 'getterSetter').and.callThrough();
-        $rootScope.$apply();
-
-        expect(inputElm.val()).toBe('a');
-        expect($rootScope.someService.getterSetter).toHaveBeenCalledWith();
-        expect($rootScope.someService.value).toBe('a');
-
-        helper.changeInputValueTo('b');
-        expect($rootScope.someService.getterSetter).toHaveBeenCalledWith('b');
-        expect($rootScope.someService.value).toBe('b');
-
-        $rootScope.someService.value = 'c';
-        $rootScope.$apply();
-        expect(inputElm.val()).toBe('c');
-        expect($rootScope.someService.getterSetter).toHaveBeenCalledWith();
-      });
-    });
 
+        it('should update the view before async validators execute if allowInvalid is true', function() {
+          var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" ' +
+                      'ng-model-options="{allowInvalid: true}" />');
+          var defer;
+          $rootScope.form.input.$asyncValidators.promiseValidator = function(value) {
+            defer = $q.defer();
+            return defer.promise;
+          };
+          $rootScope.$apply('value = \'12345\'');
+
+          expect(inputElm.val()).toBe('12345');
+          expect($rootScope.form.input.$pending.promiseValidator).toBe(true);
+          defer.reject();
+          $rootScope.$digest();
+          expect(inputElm.val()).toBe('12345');
+          expect(inputElm).toBeInvalid();
+        });
 
-    describe('allowInvalid', function() {
-      it('should assign invalid values to the scope if allowInvalid is true', function() {
-        var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" maxlength="1" ' +
-                    'ng-model-options="{allowInvalid: true}" />');
-        helper.changeInputValueTo('12345');
 
-        expect($rootScope.value).toBe('12345');
-        expect(inputElm).toBeInvalid();
-      });
+        it('should not call ng-change listeners twice if the model did not change with allowInvalid', function() {
+          var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" ' +
+                      'ng-model-options="{allowInvalid: true}" ng-change="changed()" />');
+          $rootScope.changed = jasmine.createSpy('changed');
+          $rootScope.form.input.$parsers.push(function(value) {
+            return 'modelValue';
+          });
 
+          helper.changeInputValueTo('input1');
+          expect($rootScope.value).toBe('modelValue');
+          expect($rootScope.changed).toHaveBeenCalledOnce();
 
-      it('should not assign not parsable values to the scope if allowInvalid is true', function() {
-        var inputElm = helper.compileInput('<input type="number" name="input" ng-model="value" ' +
-                    'ng-model-options="{allowInvalid: true}" />', {
-          valid: false,
-          badInput: true
+          helper.changeInputValueTo('input2');
+          expect($rootScope.value).toBe('modelValue');
+          expect($rootScope.changed).toHaveBeenCalledOnce();
         });
-        helper.changeInputValueTo('abcd');
-
-        expect($rootScope.value).toBeUndefined();
-        expect(inputElm).toBeInvalid();
       });
+    });
 
 
-      it('should update the scope before async validators execute if allowInvalid is true', function() {
-        var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" ' +
-                    'ng-model-options="{allowInvalid: true}" />');
-        var defer;
-        $rootScope.form.input.$asyncValidators.promiseValidator = function(value) {
-          defer = $q.defer();
-          return defer.promise;
-        };
-        helper.changeInputValueTo('12345');
-
-        expect($rootScope.value).toBe('12345');
-        expect($rootScope.form.input.$pending.promiseValidator).toBe(true);
-        defer.reject();
-        $rootScope.$digest();
-        expect($rootScope.value).toBe('12345');
-        expect(inputElm).toBeInvalid();
-      });
+    describe('on directives with `replace: true`', function() {
 
+      var $rootScope, $compile;
 
-      it('should update the view before async validators execute if allowInvalid is true', function() {
-        var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" ' +
-                    'ng-model-options="{allowInvalid: true}" />');
-        var defer;
-        $rootScope.form.input.$asyncValidators.promiseValidator = function(value) {
-          defer = $q.defer();
-          return defer.promise;
-        };
-        $rootScope.$apply('value = \'12345\'');
-
-        expect(inputElm.val()).toBe('12345');
-        expect($rootScope.form.input.$pending.promiseValidator).toBe(true);
-        defer.reject();
-        $rootScope.$digest();
-        expect(inputElm.val()).toBe('12345');
-        expect(inputElm).toBeInvalid();
-      });
+      beforeEach(module(function($compileProvider) {
+        $compileProvider.directive('foo', valueFn({
+          replace: true,
+          template: '<input type="text" ng-model-options="{debounce: 1000}" />'
+        }));
+      }));
 
+      beforeEach(inject(function(_$compile_, _$rootScope_) {
+        $compile = _$compile_;
+        $rootScope = _$rootScope_;
+      }));
 
-      it('should not call ng-change listeners twice if the model did not change with allowInvalid', function() {
-        var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" ' +
-                    'ng-model-options="{allowInvalid: true}" ng-change="changed()" />');
-        $rootScope.changed = jasmine.createSpy('changed');
-        $rootScope.form.input.$parsers.push(function(value) {
-          return 'modelValue';
-        });
 
-        helper.changeInputValueTo('input1');
-        expect($rootScope.value).toBe('modelValue');
-        expect($rootScope.changed).toHaveBeenCalledOnce();
+      it('should get initialized in time for `ngModel` on the original element', function() {
+        var inputElm = $compile('<foo ng-model="value"></foo>')($rootScope);
+        var ngModelCtrl = inputElm.controller('ngModel');
 
-        helper.changeInputValueTo('input2');
-        expect($rootScope.value).toBe('modelValue');
-        expect($rootScope.changed).toHaveBeenCalledOnce();
+        expect(ngModelCtrl.$options.getOption('debounce')).toBe(1000);
       });
     });
   });

From 156f6315104b793108f5e1d6dec1000149362c29 Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <kalpakas.g@gmail.com>
Date: Mon, 12 Dec 2016 23:49:12 +0200
Subject: [PATCH 3/3] fixup! fix(ngModelOptions): work correctly when on the
 template of `replace` directives

---
 src/ng/directive/ngModelOptions.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/ng/directive/ngModelOptions.js b/src/ng/directive/ngModelOptions.js
index 4f25e3a06129..59c63b812789 100644
--- a/src/ng/directive/ngModelOptions.js
+++ b/src/ng/directive/ngModelOptions.js
@@ -338,8 +338,7 @@ var ngModelOptionsDirective = function() {
  }
   NgModelOptionsController.prototype = {
     $onInit: function() {
-      var parentCtrl = this.parentOptionsCtrl;
-      var parentOptions = parentCtrl ? parentCtrl.$options : defaultModelOptions;
+      var parentOptions = this.parentCtrl ? this.parentCtrl.$options : defaultModelOptions;
       var modelOptionsDefinition = this.$$scope.$eval(this.$$attrs.ngModelOptions);
 
       this.$options = parentOptions.createChild(modelOptionsDefinition);
@@ -350,7 +349,7 @@ var ngModelOptionsDirective = function() {
     restrict: 'A',
     // ngModelOptions needs to run before ngModel and input directives
     priority: 10,
-    require: {parentOptionsCtrl: '?^^ngModelOptions'},
+    require: {parentCtrl: '?^^ngModelOptions'},
     bindToController: true,
     controller: NgModelOptionsController
   };