test(ngModel): add two more tests to ngModel, make helpers more complex

Author: Narretz

test/ng/directive/inputSpec.js

@@ -935,7 +935,7 @@ describe('NgModelController', function() {
 });
 
 describe('initialization', function() {
-  var formElm, inputElm, ctrl, scope, $compile, $compileProvider;
+  var formElm, inputElm, ctrl, scope, $compile, $sniffer, $compileProvider, changeInputValueTo;
 
   function compileInput(inputHtml) {
     inputElm = jqLite(inputHtml);
@@ -946,19 +946,25 @@ describe('initialization', function() {
     scope.$digest();
   }
 
-  function addValidator(isValid) {
+  function addValidator(validity, shouldObserve) {
+    if (!isDefined(shouldObserve)) {
+      shouldObserve = true;
+    }
+
     $compileProvider.directive('obs', function() {
       return {
         require: 'ngModel',
         link: function(scope, element, attrs, ngModelCtrl) {
 
-          ngModelCtrl.$validators.obs = function(value) {
-            return isValid;
+          ngModelCtrl.$validators.obs = isFunction(validity) ? validity : function(value) {
+            return validity;
           };
 
-          attrs.$observe('obs', function() {
-            ngModelCtrl.$validate();
-          });
+          if (shouldObserve) {
+            attrs.$observe('obs', function() {
+              ngModelCtrl.$validate();
+            });
+          }
         }
       };
 
@@ -995,16 +1001,22 @@ describe('initialization', function() {
     $compileProvider = _$compileProvider_;
   }));
 
-  beforeEach(inject(function(_$compile_, _$rootScope_) {
+  beforeEach(inject(function(_$compile_, _$rootScope_, _$sniffer_) {
     $compile = _$compile_;
+    $sniffer = _$sniffer_;
     scope = _$rootScope_;
+
+    changeInputValueTo = function(value) {
+      inputElm.val(value);
+      browserTrigger(inputElm, $sniffer.hasEvent('input') ? 'input' : 'change');
+    };
   }));
 
   afterEach(function() {
     dealoc(formElm);
   });
 
-  // This fails with string formatter
+  // https://github.com/angular/angular.js/issues/9959
   it('should not change model of type number to string with validator using observer', function() {
     addValidator(true);
     scope.value = 12345;
@@ -1018,6 +1030,7 @@ describe('initialization', function() {
     expect(scope.ngChangeSpy).not.toHaveBeenCalled();
   });
 
+  //https://github.com/angular/angular.js/issues/9063
   it('should not set a null model that is invalid to undefined', function() {
     addValidator(false);
     scope.value = null;
@@ -1048,6 +1061,7 @@ describe('initialization', function() {
     expect(scope.ngChangeSpy).not.toHaveBeenCalled();
   });
 
+  // https://github.com/angular/angular.js/issues/10025
   it('should not change a model that uses custom $formatters and $parsers', function() {
     addValidator(true);
     addFormatter(function (modelValue) {
@@ -1064,6 +1078,63 @@ describe('initialization', function() {
     expect(inputElm).toBeValid();
     expect(scope.value).toBe('abc');
   });
+
+  describe('$validate', function() {
+
+    // Sanity test: since a parse error sets the modelValue to undefined, the
+    // $$rawModelValue will always be undefined, hence $validate does not have
+    // a 'good' value to update
+    it('should not update a model that has a parse error', function() {
+      scope.value = 'abc';
+      addParser(function() {
+        return undefined;
+      });
+
+      addValidator(true, false);
+
+      compileInput('<input type="text" name="textInput" obs parse ng-model="value"/>');
+      expect(inputElm).toBeValid();
+      expect(scope.value).toBe('abc');
+
+      changeInputValueTo('xyz');
+      expect(inputElm).toBeInvalid();
+      expect(scope.value).toBeUndefined();
+      expect(ctrl.$error.parse).toBe(true);
+
+      ctrl.$validate();
+      expect(inputElm).toBeInvalid();
+      expect(scope.value).toBeUndefined();
+    });
+
+    it('should restore the last valid modelValue when a validator becomes valid', function() {
+      scope.value = 'abc';
+      scope.count = 0;
+
+      addValidator(function() {
+        scope.count++;
+        dump('count', scope.count);
+        return scope.count === 1 ? true : scope.count === 2 ? false : true;
+      });
+
+      compileInput('<input type="text" name="textInput" obs ng-model="value"/>');
+      expect(inputElm).toBeValid();
+      expect(scope.value).toBe('abc');
+      expect(ctrl.$viewValue).toBe('abc');
+
+      ctrl.$validate();
+      scope.$digest();
+      expect(inputElm).toBeInvalid();
+      expect(scope.value).toBeUndefined();
+      expect(ctrl.$viewValue).toBe('abc');
+
+      ctrl.$validate();
+      scope.$digest();
+      expect(inputElm).toBeValid();
+      expect(scope.value).toBe('abc');
+    });
+
+
+  });
 });
 
 describe('ngModel', function() {