Fixed prompt value handling (ref #213)

yeoman · Apr 23, 2013 · 627904f · 627904f
1 parent 3a69932
commit 627904f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/actions/prompt.js b/lib/actions/prompt.js
@@ -100,7 +100,7 @@ module.exports = function prompt(prompts, done) {
         return done(err);
       }
 
-      results[prompt.name] = value;
+      results[prompt.name] = value[prompt.name];
       next(prompts.shift());
     }
 

diff --git a/lib/util/conflicter.js b/lib/util/conflicter.js
@@ -93,7 +93,7 @@ conflicter._ask = function (filepath, content, cb) {
       return cb(err);
     }
 
-    var answer = result.overwrite.overwrite;
+    var answer = result.overwrite;
 
     var ok = 'Yynaqdh'.split('').some(function (valid) {
       return valid === answer;

diff --git a/test/conflicter.js b/test/conflicter.js
@@ -83,7 +83,7 @@ describe('conflicter', function () {
   describe('conflicter#_ask', function () {
     var promptMock = {
       prompt: function (config, cb) {
-        cb(this.err, { overwrite: { overwrite: this.answer } });
+        cb(this.err, { overwrite: this.answer });
       },
       err: null,
       answer: null