diff --git a/modules/@angular/common/test/forms/directives_spec.ts b/modules/@angular/common/test/forms/directives_spec.ts index 4db365af66..53e904ded5 100644 --- a/modules/@angular/common/test/forms/directives_spec.ts +++ b/modules/@angular/common/test/forms/directives_spec.ts @@ -44,10 +44,10 @@ import {PromiseWrapper} from '../../src/facade/promise'; import {SimpleChange} from '@angular/core/src/change_detection'; class DummyControlValueAccessor implements ControlValueAccessor { - writtenValue; + writtenValue: any /** TODO #9100 */; - registerOnChange(fn) {} - registerOnTouched(fn) {} + registerOnChange(fn: any /** TODO #9100 */) {} + registerOnTouched(fn: any /** TODO #9100 */) {} writeValue(obj: any): void { this.writtenValue = obj; } } @@ -56,8 +56,8 @@ class CustomValidatorDirective implements Validator { validate(c: Control): {[key: string]: any} { return {"custom": true}; } } -function asyncValidator(expected, timeout = 0) { - return (c) => { +function asyncValidator(expected: any /** TODO #9100 */, timeout = 0) { + return (c: any /** TODO #9100 */) => { var completer = PromiseWrapper.completer(); var res = c.value != expected ? {"async": true} : null; if (timeout == 0) { @@ -120,14 +120,14 @@ export function main() { describe("composeValidators", () => { it("should compose functions", () => { - var dummy1 = (_) => ({"dummy1": true}); - var dummy2 = (_) => ({"dummy2": true}); + var dummy1 = (_: any /** TODO #9100 */) => ({"dummy1": true}); + var dummy2 = (_: any /** TODO #9100 */) => ({"dummy2": true}); var v = composeValidators([dummy1, dummy2]); expect(v(new Control(""))).toEqual({"dummy1": true, "dummy2": true}); }); it("should compose validator directives", () => { - var dummy1 = (_) => ({"dummy1": true}); + var dummy1 = (_: any /** TODO #9100 */) => ({"dummy1": true}); var v = composeValidators([dummy1, new CustomValidatorDirective()]); expect(v(new Control(""))).toEqual({"dummy1": true, "custom": true}); }); @@ -135,9 +135,9 @@ export function main() { }); describe("NgFormModel", () => { - var form; + var form: any /** TODO #9100 */; var formModel: ControlGroup; - var loginControlDir; + var loginControlDir: any /** TODO #9100 */; beforeEach(() => { form = new NgFormModel([], []); @@ -215,7 +215,7 @@ export function main() { }); describe("addControlGroup", () => { - var matchingPasswordsValidator = (g) => { + var matchingPasswordsValidator = (g: any /** TODO #9100 */) => { if (g.controls["password"].value != g.controls["passwordConfirm"].value) { return {"differentPasswords": true}; } else { @@ -268,7 +268,7 @@ export function main() { }); it("should set up a sync validator", () => { - var formValidator = (c) => ({"custom": true}); + var formValidator = (c: any /** TODO #9100 */) => ({"custom": true}); var f = new NgFormModel([formValidator], []); f.form = formModel; f.ngOnChanges({"form": new SimpleChange(null, null)}); @@ -289,10 +289,10 @@ export function main() { }); describe("NgForm", () => { - var form; + var form: any /** TODO #9100 */; var formModel: ControlGroup; - var loginControlDir; - var personControlGroupDir; + var loginControlDir: any /** TODO #9100 */; + var personControlGroupDir: any /** TODO #9100 */; beforeEach(() => { form = new NgForm([], []); @@ -348,7 +348,7 @@ export function main() { }); it("should set up sync validator", fakeAsync(() => { - var formValidator = (c) => ({"custom": true}); + var formValidator = (c: any /** TODO #9100 */) => ({"custom": true}); var f = new NgForm([formValidator], []); tick(); @@ -366,8 +366,8 @@ export function main() { }); describe("NgControlGroup", () => { - var formModel; - var controlGroupDir; + var formModel: any /** TODO #9100 */; + var controlGroupDir: any /** TODO #9100 */; beforeEach(() => { formModel = new ControlGroup({"login": new Control(null)}); @@ -391,9 +391,9 @@ export function main() { }); describe("NgFormControl", () => { - var controlDir; - var control; - var checkProperties = function(control) { + var controlDir: any /** TODO #9100 */; + var control: any /** TODO #9100 */; + var checkProperties = function(control: any /** TODO #9100 */) { expect(controlDir.control).toBe(control); expect(controlDir.value).toBe(control.value); expect(controlDir.valid).toBe(control.valid); @@ -433,7 +433,7 @@ export function main() { }); describe("NgModel", () => { - var ngModel; + var ngModel: any /** TODO #9100 */; beforeEach(() => { ngModel = @@ -468,8 +468,8 @@ export function main() { }); describe("NgControlName", () => { - var formModel; - var controlNameDir; + var formModel: any /** TODO #9100 */; + var controlNameDir: any /** TODO #9100 */; beforeEach(() => { formModel = new Control("name"); diff --git a/modules/@angular/common/test/forms/form_builder_spec.ts b/modules/@angular/common/test/forms/form_builder_spec.ts index 1d697597f1..2b2d932232 100644 --- a/modules/@angular/common/test/forms/form_builder_spec.ts +++ b/modules/@angular/common/test/forms/form_builder_spec.ts @@ -12,11 +12,11 @@ import {Control, FormBuilder} from '@angular/common'; import {PromiseWrapper} from '../../src/facade/promise'; export function main() { - function syncValidator(_) { return null; } - function asyncValidator(_) { return PromiseWrapper.resolve(null); } + function syncValidator(_: any /** TODO #9100 */): any /** TODO #9100 */ { return null; } + function asyncValidator(_: any /** TODO #9100 */) { return PromiseWrapper.resolve(null); } describe("Form Builder", () => { - var b; + var b: any /** TODO #9100 */; beforeEach(() => { b = new FormBuilder(); }); diff --git a/modules/@angular/common/test/forms/integration_spec.ts b/modules/@angular/common/test/forms/integration_spec.ts index 90a18ca9fa..66200d83d2 100644 --- a/modules/@angular/common/test/forms/integration_spec.ts +++ b/modules/@angular/common/test/forms/integration_spec.ts @@ -41,7 +41,7 @@ export function main() { describe("integration tests", () => { it("should initialize DOM elements with the given form object", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -60,7 +60,7 @@ export function main() { })); it("should throw if a form isn't passed into ngFormModel", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -75,7 +75,7 @@ export function main() { })); it("should update the control group values on DOM change", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new ControlGroup({"login": new Control("oldValue")}); var t = `
@@ -98,7 +98,7 @@ export function main() { })); it("should ignore the change event for ", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new ControlGroup({"login": new Control("oldValue")}); var t = `
@@ -194,7 +194,7 @@ export function main() { }))); it("should work with single controls", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var control = new Control("loginValue"); var t = `
`; @@ -217,7 +217,7 @@ export function main() { })); it("should update DOM elements when rebinding the control group", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -240,7 +240,7 @@ export function main() { })); it("should update DOM elements when updating the value of a control", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var login = new Control("oldValue"); var form = new ControlGroup({"login": login}); @@ -265,7 +265,7 @@ export function main() { })); it("should mark controls as touched after interacting with the DOM control", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var login = new Control("oldValue"); var form = new ControlGroup({"login": login}); @@ -292,7 +292,7 @@ export function main() { describe("different control types", () => { it("should support ", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -316,7 +316,7 @@ export function main() { })); it("should support without type", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -339,7 +339,7 @@ export function main() { })); it("should support
`; @@ -363,7 +363,7 @@ export function main() { })); it("should support ", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -388,7 +388,7 @@ export function main() { })); it("should support ", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -412,7 +412,7 @@ export function main() { })); it("should support when value is cleared in the UI", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -442,7 +442,7 @@ export function main() { it("should support when value is cleared programmatically", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new ControlGroup({"num": new Control(10)}); var t = `
@@ -463,7 +463,7 @@ export function main() { })); it("should support ", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
@@ -494,7 +494,7 @@ export function main() { describe("should support @@ -516,7 +516,7 @@ export function main() { it("with basic selection and value bindings", inject([TestComponentBuilder, AsyncTestCompleter], - (tcb: TestComponentBuilder, async) => { + (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = ` @@ -582,7 +582,7 @@ export function main() {
`; - var fixture; + var fixture: any /** TODO #9100 */; tcb.overrideTemplate(MyComp8, t) .createAsync(MyComp8) .then((compFixture) => fixture = compFixture); @@ -601,7 +601,7 @@ export function main() { it("with option values that are objects", inject([TestComponentBuilder, AsyncTestCompleter], - (tcb: TestComponentBuilder, async) => { + (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
@@ -665,7 +665,7 @@ export function main() { it("when new options are added (selection through the UI)", inject([TestComponentBuilder, AsyncTestCompleter], - (tcb: TestComponentBuilder, async) => { + (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
@@ -726,7 +726,7 @@ export function main() { it("when option values change identity while tracking by index", inject([TestComponentBuilder, AsyncTestCompleter], - (tcb: TestComponentBuilder, async) => { + (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
@@ -789,7 +789,7 @@ export function main() { it("when option values have same content, but different identities", inject([TestComponentBuilder, AsyncTestCompleter], - (tcb: TestComponentBuilder, async) => { + (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -842,7 +842,7 @@ export function main() { })); it("should support custom value accessors on non builtin input elements that fire a change event without a 'target' property", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; @@ -870,7 +870,7 @@ export function main() { describe("validations", () => { it("should use sync validators defined in html", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new ControlGroup( {"login": new Control(""), "min": new Control(""), "max": new Control("")}); @@ -924,7 +924,7 @@ export function main() {
`; - var rootTC; + var rootTC: any /** TODO #9100 */; tcb.overrideTemplate(MyComp8, t).createAsync(MyComp8).then((root) => rootTC = root); tick(); @@ -946,7 +946,7 @@ export function main() { }))); it("should use sync validators defined in the model", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new ControlGroup({"login": new Control("aa", Validators.required)}); var t = `
@@ -979,7 +979,7 @@ export function main() {
`; - var fixture; + var fixture: any /** TODO #9100 */; tcb.overrideTemplate(MyComp8, t).createAsync(MyComp8).then((root) => fixture = root); tick(); @@ -1007,7 +1007,7 @@ export function main() { describe("nested forms", () => { it("should init DOM with the given form object", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new ControlGroup({"nested": new ControlGroup({"login": new Control("value")})}); @@ -1030,7 +1030,7 @@ export function main() { })); it("should update the control group values on DOM change", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new ControlGroup({"nested": new ControlGroup({"login": new Control("value")})}); @@ -1141,7 +1141,7 @@ export function main() { }))); it("should not create a template-driven form when ngNoForm is used", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = ` `; @@ -1322,7 +1322,7 @@ export function main() { describe("setting status classes", () => { it("should work with single fields", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new Control("", Validators.required); var t = `
`; @@ -1353,7 +1353,7 @@ export function main() { })); it("should work with complex model-driven forms", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var form = new ControlGroup({"name": new Control("", Validators.required)}); var t = `
`; @@ -1384,7 +1384,7 @@ export function main() { })); it("should work with ngModel", - inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { + inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async: any /** TODO #9100 */) => { var t = `
`; tcb.overrideTemplate(MyComp8, t) @@ -1486,17 +1486,17 @@ export function main() { host: {'(input)': 'handleOnInput($event.target.value)', '[value]': 'value'} }) class WrappedValue implements ControlValueAccessor { - value; + value: any /** TODO #9100 */; onChange: Function; constructor(cd: NgControl) { cd.valueAccessor = this; } - writeValue(value) { this.value = `!${value}!`; } + writeValue(value: any /** TODO #9100 */) { this.value = `!${value}!`; } - registerOnChange(fn) { this.onChange = fn; } - registerOnTouched(fn) {} + registerOnChange(fn: any /** TODO #9100 */) { this.onChange = fn; } + registerOnTouched(fn: any /** TODO #9100 */) {} - handleOnInput(value) { this.onChange(value.substring(1, value.length - 1)); } + handleOnInput(value: any /** TODO #9100 */) { this.onChange(value.substring(1, value.length - 1)); } } @Component({selector: "my-input", template: ''}) @@ -1506,11 +1506,11 @@ class MyInput implements ControlValueAccessor { constructor(cd: NgControl) { cd.valueAccessor = this; } - writeValue(value) { this.value = `!${value}!`; } + writeValue(value: any /** TODO #9100 */) { this.value = `!${value}!`; } - registerOnChange(fn) { ObservableWrapper.subscribe(this.onInput, fn); } + registerOnChange(fn: any /** TODO #9100 */) { ObservableWrapper.subscribe(this.onInput, fn); } - registerOnTouched(fn) {} + registerOnTouched(fn: any /** TODO #9100 */) {} dispatchChangeEvent() { ObservableWrapper.callEmit(this.onInput, this.value.substring(1, this.value.length - 1)); @@ -1518,7 +1518,7 @@ class MyInput implements ControlValueAccessor { } function uniqLoginAsyncValidator(expectedValue: string) { - return (c) => { + return (c: any /** TODO #9100 */) => { var completer = PromiseWrapper.completer(); var res = (c.value == expectedValue) ? null : {"uniqLogin": true}; completer.resolve(res); @@ -1550,9 +1550,9 @@ class LoginIsEmptyValidator { ] }) class UniqLoginValidator implements Validator { - @Input('uniq-login-validator') expected; + @Input('uniq-login-validator') expected: any /** TODO #9100 */; - validate(c) { return uniqLoginAsyncValidator(this.expected)(c); } + validate(c: any /** TODO #9100 */) { return uniqLoginAsyncValidator(this.expected)(c); } } @Component({ @@ -1577,7 +1577,7 @@ class MyComp8 { customTrackBy(index: number, obj: any): number { return index; }; } -function sortedClassList(el) { +function sortedClassList(el: any /** TODO #9100 */) { var l = getDOM().classList(el); ListWrapper.sort(l); return l; diff --git a/modules/@angular/common/test/forms/model_spec.ts b/modules/@angular/common/test/forms/model_spec.ts index 4d20589b89..1133e1c178 100644 --- a/modules/@angular/common/test/forms/model_spec.ts +++ b/modules/@angular/common/test/forms/model_spec.ts @@ -17,10 +17,10 @@ import {PromiseWrapper} from '../../src/facade/promise'; import {TimerWrapper, ObservableWrapper, EventEmitter} from '../../src/facade/async'; export function main() { - function asyncValidator(expected, timeouts = /*@ts2dart_const*/ {}) { - return (c) => { + function asyncValidator(expected: any /** TODO #9100 */, timeouts = /*@ts2dart_const*/ {}) { + return (c: any /** TODO #9100 */) => { var completer = PromiseWrapper.completer(); - var t = isPresent(timeouts[c.value]) ? timeouts[c.value] : 0; + var t = isPresent((timeouts as any /** TODO #9100 */)[c.value]) ? (timeouts as any /** TODO #9100 */)[c.value] : 0; var res = c.value != expected ? {"async": true} : null; if (t == 0) { @@ -33,7 +33,7 @@ export function main() { }; } - function asyncValidatorReturningObservable(c) { + function asyncValidatorReturningObservable(c: any /** TODO #9100 */) { var e = new EventEmitter(); PromiseWrapper.scheduleMicrotask(() => ObservableWrapper.callEmit(e, {"async": true})); return e; @@ -140,7 +140,7 @@ export function main() { }); describe("updateValue", () => { - var g, c; + var g: any /** TODO #9100 */, c: any /** TODO #9100 */; beforeEach(() => { c = new Control("oldValue"); g = new ControlGroup({"one": c}); @@ -152,8 +152,8 @@ export function main() { }); it("should invoke ngOnChanges if it is present", () => { - var ngOnChanges; - c.registerOnChange((v) => ngOnChanges = ["invoked", v]); + var ngOnChanges: any /** TODO #9100 */; + c.registerOnChange((v: any /** TODO #9100 */) => ngOnChanges = ["invoked", v]); c.updateValue("newValue"); @@ -161,8 +161,8 @@ export function main() { }); it("should not invoke on change when explicitly specified", () => { - var onChange = null; - c.registerOnChange((v) => onChange = ["invoked", v]); + var onChange: any /** TODO #9100 */ = null; + c.registerOnChange((v: any /** TODO #9100 */) => onChange = ["invoked", v]); c.updateValue("newValue", {emitModelToViewChange: false}); @@ -197,12 +197,12 @@ export function main() { }); describe("valueChanges & statusChanges", () => { - var c; + var c: any /** TODO #9100 */; beforeEach(() => { c = new Control("old", Validators.required); }); it("should fire an event after the value has been updated", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { ObservableWrapper.subscribe(c.valueChanges, (value) => { expect(c.value).toEqual('new'); expect(value).toEqual('new'); @@ -224,7 +224,7 @@ export function main() { it("should fire an event after the status has been updated to pending", fakeAsync(() => { var c = new Control("old", Validators.required, asyncValidator("expected")); - var log = []; + var log: any[] /** TODO #9100 */ = []; ObservableWrapper.subscribe(c.valueChanges, (value) => log.push(`value: '${value}'`)); ObservableWrapper.subscribe(c.statusChanges, (status) => log.push(`status: '${status}'`)); @@ -253,8 +253,8 @@ export function main() { // TODO: remove the if statement after making observable delivery sync if (!IS_DART) { it("should update set errors and status before emitting an event", - inject([AsyncTestCompleter], (async) => { - c.valueChanges.subscribe(value => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { + c.valueChanges.subscribe((value: any /** TODO #9100 */) => { expect(c.valid).toEqual(false); expect(c.errors).toEqual({"required": true}); async.done(); @@ -263,7 +263,7 @@ export function main() { })); } - it("should return a cold observable", inject([AsyncTestCompleter], (async) => { + it("should return a cold observable", inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { c.updateValue("will be ignored"); ObservableWrapper.subscribe(c.valueChanges, (value) => { expect(value).toEqual('new'); @@ -380,7 +380,7 @@ export function main() { describe("errors", () => { it("should run the validator when the value changes", () => { - var simpleValidator = (c) => + var simpleValidator = (c: any /** TODO #9100 */) => c.controls["one"].value != "correct" ? {"broken": true} : null; var c = new Control(null); @@ -399,7 +399,7 @@ export function main() { }); describe("dirty", () => { - var c, g; + var c: any /** TODO #9100 */, g: any /** TODO #9100 */; beforeEach(() => { c = new Control('value'); @@ -417,7 +417,7 @@ export function main() { describe("optional components", () => { describe("contains", () => { - var group; + var group: any /** TODO #9100 */; beforeEach(() => { group = new ControlGroup( @@ -473,7 +473,7 @@ export function main() { }); describe("valueChanges", () => { - var g, c1, c2; + var g: any /** TODO #9100 */, c1: any /** TODO #9100 */, c2: any /** TODO #9100 */; beforeEach(() => { c1 = new Control("old1"); @@ -482,7 +482,7 @@ export function main() { }); it("should fire an event after the value has been updated", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { ObservableWrapper.subscribe(g.valueChanges, (value) => { expect(g.value).toEqual({'one': 'new1', 'two': 'old2'}); expect(value).toEqual({'one': 'new1', 'two': 'old2'}); @@ -492,7 +492,7 @@ export function main() { })); it("should fire an event after the control's observable fired an event", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { var controlCallbackIsCalled = false; ObservableWrapper.subscribe(c1.valueChanges, @@ -507,7 +507,7 @@ export function main() { })); it("should fire an event when a control is excluded", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { ObservableWrapper.subscribe(g.valueChanges, (value) => { expect(value).toEqual({'one': 'old1'}); async.done(); @@ -517,7 +517,7 @@ export function main() { })); it("should fire an event when a control is included", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { g.exclude("two"); ObservableWrapper.subscribe(g.valueChanges, (value) => { @@ -529,8 +529,8 @@ export function main() { })); it("should fire an event every time a control is updated", - inject([AsyncTestCompleter], (async) => { - var loggedValues = []; + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { + var loggedValues: any[] /** TODO #9100 */ = []; ObservableWrapper.subscribe(g.valueChanges, (value) => { loggedValues.push(value); @@ -547,7 +547,7 @@ export function main() { })); xit("should not fire an event when an excluded control is updated", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { // hard to test without hacking zones })); }); @@ -609,7 +609,7 @@ export function main() { describe("ControlArray", () => { describe("adding/removing", () => { var a: ControlArray; - var c1, c2, c3; + var c1: any /** TODO #9100 */, c2: any /** TODO #9100 */, c3: any /** TODO #9100 */; beforeEach(() => { a = new ControlArray([]); @@ -658,7 +658,7 @@ export function main() { describe("errors", () => { it("should run the validator when the value changes", () => { - var simpleValidator = (c) => c.controls[0].value != "correct" ? {"broken": true} : null; + var simpleValidator = (c: any /** TODO #9100 */) => c.controls[0].value != "correct" ? {"broken": true} : null; var c = new Control(null); var g = new ControlArray([c], simpleValidator); @@ -725,7 +725,7 @@ export function main() { describe("valueChanges", () => { var a: ControlArray; - var c1, c2; + var c1: any /** TODO #9100 */, c2: any /** TODO #9100 */; beforeEach(() => { c1 = new Control("old1"); @@ -734,7 +734,7 @@ export function main() { }); it("should fire an event after the value has been updated", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { ObservableWrapper.subscribe(a.valueChanges, (value) => { expect(a.value).toEqual(['new1', 'old2']); expect(value).toEqual(['new1', 'old2']); @@ -744,7 +744,7 @@ export function main() { })); it("should fire an event after the control's observable fired an event", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { var controlCallbackIsCalled = false; ObservableWrapper.subscribe(c1.valueChanges, @@ -759,7 +759,7 @@ export function main() { })); it("should fire an event when a control is removed", - inject([AsyncTestCompleter], (async) => { + inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { ObservableWrapper.subscribe(a.valueChanges, (value) => { expect(value).toEqual(['old1']); async.done(); @@ -768,7 +768,7 @@ export function main() { a.removeAt(1); })); - it("should fire an event when a control is added", inject([AsyncTestCompleter], (async) => { + it("should fire an event when a control is added", inject([AsyncTestCompleter], (async: any /** TODO #9100 */) => { a.removeAt(1); ObservableWrapper.subscribe(a.valueChanges, (value) => { diff --git a/modules/@angular/common/test/forms/validators_spec.ts b/modules/@angular/common/test/forms/validators_spec.ts index 0aa5c89b82..33ba2c0cfd 100644 --- a/modules/@angular/common/test/forms/validators_spec.ts +++ b/modules/@angular/common/test/forms/validators_spec.ts @@ -17,7 +17,7 @@ export function main() { function validator(key: string, error: any) { return function(c: AbstractControl) { var r = {}; - r[key] = error; + (r as any /** TODO #9100 */)[key] = error; return r; } } @@ -111,8 +111,8 @@ export function main() { }); describe("composeAsync", () => { - function asyncValidator(expected, response) { - return (c) => { + function asyncValidator(expected: any /** TODO #9100 */, response: any /** TODO #9100 */) { + return (c: any /** TODO #9100 */) => { var emitter = new EventEmitter(); var res = c.value != expected ? response : null; @@ -136,7 +136,7 @@ export function main() { asyncValidator("expected", {"two": true}) ]); - var value = null; + var value: any /** TODO #9100 */ = null; (>c(new Control("invalid"))).then(v => value = v); tick(1); @@ -147,7 +147,7 @@ export function main() { it("should return null when no errors", fakeAsync(() => { var c = Validators.composeAsync([asyncValidator("expected", {"one": true})]); - var value = null; + var value: any /** TODO #9100 */ = null; (>c(new Control("expected"))).then(v => value = v); tick(1); @@ -158,7 +158,7 @@ export function main() { it("should ignore nulls", fakeAsync(() => { var c = Validators.composeAsync([asyncValidator("expected", {"one": true}), null]); - var value = null; + var value: any /** TODO #9100 */ = null; (>c(new Control("invalid"))).then(v => value = v); tick(1);