Permalink
Browse files

Upgraded node version -- switched tests to use mocha

  • Loading branch information...
1 parent 0f291d6 commit e6bf386f087714632f678b974634e89e95a9693f @thadclay thadclay committed with jperkelens May 16, 2012
View
@@ -1,14 +1,21 @@
SHELL := /bin/bash
node-command := xargs -n 1 -I file expresso file
+file=*.test.js
+unit_files=`find test/unit -name '$(file)' -type f -print0 | xargs -0 echo`
+integration_files=`find test/integration -name '$(file)' -type f -print0 | xargs -0 echo`
test: setup test-unit test-integration
setup:
@[ -e ".fastlegs" ] || node test/bootstrap/init.js
test-unit:
- @find test/unit -name "*_test.js" | $(node-command)
+ @NODE_ENV=test ./node_modules/.bin/mocha \
+ --reporter spec \
+ $(unit_files)
test-integration:
- @find test/integration -name "*_test.js" | $(node-command)
+ @NODE_ENV=test ./node_modules/.bin/mocha \
+ --reporter spec \
+ $(integration_files)
View
@@ -1,19 +1,23 @@
{
"name": "FastLegS",
- "version": "0.1.5",
+ "version": "0.1.6",
"description": "PostgreSQL ORM on top of node-postgres",
"tags" : ["orm", "pg", "postgres"],
"author": "Didit Tech <development@didit.com>",
"homepage": "https://github.com/didit-tech/FastLegS",
"dependencies": {
- "async": "0.1.9",
+ "async": "0.1.18",
"expresso": "0.8.1",
- "pg": "0.5.5",
- "underscore": "1.1.7"
+ "pg": "0.6.18",
+ "underscore": "1.3.3"
+ },
+ "devDependencies": {
+ "mocha": "1.0.3",
+ "expect.js": "0.1.2"
},
"main": "index",
"scripts": { "test": "make test" },
- "engines": { "node": ">= 0.2.4" },
+ "engines": { "node": ">= 0.6.17 < 0.7.0" },
"licenses" : [{
"type" : "MIT"
, "url" : "http://github.com/didit-tech/FastLegS/raw/master/LICENSE"
Oops, something went wrong.

0 comments on commit e6bf386

Please sign in to comment.