From bf6c1f6ec75ee66246e27a83eb2233db254408cb Mon Sep 17 00:00:00 2001
From: brianc <brian.m.carlson@gmail.com>
Date: Mon, 25 Oct 2010 19:25:51 -0500
Subject: [PATCH] move test script under test directory. allow test type to be
 specified via argument

---
 test/cli.js            |  6 +++++-
 test.js => test/run.js | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)
 rename test.js => test/run.js (62%)

diff --git a/test/cli.js b/test/cli.js
index 95fae818..85ff9602 100644
--- 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.js b/test/run.js
similarity index 62%
rename from test.js
rename to test/run.js
index 617eb5d3..aa609f8e 100755
--- a/test.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 + '/');
 }