Commit0d3f96d

authored and

committed

add the package name custom validate to take effect (vuejs#276)

* add name validate function for user custom and add test for it* remove test only

1 parentf1c1db8 commit0d3f96dCopy full SHA for 0d3f96d

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,15 @@ function setDefault (opts, key, val) {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`functionsetValidateName(opts){`
`78`		`-opts.prompts.name.validate=function(name){`
	`78`	`+varname=opts.prompts.name`
	`79`	`+varcustomValidate=name.validate`
	`80`	`+name.validate=function(name){`
`79`	`81`	`varits=validateName(name)`
`80`	`82`	`if(!its.validForNewPackages){`
`81`	`83`	`varerrors=(its.errors\|\|[]).concat(its.warnings\|\|[])`
`82`	`84`	`return'Sorry, '+errors.join(' and ')+'.'`
`83`	`85`	`}`
	`86`	`+if(typeofcustomValidate==='function')returncustomValidate(name)`
`84`	`87`	`returntrue`
`85`	`88`	`}`
`86`	`89`	`}`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,14 @@ module.exports = {`
`4`	`4`	`type:'string',`
`5`	`5`	`required:true,`
`6`	`6`	`message:'Project description'`
	`7`	`+},`
	`8`	`+name:{`
	`9`	`+type:'string',`
	`10`	`+required:true,`
	`11`	`+label:'Project name',`
	`12`	`+validate:function(input){`
	`13`	+returninput==='custom' ?'can not input `custom`' :true
	`14`	`+}`
`7`	`15`	`}`
`8`	`16`	`},`
`9`	`17`	`helpers:{`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -157,11 +157,20 @@ describe('vue-cli', () => {`
`157`	`157`
`158`	`158`	`it('validate input value',done=>{`
`159`	`159`	`// deep copy`
`160`		`-varinvalidName=extend({},answers,{name:'INVALID-NAME'})`
	`160`	`+varinvalidName=extend({},answers,{name:'INVALID-NAME'})`
`161`	`161`	`monkeyPatchInquirer(invalidName)`
`162`	`162`	`generate('INVALID-NAME',MOCK_TEMPLATE_REPO_PATH,MOCK_TEMPLATE_BUILD_PATH,err=>{`
`163`	`163`	`expect(err).to.be.an('error')`
`164`	`164`	`done()`
`165`	`165`	`})`
`166`	`166`	`})`
	`167`	`+`
	`168`	`+it('custom validate',done=>{`
	`169`	`+varinvalidName=extend({},answers,{name:'custom'})`
	`170`	`+monkeyPatchInquirer(invalidName)`
	`171`	`+generate('test',MOCK_METADATA_REPO_JS_PATH,MOCK_TEMPLATE_BUILD_PATH,err=>{`
	`172`	`+expect(err).to.be.an('error')`
	`173`	`+done()`
	`174`	`+})`
	`175`	`+})`
`167`	`176`	`})`

Comments

(0)