diff --git a/terminus-ui/input/src/input.component.html b/terminus-ui/input/src/input.component.html index 93ef4703f..d39e7bdde 100644 --- a/terminus-ui/input/src/input.component.html +++ b/terminus-ui/input/src/input.component.html @@ -94,7 +94,7 @@ [attr.autocapitalize]="autocapitalize ? 'on' : 'off'" [attr.autocomplete]="autocomplete" [attr.autofocus]="isFocused ? '' : null" - [attr.disabled]="shouldBeDisabled ? '' : null" + [disabled]="shouldBeDisabled" [attr.name]="name" [attr.id]="id" [readonly]="readOnly" @@ -119,7 +119,7 @@ [attr.autocapitalize]="autocapitalize ? 'on' : 'off'" [attr.autocomplete]="autocomplete" [attr.autofocus]="isFocused ? '' : null" - [attr.disabled]="shouldBeDisabled ? '' : null" + [disabled]="shouldBeDisabled" [attr.name]="name" [attr.id]="id" [readonly]="readOnly" @@ -148,7 +148,7 @@ [attr.autocapitalize]="autocapitalize ? 'on' : 'off'" [attr.autocomplete]="autocomplete" [attr.autofocus]="isFocused ? '' : null" - [attr.disabled]="shouldBeDisabled ? '' : null" + [disabled]="shouldBeDisabled" [attr.name]="name" [attr.id]="id" [attr.rows]="textareaRows" diff --git a/terminus-ui/input/src/input.component.spec.ts b/terminus-ui/input/src/input.component.spec.ts index 7b9ed13a7..3f38fcceb 100644 --- a/terminus-ui/input/src/input.component.spec.ts +++ b/terminus-ui/input/src/input.component.spec.ts @@ -197,17 +197,18 @@ describe(`TsInputComponent`, function() { }); - test(`should set the disabled flag when appropriate`, () => { + test(`should set the disabled flag when appropriate`, fakeAsync(() => { const fixture = createComponent(TestComponents.AttrDisabled); fixture.detectChanges(); - const el = getInputElement(fixture); - expect(el.getAttribute('disabled')).toEqual(null); + const inputElement = getInputElement(fixture); + expect(inputElement.disabled).toEqual(false); fixture.componentInstance.disabled = true; fixture.detectChanges(); + tick(); - expect(el.getAttribute('disabled')).toEqual(''); - }); + expect(inputElement.disabled).toEqual(true); + })); test(`should set autofocus`, () => {