diff --git a/package.json b/package.json index dbd65c7f3c9..70a1447ca8e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "test:ssr": "npm run build:ssr && jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.json", "test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2", "test:types": "tsc -p ./types/test/tsconfig.json", - "lint": "eslint src build test", + "lint": "eslint src scripts test", "flow": "flow check", "sauce": "karma start test/unit/karma.sauce.config.js", "bench:ssr": "npm run build:ssr && node benchmarks/ssr/renderToString.js && node benchmarks/ssr/renderToStream.js", diff --git a/test/unit/modules/compiler/compiler-options.spec.js b/test/unit/modules/compiler/compiler-options.spec.js index c7a9202cd2e..c694807dc8d 100644 --- a/test/unit/modules/compiler/compiler-options.spec.js +++ b/test/unit/modules/compiler/compiler-options.spec.js @@ -9,58 +9,58 @@ describe('compile options', () => { `, { - directives: { - validate (el, dir) { - if (dir.name === 'validate' && dir.arg) { - el.validate = { - field: dir.arg, - groups: dir.modifiers ? Object.keys(dir.modifiers) : [] - } + directives: { + validate (el, dir) { + if (dir.name === 'validate' && dir.arg) { + el.validate = { + field: dir.arg, + groups: dir.modifiers ? Object.keys(dir.modifiers) : [] } } - }, - modules: [{ - transformNode (el) { - el.validators = el.validators || [] - const validators = ['required', 'min', 'max', 'pattern', 'maxlength', 'minlength'] - validators.forEach(name => { - const rule = getAndRemoveAttr(el, name) - if (rule !== undefined) { - el.validators.push({ name, rule }) - } - }) - }, - genData (el) { - let data = '' - if (el.validate) { - data += `validate:${JSON.stringify(el.validate)},` - } - if (el.validators) { - data += `validators:${JSON.stringify(el.validators)},` - } - return data - }, - transformCode (el, code) { - // check - if (!el.validate || !el.validators) { - return code + } + }, + modules: [{ + transformNode (el) { + el.validators = el.validators || [] + const validators = ['required', 'min', 'max', 'pattern', 'maxlength', 'minlength'] + validators.forEach(name => { + const rule = getAndRemoveAttr(el, name) + if (rule !== undefined) { + el.validators.push({ name, rule }) } - // setup validation result props - const result = { dirty: false } // define something other prop - el.validators.forEach(validator => { - result[validator.name] = null - }) - // generate code - return `_c('validate',{props:{ - field:${JSON.stringify(el.validate.field)}, - groups:${JSON.stringify(el.validate.groups)}, - validators:${JSON.stringify(el.validators)}, - result:${JSON.stringify(result)}, - child:${code}} - })` + }) + }, + genData (el) { + let data = '' + if (el.validate) { + data += `validate:${JSON.stringify(el.validate)},` } - }] - }) + if (el.validators) { + data += `validators:${JSON.stringify(el.validators)},` + } + return data + }, + transformCode (el, code) { + // check + if (!el.validate || !el.validators) { + return code + } + // setup validation result props + const result = { dirty: false } // define something other prop + el.validators.forEach(validator => { + result[validator.name] = null + }) + // generate code + return `_c('validate',{props:{ + field:${JSON.stringify(el.validate.field)}, + groups:${JSON.stringify(el.validate.groups)}, + validators:${JSON.stringify(el.validators)}, + result:${JSON.stringify(result)}, + child:${code}} + })` + } + }] + }) expect(render).not.toBeUndefined() expect(staticRenderFns).toEqual([]) expect(errors).toEqual([])