move test script under test directory. allow test type to be specified via argument

brianc · brianc · commit bf6c1f6ec75e · 2010-10-25T15:25:51.000-05:00
diff --git a/test/cli.js b/test/cli.js
@@ -3,7 +3,8 @@ var config = {
   host: 'localhost',
   user: 'postgres',
   database: 'postgres',
-  password: ''
+  password: '',
+  test: 'unit'
 };
 
 var args = process.argv;
@@ -32,6 +33,9 @@ for(var i = 0; i < args.length; i++) {
   case '--down':
     config.down = true;
     break;
+  case '-t':
+  case '--test':
+    config.test = args[++i];
   default:
     break;
   }
diff --git a/test/run.js b/test/run.js
@@ -1,6 +1,9 @@
-#! /usr/local/bin/node
+
 //executes all the unit tests
 var fs = require('fs');
+
+var args = require(__dirname + '/cli');
+
 var runDir = function(dir) {
   fs.readdirSync(dir).forEach(function(file) {
     if(file.indexOf(".js") < 0) {
@@ -9,12 +12,14 @@ var runDir = function(dir) {
     require(dir + file.split('.js') [0]);
   });
 };
-var arg = (process.argv[2] || "unit");
+
+var arg = args.test;
+
 if(arg == 'all') {
-  runDir(__dirname+'/test/unit/');
-  runDir(__dirname+'/test/integration/');
+  runDir(__dirname+'/unit/');
+  runDir(__dirname+'/integration/');
 }
 else {
-  runDir(__dirname+'/test/' + arg + '/');
+  runDir(__dirname+'/' + arg + '/');
 }
 
