fix(init): to not give false warning about missing requirejs

vojtajina · vojtajina · commit 562607a16221 · 2013-04-04T16:49:26.000-07:00
diff --git a/lib/init.js b/lib/init.js
@@ -177,17 +177,21 @@ var StateMachine = function(rli) {
         }
       }
 
-      if (line && currentQuestion.validate) {
-        currentQuestion.validate(line);
+      if (line === '') {
+        line = null;
       }
 
       if (currentQuestion.boolean) {
         line = (line === 'yes' || line === 'true' || line === 'on');
       }
 
+      if (line !== null && currentQuestion.validate) {
+        currentQuestion.validate(line);
+      }
+
       if (currentQuestion.multiple) {
         answers[pendingQuestionId] = answers[pendingQuestionId] || [];
-        if (line) {
+        if (line !== null) {
           answers[pendingQuestionId].push(line);
           rli.prompt();
 
diff --git a/test/unit/init.spec.coffee b/test/unit/init.spec.coffee
@@ -121,6 +121,22 @@ describe 'init', ->
       expect(done).to.have.been.called
 
 
+    it 'should parse booleans before validation', ->
+      validator = sinon.spy (value) ->
+        expect(typeof value).to.equal 'boolean'
+
+      questions = [
+        {id: 'what', options: ['yes', 'no'], boolean: true, validate: validator}
+        {id: 'really', options: ['yes', 'no'], boolean: true, validate: validator}
+      ]
+
+      machine.process questions, done
+      machine.onLine 'yes'
+      machine.onLine 'no'
+
+      expect(validator).to.have.been.calledTwice
+
+
   describe 'getBasePath', ->
 
     # just for windows.

Original file line number	Diff line number	Diff line change
`@@ -177,17 +177,21 @@ var StateMachine = function(rli) {`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`
`180`		`- if (line && currentQuestion.validate) {`
`181`		`- currentQuestion.validate(line);`
	`180`	`+ if (line === '') {`
	`181`	`+ line = null;`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if (currentQuestion.boolean) {`
`185`	`185`	`line = (line === 'yes' \|\| line === 'true' \|\| line === 'on');`
`186`	`186`	`}`
`187`	`187`
	`188`	`+ if (line !== null && currentQuestion.validate) {`
	`189`	`+ currentQuestion.validate(line);`
	`190`	`+ }`
	`191`	`+`
`188`	`192`	`if (currentQuestion.multiple) {`
`189`	`193`	`answers[pendingQuestionId] = answers[pendingQuestionId] \|\| [];`
`190`		`- if (line) {`
	`194`	`+ if (line !== null) {`
`191`	`195`	`answers[pendingQuestionId].push(line);`
`192`	`196`	`rli.prompt();`
`193`	`197`