including mocha tests

Author: ichiriac

bin/test.js

@@ -19,6 +19,7 @@ function printHelp() {
   console.log('');
   console.log('  -f <file>                      Parse and test the specified file');
   console.log('  -d <path>                      Parse each file in the specified path');
+  console.log('  -m <path>                      Run mocha tests on the specified path');
   console.log('  -r                             Use recursivity with the specified path');
   console.log('  -e                             Eval the specified input and shows AST');
   console.log('  -v                             Enable verbose mode and show debug');
@@ -40,7 +41,8 @@ var options = {
   path: null,
   recursive: false,
   evalCode: false,
-  aspShort: false
+  aspShort: false,
+  mocha: false
 };
 
 var args = process.argv.slice(2); // Trim 'node' and the script path.
@@ -87,6 +89,11 @@ while (args.length > 0 && isOption(args[0])) {
       options.path = args[0];
       break;
 
+    case '-m':
+      nextArg();
+      options.mocha = args[0];
+      break;
+
     case '-r':
       options.recusive = true;
       break;
@@ -111,7 +118,7 @@ if ( args.length > 0 ) {
     abort('Too many arguments.');
   }
 }
-if ( !options.filename && !options.path && !options.evalCode ) {
+if ( !options.filename && !options.path && !options.evalCode && !options.mocha ) {
   abort('Expecting a filename or a path.');
 }
 
@@ -184,6 +191,32 @@ function test(filename) {
   }
 }
 
+if (options.mocha) {
+  var Mocha = require('mocha'), path = require('path');
+  
+  // Instantiate a Mocha instance.
+  var mocha = new Mocha();
+
+  // Add each .js file to the mocha instance
+  fs.readdirSync(options.mocha).filter(function(file){
+      // Only keep the .js files
+      return file.substr(-3) === '.js';
+  }).forEach(function(file){
+      mocha.addFile(
+          path.join(options.mocha, file)
+      );
+  });
+  
+  // Run the tests.
+  mocha.run(function(failures){
+    if (failures) {
+      process.on('exit', function () {
+        process.exit(failures);  // exit with non-zero status if there were failures
+      });
+    }
+  });
+}
+
 // run tests
 console.log('\n*** START TESTING ***\n');
 if (options.evalCode) {

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "bench": "node --expose-gc bin/bench.js",
     "test": "node --stack-size=5000 bin/test.js -r -d test/",
-    "cover": "node --stack-size=5000 node_modules/istanbul/lib/cli.js cover -x \"**/bin/**\" bin/test.js -- -r -d test/ ",
+    "cover": "node --stack-size=5000 node_modules/istanbul/lib/cli.js cover -x \"**/bin/**\" bin/test.js -- -r -d test/ -m test/functional",
     "mocha": "node node_modules/mocha/bin/mocha test/functional  --stack-size=5000"
   },
   "repository": {