This repository has been archived by the owner on Dec 25, 2017. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 431
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(messages): support messages validation property
- Loading branch information
Showing
6 changed files
with
211 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,3 +21,4 @@ require('./invalid') | |
| require('./event') | ||
| require('./group') | ||
| require('./multiple') | ||
| require('./messages') | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,158 @@ | ||
| import assert from 'power-assert' | ||
| import Vue from 'vue' | ||
| import { trigger } from '../../src/util' | ||
| import { empty, trigger } from '../../src/util' | ||
|
|
||
|
|
||
| describe('async', () => { | ||
| describe('messages', () => { | ||
| let el, vm | ||
|
|
||
| beforeEach((done) => { | ||
| el = document.createElement('div') | ||
| el.innerHTML = | ||
| '<validator :groups="[\'group1\', \'group2\']"name="validation">' + | ||
| '<input type="text" group="group1" v-validate:field1.pattern="field1">' + | ||
| '<input type="text" group="group1" v-validate:field2.required="field2">' + | ||
| '<input type="text" group="group2" v-validate:field3.max="field3">' + | ||
| '<input type="text" group="group2" v-validate:field4.maxlength="field4">' + | ||
| '<input type="text" group="group1" value="0" v-validate:field5.min="{ min: { rule :1, message: message1 } }">' + | ||
| '<input type="text" group="group2" value="h" v-validate:field6.minlength="{ minlength: { rule: 4, message: onMessage2 } }">' + | ||
| '<ul><li v-for="msg in $validation.messages">' + | ||
| '<div v-for="val in msg"><p>{{$key}}:{{val}}</p></div>' + | ||
| '</li></ul>' + | ||
| '</validator>' | ||
| vm = new Vue({ | ||
| el: el | ||
| el: el, | ||
| data: { | ||
| field1: { pattern: { rule: '/foo/', message: 'field1 pattern error' } }, | ||
| field2: { required: { rule: true, message: 'field2 required' } }, | ||
| field3: { max: { rule: 3, message: 'field3 big too' } }, | ||
| field4: { maxlength: { rule: 3, message: 'field4 long too' } } | ||
| }, | ||
| computed: { | ||
| message1 () { | ||
| return 'field5 small too' | ||
| } | ||
| }, | ||
| methods: { | ||
| onMessage2 () { | ||
| return 'field6 short too' | ||
| } | ||
| } | ||
| }) | ||
| done() | ||
| vm.$nextTick(done) | ||
| }) | ||
|
|
||
| it.skip('TODO', () => { | ||
| trigger(el, 'input') | ||
| assert(vm) | ||
| context('invalid', () => { | ||
| beforeEach((done) => { | ||
| let field3 = el.getElementsByTagName('input')[2] | ||
| field3.value = '4' | ||
| trigger(field3, 'input') | ||
| trigger(field3, 'blur') | ||
| vm.$nextTick(() => { | ||
| let field4 = el.getElementsByTagName('input')[3] | ||
| field4.value = 'hello' | ||
| trigger(field4, 'input') | ||
| trigger(field4, 'blur') | ||
| done() | ||
| }) | ||
| }) | ||
|
|
||
| describe('fields', () => { | ||
| it('should be kept messages', () => { | ||
| assert(vm.$validation.field1.messages.pattern === vm.field1.pattern.message) | ||
| assert(vm.$validation.field2.messages.required === vm.field2.required.message) | ||
| assert(vm.$validation.field3.messages.max === vm.field3.max.message) | ||
| assert(vm.$validation.field4.messages.maxlength === vm.field4.maxlength.message) | ||
| assert(vm.$validation.field5.messages.min === vm.message1) | ||
| assert(vm.$validation.field6.messages.minlength === vm.onMessage2()) | ||
| }) | ||
| }) | ||
|
|
||
| describe('top', () => { | ||
| it('should be kept messages', () => { | ||
| assert(vm.$validation.messages.field1.pattern === vm.field1.pattern.message) | ||
| assert(vm.$validation.messages.field2.required === vm.field2.required.message) | ||
| assert(vm.$validation.messages.field3.max === vm.field3.max.message) | ||
| assert(vm.$validation.messages.field4.maxlength === vm.field4.maxlength.message) | ||
| assert(vm.$validation.messages.field5.min === vm.message1) | ||
| assert(vm.$validation.messages.field6.minlength === vm.onMessage2()) | ||
| }) | ||
| }) | ||
|
|
||
| describe('group', () => { | ||
| it('should be kept messages', () => { | ||
| assert(vm.$validation.group1.messages.field1.pattern === vm.field1.pattern.message) | ||
| assert(vm.$validation.group1.messages.field2.required === vm.field2.required.message) | ||
| assert(vm.$validation.group1.messages.field5.min === vm.message1) | ||
| assert(vm.$validation.group2.messages.field3.max === vm.field3.max.message) | ||
| assert(vm.$validation.group2.messages.field4.maxlength === vm.field4.maxlength.message) | ||
| assert(vm.$validation.group2.messages.field6.minlength === vm.onMessage2()) | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
|
|
||
| context('valid', () => { | ||
| beforeEach((done) => { | ||
| let field1 = el.getElementsByTagName('input')[0] | ||
| field1.value = 'foo' | ||
| trigger(field1, 'input') | ||
| trigger(field1, 'blur') | ||
| vm.$nextTick(() => { | ||
| let field2 = el.getElementsByTagName('input')[1] | ||
| field2.value = 'hello' | ||
| trigger(field2, 'input') | ||
| trigger(field2, 'blur') | ||
| vm.$nextTick(() => { | ||
| let field3 = el.getElementsByTagName('input')[2] | ||
| field3.value = '1' | ||
| trigger(field3, 'input') | ||
| trigger(field3, 'blur') | ||
| vm.$nextTick(() => { | ||
| let field4 = el.getElementsByTagName('input')[3] | ||
| field4.value = 'hi' | ||
| trigger(field4, 'input') | ||
| trigger(field4, 'blur') | ||
| vm.$nextTick(() => { | ||
| let field5 = el.getElementsByTagName('input')[4] | ||
| field5.value = '10' | ||
| trigger(field5, 'input') | ||
| trigger(field5, 'blur') | ||
| vm.$nextTick(() => { | ||
| let field6 = el.getElementsByTagName('input')[5] | ||
| field6.value = 'hello' | ||
| trigger(field6, 'input') | ||
| trigger(field6, 'blur') | ||
| done() | ||
| }) | ||
| }) | ||
| }) | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
| describe('fields', () => { | ||
| it('should not be kept', () => { | ||
| assert(empty(vm.$validation.field1.messages)) | ||
| assert(empty(vm.$validation.field2.messages)) | ||
| assert(empty(vm.$validation.field3.messages)) | ||
| assert(empty(vm.$validation.field4.messages)) | ||
| assert(empty(vm.$validation.field5.messages)) | ||
| assert(empty(vm.$validation.field6.messages)) | ||
| }) | ||
| }) | ||
|
|
||
| describe('top', () => { | ||
| it('should not be kept', () => { | ||
| assert(empty(vm.$validation.messages)) | ||
| }) | ||
| }) | ||
|
|
||
| describe('group', () => { | ||
| it('should not be kept', () => { | ||
| assert(empty(vm.$validation.group1.messages)) | ||
| assert(empty(vm.$validation.group2.messages)) | ||
| }) | ||
| }) | ||
| }) | ||
| }) |