feat(async): support async validation error message

kazupon · Mar 6, 2016 · 7e65517 · 7e65517
1 parent b70de4d
commit 7e65517
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/validations/base.js b/src/validations/base.js
@@ -152,10 +152,13 @@ export default class BaseValidation {
 
       if (validator) {
         let value = this._getValue(this._el)
-        this._invokeValidator(this._vm, validator, value, descriptor.arg, (ret) => {
+        this._invokeValidator(this._vm, validator, value, descriptor.arg, (ret, err) => {
           if (!ret) {
             valid = false
-            if (msg) {
+            if (err) { // async error message
+              errors.push({ validator: name, message: err })
+              results[name] = err
+            } else if (msg) {
               let error = { validator: name }
               error.message = typeof msg === 'function' 
                 ? msg.call(this._vm, this.field, descriptor.arg) 
@@ -273,15 +276,17 @@ export default class BaseValidation {
           for (let i = 0, l = cbs.length; i < l; i++) {
             cbs[i](true)
           }
-        }, () => { // reject
-          cb(false)
+        }, (msg) => { // reject
+          cb(false, msg)
         })
       }
     } else if (isPromise(future)) { // promise
       future.then(() => { // resolve
         cb(true)
-      }).catch(() => { // reject
-        cb(false)
+      }, (msg) => { // reject
+        cb(false, msg)
+      }).catch((err) => {
+        cb(false, err.message)
       })
     } else { // sync
       cb(future)

diff --git a/test/specs/async.js b/test/specs/async.js
@@ -74,7 +74,7 @@ describe('async', () => {
             exist: (val) => {
               return (resolve, reject) => {
                 setTimeout(() => {
-                  reject()
+                  reject('already registration !!')
                 }, DELAY)
               }
             }
@@ -86,7 +86,7 @@ describe('async', () => {
       it('should be validated', (done) => {
         setTimeout(() => {
           // default
-          assert(vm.$validator1.username.exist === true)
+          assert(vm.$validator1.username.exist === 'already registration !!')
           assert(vm.$validator1.valid === false)
           assert(vm.$validator1.touched === false)
           assert(vm.$validator1.dirty === false)
@@ -98,7 +98,7 @@ describe('async', () => {
           trigger(input, 'input')
           trigger(input, 'blur')
           setTimeout(() => {
-            assert(vm.$validator1.username.exist === true)
+            assert(vm.$validator1.username.exist === 'already registration !!')
             assert(vm.$validator1.valid === false)
             assert(vm.$validator1.touched === true)
             assert(vm.$validator1.dirty === true)
@@ -173,7 +173,7 @@ describe('async', () => {
             exist: (val) => {
               return new Promise((resolve, reject) => {
                 setTimeout(() => {
-                  reject()
+                  reject('already registration !!')
                 }, DELAY)
               })
             }
@@ -185,7 +185,7 @@ describe('async', () => {
       it('should be validated', (done) => {
         setTimeout(() => {
           // default
-          assert(vm.$validator1.username.exist === true)
+          assert(vm.$validator1.username.exist === 'already registration !!')
           assert(vm.$validator1.valid === false)
           assert(vm.$validator1.touched === false)
           assert(vm.$validator1.dirty === false)
@@ -197,7 +197,7 @@ describe('async', () => {
           trigger(input, 'input')
           trigger(input, 'blur')
           setTimeout(() => {
-            assert(vm.$validator1.username.exist === true)
+            assert(vm.$validator1.username.exist === 'already registration !!')
             assert(vm.$validator1.valid === false)
             assert(vm.$validator1.touched === true)
             assert(vm.$validator1.dirty === true)