switched from jasmine-node to mocha and modified all tests

davybrion · Jan 30, 2012 · 6b1b25c · 6b1b25c
1 parent daa2353
commit 6b1b25c
Show file tree

Hide file tree

Showing 28 changed files with 440 additions and 469 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -25,7 +25,7 @@ app.dynamicHelpers({
 });
 
 app.configure(function(){
-	app.use(express.logger('dev'));
+	// app.use(express.logger('dev'));
 	app.use(express.bodyParser());
 	app.use(express.methodOverride());
 	app.use(express.cookieParser());

diff --git a/lib/entities/activity.js b/lib/entities/activity.js
@@ -19,7 +19,7 @@ var activitySchema = new Schema({
 });
 
 activitySchema.methods.addPerformedWork = function(date, hours) {
-	var i = 0;
+	var i = 0, length;
 	for (i = 0, length = this.performedWork.length; i<length; i++) {
 		if (this.performedWork[i].date.getFullYear() === date.getFullYear() &&
 				this.performedWork[i].date.getMonth() === date.getMonth() &&

diff --git a/package.json b/package.json
@@ -15,7 +15,8 @@
 	"devDependencies" :
 	{
 		"node-jslint-all" : "= 0.2.0",
-		"jasmine-node" : "= 1.0.12",
+		"mocha" : ">= 0.10.2",
+		"should" : ">= 0.5.1",
 		"request" : ">= 2.1.0"
 	}
 }
diff --git a/spec/db/mongoose_helper.js b/spec/db/mongoose_helper.js
diff --git a/spec/helper_functions.js b/spec/helper_functions.js
diff --git a/spec/rest_api/request_helper.js b/spec/rest_api/request_helper.js
diff --git a/test.sh b/test.sh
@@ -1 +1,2 @@
-node_modules/jasmine-node/bin/jasmine-node spec
+node_modules/mocha/bin/mocha $(find test -name "*Spec.js") $@
+
diff --git a/spec/builders/activity_builder.js → test/builders/activity_builder.js b/spec/builders/activity_builder.js → test/builders/activity_builder.js
diff --git a/spec/builders/company_builder.js → test/builders/company_builder.js b/spec/builders/company_builder.js → test/builders/company_builder.js
diff --git a/spec/builders/customer_builder.js → test/builders/customer_builder.js b/spec/builders/customer_builder.js → test/builders/customer_builder.js
diff --git a/spec/builders/invoice_builder.js → test/builders/invoice_builder.js b/spec/builders/invoice_builder.js → test/builders/invoice_builder.js
diff --git a/spec/builders/user_builder.js → test/builders/user_builder.js b/spec/builders/user_builder.js → test/builders/user_builder.js
diff --git a/spec/db/README → test/db/README b/spec/db/README → test/db/README
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		node_modules/jasmine-node/bin/jasmine-node spec
		node_modules/mocha/bin/mocha $(find test -name "*Spec.js") $@