+6
-4
@@ -0,1 +1,3 @@ | ||
| export PATH := $(shell pwd)/node_modules/.bin/:$(PATH) | ||
| REPORTER = spec # list | ||
@@ -5,6 +7,6 @@ | ||
| test: test-server test-client test-browser | ||
| test: test-server test-client | ||
| test-server: | ||
| @./node_modules/.bin/mocha --reporter $(REPORTER) ./test/server/* | ||
| @mocha --reporter $(REPORTER) ./test/server/* | ||
@@ -14,3 +16,3 @@ | ||
| @node ./bin/planet & echo $$! > planet.pid | ||
| @./node_modules/.bin/mocha --reporter $(REPORTER) --globals io ./test/io ./test/client/* || true | ||
| @mocha --reporter $(REPORTER) --globals io ./test/io ./test/client/* || true | ||
| @kill `cat planet.pid` | ||
@@ -24,4 +26,4 @@ @rm planet.pid | ||
| @node ./node_modules/wrapup/bin/wrup.js --require public ./test/public.js --output ./test/public/tests.js | ||
| # @open -a Google\ Chrome ./test/public/index.html | ||
| @open -a Google\ Chrome ./test/public/index.html | ||
| .PHONY: test |
+7
-7
| { | ||
| "name": "planet" | ||
| , "version": "0.14.8" | ||
| , "version": "0.14.9" | ||
| , "author": "Enrique Erne (http://mild.ch/)" | ||
@@ -26,11 +26,11 @@ , "description": "collaboratively edit anything" | ||
| "socket.io": "= 0.9.16" | ||
| , "optimist": ">= 0.6.0" | ||
| , "tool": "1.0.0" | ||
| , "yargs": "1.1.3" | ||
| , "tool": "1.0.1" | ||
| } | ||
| , "devDependencies": { | ||
| "socket.io-client": "= 0.9.16" | ||
| , "mocha": ">= 1.12.0" | ||
| , "expect.js": "0.2.0" | ||
| , "wrapup": "0.12.1" | ||
| "mocha": "1.17.1" | ||
| , "expect.js": "0.3.1" | ||
| , "wrapup": "1.0.5" | ||
| , "benchmark": ">= 1.0.0" | ||
| , "socket.io-client": "= 0.9.16" | ||
| } | ||
@@ -37,0 +37,0 @@ , "licenses": [{ |
+2
-2
@@ -423,4 +423,4 @@ # Planet | ||
| - [Socket.IO](http://socket.io/) 0.9.x | ||
| - [Optimist](https://npmjs.org/package/optimist) 0.6.x | ||
| - [Tool](https://github.com/thisconnect/tool) 1.0.0 | ||
| - [Yargs](https://npmjs.org/package/yargs) 1.1.3 | ||
| - [Tool](https://github.com/thisconnect/tool) 1.0.1 | ||
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
392840
0+ Added
+ Added
+ Added
- Removed
- Removed
- Removed
- Removed
Updated