Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

fix(input[number]): validate min/max against viewValue #16325

Merged
merged 1 commit into from
Nov 17, 2017
Merged

fix(input[number]): validate min/max against viewValue #16325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ng/directive/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,8 +1604,8 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
var maxVal;

if (isDefined(attr.min) || attr.ngMin) {
ctrl.$validators.min = function(value) {
return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
ctrl.$validators.min = function(modelValue, viewValue) {
return ctrl.$isEmpty(viewValue) || isUndefined(minVal) || viewValue >= minVal;
};

attr.$observe('min', function(val) {
Expand All @@ -1616,8 +1616,8 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
}

if (isDefined(attr.max) || attr.ngMax) {
ctrl.$validators.max = function(value) {
return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
ctrl.$validators.max = function(modelValue, viewValue) {
return ctrl.$isEmpty(viewValue) || isUndefined(maxVal) || viewValue <= maxVal;
};

attr.$observe('max', function(val) {
Expand Down
98 changes: 98 additions & 0 deletions test/ng/directive/inputSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2284,6 +2284,15 @@ describe('input', function() {

describe('number', function() {

// Helpers for min / max tests
var subtract = function(value) {
return value - 5;
};

var add = function(value) {
return value + 5;
};

it('should reset the model if view is invalid', function() {
var inputElm = helper.compileInput('<input type="number" ng-model="age"/>');

Expand Down Expand Up @@ -2465,6 +2474,29 @@ describe('input', function() {
expect($rootScope.form.alias.$error.min).toBeFalsy();
});


it('should validate against the viewValue', function() {
var inputElm = helper.compileInput(
'<input type="number" ng-model-options="{allowInvalid: true}" ng-model="value" name="alias" min="10" />');

var ngModelCtrl = inputElm.controller('ngModel');
ngModelCtrl.$parsers.push(subtract);

helper.changeInputValueTo('10');
expect(inputElm).toBeValid();
expect($rootScope.value).toBe(5);
expect($rootScope.form.alias.$error.min).toBeFalsy();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also have tests that check that we do get an error if the viewValue is bad but the modelValue is good?


ngModelCtrl.$parsers.pop();
ngModelCtrl.$parsers.push(add);

helper.changeInputValueTo('5');
expect(inputElm).toBeInvalid();
expect($rootScope.form.alias.$error.min).toBeTruthy();
expect($rootScope.value).toBe(10);
});


it('should validate even if min value changes on-the-fly', function() {
$rootScope.min = undefined;
var inputElm = helper.compileInput('<input type="number" ng-model="value" name="alias" min="{{min}}" />');
Expand Down Expand Up @@ -2511,6 +2543,28 @@ describe('input', function() {
expect($rootScope.form.alias.$error.min).toBeFalsy();
});


it('should validate against the viewValue', function() {
var inputElm = helper.compileInput(
'<input type="number" ng-model-options="{allowInvalid: true}" ng-model="value" name="alias" ng-min="10" />');
var ngModelCtrl = inputElm.controller('ngModel');
ngModelCtrl.$parsers.push(subtract);

helper.changeInputValueTo('10');
expect(inputElm).toBeValid();
expect($rootScope.value).toBe(5);
expect($rootScope.form.alias.$error.min).toBeFalsy();

ngModelCtrl.$parsers.pop();
ngModelCtrl.$parsers.push(add);

helper.changeInputValueTo('5');
expect(inputElm).toBeInvalid();
expect($rootScope.form.alias.$error.min).toBeTruthy();
expect($rootScope.value).toBe(10);
});


it('should validate even if the ngMin value changes on-the-fly', function() {
$rootScope.min = undefined;
var inputElm = helper.compileInput('<input type="number" ng-model="value" name="alias" ng-min="min" />');
Expand Down Expand Up @@ -2558,6 +2612,28 @@ describe('input', function() {
expect($rootScope.form.alias.$error.max).toBeFalsy();
});


it('should validate against the viewValue', function() {
var inputElm = helper.compileInput('<input type="number"' +
'ng-model-options="{allowInvalid: true}" ng-model="value" name="alias" max="10" />');
var ngModelCtrl = inputElm.controller('ngModel');
ngModelCtrl.$parsers.push(add);

helper.changeInputValueTo('10');
expect(inputElm).toBeValid();
expect($rootScope.value).toBe(15);
expect($rootScope.form.alias.$error.max).toBeFalsy();

ngModelCtrl.$parsers.pop();
ngModelCtrl.$parsers.push(subtract);

helper.changeInputValueTo('15');
expect(inputElm).toBeInvalid();
expect($rootScope.form.alias.$error.max).toBeTruthy();
expect($rootScope.value).toBe(10);
});


it('should validate even if max value changes on-the-fly', function() {
$rootScope.max = undefined;
var inputElm = helper.compileInput('<input type="number" ng-model="value" name="alias" max="{{max}}" />');
Expand Down Expand Up @@ -2604,6 +2680,28 @@ describe('input', function() {
expect($rootScope.form.alias.$error.max).toBeFalsy();
});


it('should validate against the viewValue', function() {
var inputElm = helper.compileInput('<input type="number"' +
'ng-model-options="{allowInvalid: true}" ng-model="value" name="alias" ng-max="10" />');
var ngModelCtrl = inputElm.controller('ngModel');
ngModelCtrl.$parsers.push(add);

helper.changeInputValueTo('10');
expect(inputElm).toBeValid();
expect($rootScope.value).toBe(15);
expect($rootScope.form.alias.$error.max).toBeFalsy();

ngModelCtrl.$parsers.pop();
ngModelCtrl.$parsers.push(subtract);

helper.changeInputValueTo('15');
expect(inputElm).toBeInvalid();
expect($rootScope.form.alias.$error.max).toBeTruthy();
expect($rootScope.value).toBe(10);
});


it('should validate even if the ngMax value changes on-the-fly', function() {
$rootScope.max = undefined;
var inputElm = helper.compileInput('<input type="number" ng-model="value" name="alias" ng-max="max" />');
Expand Down