honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(forms): properly validate empty strings with patterns (#11450)

Browse Source
This commit is contained in:
Pawel Kozlowski 2016-10-05 01:14:23 +02:00 committed by Chuck Jazdzewski
parent 43923ffcf5
commit 4a57dcfd8d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/@angular/forms/src/validators.ts
View File

@ -96,7 +96,6 @@ export class Validators {
*/ */
static pattern(pattern: string): ValidatorFn { static pattern(pattern: string): ValidatorFn {
return (control: AbstractControl): {[key: string]: any} => { return (control: AbstractControl): {[key: string]: any} => {
if (isPresent(Validators.required(control))) return null;
let regex = new RegExp(`^${pattern}$`); let regex = new RegExp(`^${pattern}$`);
let v: string = control.value; let v: string = control.value;
return regex.test(v) ? null : return regex.test(v) ? null :

9
modules/@angular/forms/test/validators_spec.ts
View File

@ -91,6 +91,9 @@ export function main() {
it('should not error on null', it('should not error on null',
() => { expect(Validators.pattern('[a-zA-Z ]*')(new FormControl(null))).toEqual(null); }); () => { expect(Validators.pattern('[a-zA-Z ]*')(new FormControl(null))).toEqual(null); });
it('should not error on null value and "null" pattern',
() => { expect(Validators.pattern('null')(new FormControl(null))).toEqual(null); });
it('should not error on valid strings', () => { it('should not error on valid strings', () => {
expect(Validators.pattern('[a-zA-Z ]*')(new FormControl('aaAA'))).toEqual(null); expect(Validators.pattern('[a-zA-Z ]*')(new FormControl('aaAA'))).toEqual(null);
}); });
@ -100,6 +103,12 @@ export function main() {
'pattern': {'requiredPattern': '^[a-zA-Z ]*$', 'actualValue': 'aaa0'} 'pattern': {'requiredPattern': '^[a-zA-Z ]*$', 'actualValue': 'aaa0'}
}); });
}); });
it('should error on failure to match empty string', () => {
expect(Validators.pattern('[a-zA-Z]+')(new FormControl(''))).toEqual({
'pattern': {'requiredPattern': '^[a-zA-Z]+$', 'actualValue': ''}
});
});
}); });
describe('compose', () => { describe('compose', () => {