cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(forms): add support for standalone ngModel dirs inside forms

Browse Source 
Closes #9230
This commit is contained in:
Kara Erickson
2016-06-23 09:55:26 -07:00
parent 826f89f862
commit 6edf0474cc
6 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
modules/@angular/forms/test/integration_spec.ts
View File

@ -1371,7 +1371,7 @@ export function main() {
})));
it('should throw if ngModel has a parent form but no name attr',
it('should throw if ngModel has a parent form but no name attr or standalone label',
inject(
[TestComponentBuilder, AsyncTestCompleter],
(tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
@ -1384,11 +1384,29 @@ export function main() {
.createAsync(MyComp8)
.then((fixture) => {
expect(() => fixture.detectChanges())
.toThrowError(new RegExp(`Name attribute must be set`));
.toThrowError(new RegExp(`name attribute must be set`));
async.done();
});
}));
it('should not throw if ngModel has a parent form, no name attr, and a standalone label',
inject(
[TestComponentBuilder, AsyncTestCompleter],
(tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
const t = `<form>
<input [(ngModel)]="name" [ngModelOptions]="{standalone: true}">
</form>`;
tcb.overrideTemplate(MyComp8, t)
.overrideProviders(MyComp8, providerArr)
.createAsync(MyComp8)
.then((fixture) => {
expect(() => fixture.detectChanges()).not.toThrow();
async.done();
});
}));
it('should override name attribute with ngModelOptions name if provided',
fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
const t = `
@ -1407,6 +1425,29 @@ export function main() {
expect(form.value).toEqual({two: 'some data'});
})));
it('should not register standalone ngModels with parent form',
fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
const t = `
<form>
<input name="one" [(ngModel)]="data">
<input [(ngModel)]="list" [ngModelOptions]="{standalone: true}">
</form>
`;
const fixture = tcb.overrideTemplate(MyComp8, t).createFakeAsync(MyComp8);
tick();
fixture.debugElement.componentInstance.data = 'some data';
fixture.debugElement.componentInstance.list = 'should not show';
fixture.detectChanges();
const form = fixture.debugElement.children[0].injector.get(NgForm);
const inputs = fixture.debugElement.queryAll(By.css('input'));
tick();
expect(form.value).toEqual({one: 'some data'});
expect(inputs[1].nativeElement.value).toEqual('should not show');
})));
it('should support <type=radio>',
fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
const t = `<form>