fix(ngModel): update model value with async validators correctly

If the view value changed in the first digest and there are async validators,
the view value was never applied to the model after the validators were
resolved. Only important for tests.

Author: tbosch

src/ng/directive/input.js

@@ -2032,6 +2032,10 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
         break;
       }
     }
+    if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) {
+      // ctrl.$modelValue has not been touched yet...
+      ctrl.$modelValue = ngModelGet();
+    }
     var prevModelValue = ctrl.$modelValue;
     ctrl.$$runValidators(parserValid, modelValue, viewValue, function() {
       ctrl.$modelValue = ctrl.$valid ? modelValue : undefined;

test/ng/directive/inputSpec.js

@@ -356,6 +356,40 @@ describe('NgModelController', function() {
       expect(input).not.toHaveClass('ng-valid-parse');
       expect(input).toHaveClass('ng-invalid-parse');
     });
+
+    it('should update the model after all async validators resolve', inject(function($q) {
+      var defer;
+      ctrl.$asyncValidators.promiseValidator = function(value) {
+        defer = $q.defer();
+        return defer.promise;
+      };
+
+      // set view value on first digest
+      ctrl.$setViewValue('b');
+
+      expect(ctrl.$modelValue).toBeUndefined();
+      expect(scope.value).toBeUndefined();
+
+      defer.resolve();
+      scope.$digest();
+
+      expect(ctrl.$modelValue).toBe('b');
+      expect(scope.value).toBe('b');
+
+      // set view value on further digests
+      ctrl.$setViewValue('c');
+
+      expect(ctrl.$modelValue).toBe('b');
+      expect(scope.value).toBe('b');
+
+      defer.resolve();
+      scope.$digest();
+
+      expect(ctrl.$modelValue).toBe('c');
+      expect(scope.value).toBe('c');
+
+    }));
+
   });