Merge pull request vuejs#388 from Arial7/master

posva · web-flow · commit 182feab43b5e · 2017-03-20T10:27:35.000+01:00
Escape double quotes in string prompts
diff --git a/lib/ask.js b/lib/ask.js
@@ -57,6 +57,8 @@ function prompt (data, key, prompt, done) {
       answers[key].forEach(function (multiChoiceAnswer) {
         data[key][multiChoiceAnswer] = true
       })
+    } else if (typeof answers[key] === 'string') {
+      data[key] = answers[key].replace(/"/g, '\\"')
     } else {
       data[key] = answers[key]
     }
diff --git a/test/e2e/test.js b/test/e2e/test.js
@@ -35,6 +35,19 @@ function monkeyPatchInquirer (answers) {
 }
 
 describe('vue-cli', () => {
+  const escapedAnswers = {
+    name: 'vue-cli-test',
+    author: 'John "The Tester" Doe <john@doe.com>',
+    description: 'vue-cli e2e test',
+    preprocessor: {
+      less: true,
+      sass: true
+    },
+    pick: 'no',
+    noEscape: true
+
+  }
+
   const answers = {
     name: 'vue-cli-test',
     author: 'John Doe <john@doe.com>',
@@ -107,6 +120,22 @@ describe('vue-cli', () => {
     })
   })
 
+  it('generate a vaild package.json with escaped author', done => {
+    monkeyPatchInquirer(escapedAnswers)
+    generate('test', MOCK_TEMPLATE_REPO_PATH, MOCK_TEMPLATE_BUILD_PATH, err => {
+      if (err) done(err)
+
+      const pkg = fs.readFileSync(`${MOCK_TEMPLATE_BUILD_PATH}/package.json`, 'utf8')
+      try {
+        var validData = JSON.parse(pkg)
+        expect(validData.author).to.equal(escapedAnswers.author)
+        done()
+      } catch (err) {
+        done(err)
+      }
+    })
+  })
+
   it('avoid rendering files that do not have mustaches', done => {
     monkeyPatchInquirer(answers)
     const binFilePath = `${MOCK_TEMPLATE_REPO_PATH}/template/bin.file`

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ function prompt (data, key, prompt, done) {`
`57`	`57`	`answers[key].forEach(function (multiChoiceAnswer) {`
`58`	`58`	`data[key][multiChoiceAnswer] = true`
`59`	`59`	`})`
	`60`	`+ } else if (typeof answers[key] === 'string') {`
	`61`	`+ data[key] = answers[key].replace(/"/g, '\\"')`
`60`	`62`	`} else {`
`61`	`63`	`data[key] = answers[key]`
`62`	`64`	`}`