Use mochify to run tests in phantomjs

Author: andreypopp

Makefile

@@ -1,7 +1,7 @@
 BIN = ./node_modules/.bin
 PATH := $(BIN):$(PATH)
 
-TEST_SUITES         = $(wildcard tests/*.js)
+TEST_SUITES         = $(wildcard ./tests/*.js)
 TEST_SUITES_COMMON  = $(filter-out %-browser.js %-server.js, $(TEST_SUITES))
 TEST_SUITES_BROWSER = $(filter %-browser.js, $(TEST_SUITES))
 TEST_SUITES_SERVER  = $(filter %-server.js, $(TEST_SUITES))
@@ -15,12 +15,10 @@ lint:
 test:: test-server test-browser
 
 test-server::
-	@mocha -R spec $(TEST_SUITES_COMMON) $(TEST_SUITES_SERVER)
+	@mocha $(TEST_SUITES_COMMON) $(TEST_SUITES_SERVER)
 
 test-browser:
-	@browserify -d -p [ mocaccino -R spec ] \
-		$(TEST_SUITES_COMMON) $(TEST_SUITES_BROWSER) \
-		| phantomic
+	@mochify $(TEST_SUITES_COMMON) $(TEST_SUITES_BROWSER) \
 
 example::
 	@node-dev --no-deps example/server.js

package.json

@@ -8,20 +8,19 @@
     "react": "~0.11.0"
   },
   "devDependencies": {
-    "fibers": "~1.0.1",
-    "semver": "~2.2.1",
-    "jshint": "~2.4.3",
+    "browserify": "^3.32.1",
+    "browserify-shim": "^3.3.1",
     "connect-browserify": "~1.0.0",
     "express": "~3.4.8",
+    "fibers": "~1.0.1",
+    "jshint": "~2.4.3",
     "mocha": "~1.17.1",
+    "mochify": "^0.11.1",
     "node-dev": "~2.1.6",
-    "react": "~0.11.0",
-    "mocaccino": "^0.4.2",
-    "phantomic": "^0.5.0",
     "phantomjs": "^1.9.7-1",
-    "uglify-js": "^2.4.13",
-    "browserify": "^3.32.1",
-    "browserify-shim": "^3.3.1"
+    "react": "~0.11.0",
+    "semver": "~2.2.1",
+    "uglify-js": "^2.4.13"
   },
   "scripts": {
     "test": "make test"