fix test dependencies and rely on npm

Automattic · Jul 12, 2012 · 8dbe66d · 8dbe66d
1 parent 9e8428a
commit 8dbe66d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 lib-cov
+node_modules
diff --git a/Makefile b/Makefile
@@ -1,12 +1,6 @@
 
 test:
-	@NODE_ENV=test ./support/expresso/bin/expresso \
+	@NODE_ENV=test ./node_modules/.bin/expresso $(TESTFLAGS) test/*.test.js
-		-I lib \
-		-I support \
-		-I support/should.js/lib \
-		-I support/colors.js \
-		$(TESTFLAGS) \
-		test/*.test.js
 
 test-cov:
 	@TESTFLAGS=--cov $(MAKE) test

diff --git a/package.json b/package.json
@@ -5,7 +5,11 @@
   , "keywords": ["cli", "colors", "table"]
   , "dependencies": {
       "colors": "0.3.0"
-  }
+    }
+  , "devDependencies": {
+      "expresso": "~0.9"
+    , "should": "~0.6"
+    }
   , "main": "./index.js"
   , "engines": { "node": ">= 0.2.0" }
 }
diff --git a/support/colors.js b/support/colors.js
diff --git a/support/expresso b/support/expresso
diff --git a/support/should.js b/support/should.js
diff --git a/test/common.js b/test/common.js
diff --git a/test/index.test.js b/test/index.test.js
@@ -3,7 +3,7 @@
  * Module requirements.
  */
 
-require('./common');
+require('should');
 
 var Table = require('cli-table');