aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJames Lal <james@lightsofapollo.com>2012-06-27 21:45:58 +0200
committerJames Lal <james@lightsofapollo.com>2012-06-27 21:45:58 +0200
commitc351e9975cee59131839bc6823e0a3e8c2a3d6cf (patch)
treedc4eb9c6861dba52daa162d5dd448e1757b2c22b /Makefile
parentf80561373584abd8b5c8a12adfa6872efc324d60 (diff)
downloadjsCalDAV-c351e9975cee59131839bc6823e0a3e8c2a3d6cf.tar.gz
Implemented test-agent, all tests pass node/browser
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 11 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 29ee741..6771c76 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,19 @@ package: test-agent-config
cp ./node_modules/mocha/mocha.js $(VENDOR)
cp ./node_modules/mocha/mocha.css $(VENDOR)
cp ./node_modules/chai/chai.js $(VENDOR)
+ cp ./node_modules/sax/lib/sax.js $(VENDOR)
cp ./node_modules/test-agent/test-agent.js $(VENDOR)
cp ./node_modules/test-agent/test-agent.css $(VENDOR)
-.PHONY: test
-test:
+
+test: test-node test-browser
+
+.PHONY: test-browser
+test-browser:
+ ./node_modules/test-agent/bin/js-test-agent test --reporter Spec
+
+.PHONY: test-node
+test-node:
./node_modules/mocha/bin/mocha \
--ui tdd \
--reporter $(REPORTER) \
@@ -32,7 +40,7 @@ test-agent-config:
# Build json array of all test files
for d in test; \
do \
- find $$d -name '*_test.js' | sed "s:$$d/::g" >> /tmp/test-agent-config; \
+ find $$d -name '*_test.js' | sed "s:$$d/:/$$d/:g" >> /tmp/test-agent-config; \
done;
@echo '{"tests": [' >> $(TEST_AGENT_CONFIG)
@cat /tmp/test-agent-config | \