From baecadb2f1a8f31c233edacafb1f8a4b736ea243 Mon Sep 17 00:00:00 2001
From: Vojta Jina <vojta.jina@gmail.com>
Date: Mon, 29 Apr 2013 15:57:25 -0700
Subject: [PATCH] feat(init): improve the questions a bit

---
 lib/init.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/init.js b/lib/init.js
index 3f7e664c8..0c101960d 100755
--- a/lib/init.js
+++ b/lib/init.js
@@ -85,7 +85,7 @@ var questions = [{
 }, {
   id: 'requirejs',
   question: 'Do you want to use Require.js ?',
-  hint: 'This will add Require.js adapter into files.\n' +
+  hint: 'This will add Require.js plugin.\n' +
         'Press tab to list possible options. Enter to move to the next question.',
   options: ['no', 'yes'],
   validate: validateRequireJs,
@@ -97,30 +97,29 @@ var questions = [{
   options: ['Chrome', 'ChromeCanary', 'Firefox', 'Safari', 'PhantomJS', 'Opera', 'IE', ''],
   validate: validateBrowser,
   multiple: true
-}, {
-  id: 'includedFiles',
-  question: 'Which files do you want to include with <script> tag ?',
-  hint: 'This should be a script that bootstraps your test by configuring Require.js and ' +
-        'kicking __karma__.start()\n' +
-        'You can use glob patterns, eg. "js/*.js" or "test/**/*Spec.js".\n' +
-        'Enter empty string to move to the next question.',
-  multiple: true,
-  validate: validatePattern,
-  condition: function(answers) {return answers.requirejs;}
 }, {
   id: 'files',
-  question: 'Which files do you want to test ?',
+  question: 'What is the location of your source and test files ?',
   hint: 'You can use glob patterns, eg. "js/*.js" or "test/**/*Spec.js".\n' +
         'Enter empty string to move to the next question.',
   multiple: true,
   validate: validatePattern
 }, {
   id: 'exclude',
-  question: 'Any files you want to exclude ?',
+  question: 'Should any of the files included by the previous patterns be excluded ?',
   hint: 'You can use glob patterns, eg. "**/*.swp".\n' +
         'Enter empty string to move to the next question.',
   multiple: true,
   validate: validatePattern
+}, {
+  id: 'includedFiles',
+  question: 'Which files do you want to include with <script> tag ?',
+  hint: 'This should be a script that bootstraps your test by configuring Require.js and ' +
+        'kicking __karma__.start(), probably your test-main.js file.\n' +
+        'Enter empty string to move to the next question.',
+  multiple: true,
+  validate: validatePattern,
+  condition: function(answers) {return answers.requirejs;}
 }, {
   id: 'autoWatch',
   question: 'Do you want Karma to watch all the files and run the tests on change ?',