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

likun7981 · kazupon · commit 0d3f96d27a76 · 2016-12-31T00:59:16.000+09:00
* add name validate function for user custom and add test for it

* remove test only
diff --git a/lib/options.js b/lib/options.js
@@ -75,12 +75,15 @@ function setDefault (opts, key, val) {
 }
 
 function setValidateName (opts) {
-  opts.prompts.name.validate = function (name) {
+  var name = opts.prompts.name
+  var customValidate = name.validate
+  name.validate = function (name) {
     var its = validateName(name)
     if (!its.validForNewPackages) {
       var errors = (its.errors || []).concat(its.warnings || [])
       return 'Sorry, ' + errors.join(' and ') + '.'
     }
+    if (typeof customValidate === 'function') return customValidate(name)
     return true
   }
 }
diff --git a/test/e2e/mock-metadata-repo-js/meta.js b/test/e2e/mock-metadata-repo-js/meta.js
@@ -4,6 +4,14 @@ module.exports = {
       type: 'string',
       required: true,
       message: 'Project description'
+    },
+    name: {
+      type: 'string',
+      required: true,
+      label: 'Project name',
+      validate: function (input) {
+        return input === 'custom' ? 'can not input `custom`' : true
+      }
     }
   },
   helpers: {
diff --git a/test/e2e/test.js b/test/e2e/test.js
@@ -157,11 +157,20 @@ describe('vue-cli', () => {
 
   it('validate input value', done => {
     // deep copy
-    var invalidName = extend({}, answers, {name: 'INVALID-NAME'})
+    var invalidName = extend({}, answers, { name: 'INVALID-NAME' })
     monkeyPatchInquirer(invalidName)
     generate('INVALID-NAME', MOCK_TEMPLATE_REPO_PATH, MOCK_TEMPLATE_BUILD_PATH, err => {
       expect(err).to.be.an('error')
       done()
     })
   })
+
+  it('custom validate', done => {
+    var invalidName = extend({}, answers, { name: 'custom' })
+    monkeyPatchInquirer(invalidName)
+    generate('test', MOCK_METADATA_REPO_JS_PATH, MOCK_TEMPLATE_BUILD_PATH, err => {
+      expect(err).to.be.an('error')
+      done()
+    })
+  })
 })

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`	`function setValidateName (opts) {`
`78`		`- opts.prompts.name.validate = function (name) {`
	`78`	`+ var name = opts.prompts.name`
	`79`	`+ var customValidate = name.validate`
	`80`	`+ name.validate = function (name) {`
`79`	`81`	`var its = validateName(name)`
`80`	`82`	`if (!its.validForNewPackages) {`
`81`	`83`	`var errors = (its.errors \|\| []).concat(its.warnings \|\| [])`
`82`	`84`	`return 'Sorry, ' + errors.join(' and ') + '.'`
`83`	`85`	`}`
	`86`	`+ if (typeof customValidate === 'function') return customValidate(name)`
`84`	`87`	`return true`
`85`	`88`	`}`
`86`	`89`	`}`