fix(forms): emit value changes after errors and status are set

vsavkin · vsavkin · commit b716d2335ba8 · 2015-10-14T19:36:43.000Z
Closes #4714
diff --git a/modules/angular2/src/core/forms/model.ts b/modules/angular2/src/core/forms/model.ts
@@ -107,13 +107,13 @@ export class AbstractControl {
 
     this._updateValue();
 
+    this._errors = this.validator(this);
+    this._status = isPresent(this._errors) ? INVALID : VALID;
+
     if (emitEvent) {
       ObservableWrapper.callNext(this._valueChanges, this._value);
     }
 
-    this._errors = this.validator(this);
-    this._status = isPresent(this._errors) ? INVALID : VALID;
-
     if (isPresent(this._parent) && !onlySelf) {
       this._parent.updateValueAndValidity({onlySelf: onlySelf, emitEvent: emitEvent});
     }
diff --git a/modules/angular2/test/core/forms/model_spec.ts b/modules/angular2/test/core/forms/model_spec.ts
@@ -15,6 +15,7 @@ import {
 } from 'angular2/testing_internal';
 import {ControlGroup, Control, ControlArray, Validators} from 'angular2/core';
 import {ObservableWrapper} from 'angular2/src/core/facade/async';
+import {IS_DART} from '../../platform';
 
 export function main() {
   describe("Form Model", () => {
@@ -116,7 +117,7 @@ export function main() {
       describe("valueChanges", () => {
         var c;
 
-        beforeEach(() => { c = new Control("old"); });
+        beforeEach(() => { c = new Control("old", Validators.required); });
 
         it("should fire an event after the value has been updated",
            inject([AsyncTestCompleter], (async) => {
@@ -128,6 +129,19 @@ export function main() {
              c.updateValue("new");
            }));
 
+        // 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.toRx().subscribe(value => {
+                 expect(c.valid).toEqual(false);
+                 expect(c.errors).toEqual({"required": true});
+                 async.done();
+               });
+               c.updateValue("");
+             }));
+        }
+
         it("should return a cold observable", inject([AsyncTestCompleter], (async) => {
              c.updateValue("will be ignored");
              ObservableWrapper.subscribe(c.valueChanges, (value) => {

Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,13 @@ export class AbstractControl {`
`107`	`107`
`108`	`108`	`this._updateValue();`
`109`	`109`
	`110`	`+ this._errors = this.validator(this);`
	`111`	`+ this._status = isPresent(this._errors) ? INVALID : VALID;`
	`112`	`+`
`110`	`113`	`if (emitEvent) {`
`111`	`114`	`ObservableWrapper.callNext(this._valueChanges, this._value);`
`112`	`115`	`}`
`113`	`116`
`114`		`- this._errors = this.validator(this);`
`115`		`- this._status = isPresent(this._errors) ? INVALID : VALID;`
`116`		`-`
`117`	`117`	`if (isPresent(this._parent) && !onlySelf) {`
`118`	`118`	`this._parent.updateValueAndValidity({onlySelf: onlySelf, emitEvent: emitEvent});`
`119`	`119`	`}`