X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=51595770d16f46936439700d07f9cc7018aa4521;hb=dbf249f204487107f43e90783dcc243ecd94eae7;hp=f7697377c523feb1bcdca391ffd9a0c9778f14be;hpb=e1cd26870b750dd7d3047878470dedddb3c62e97;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index f769737..5159577 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,18 +1,43 @@
 # Copyright (c) 2013 IndexData ApS. http://indexdata.com
 
+# For running on Mike's local install of node.js
+MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
+NPM_INSTALL_FLAGS=-q
+PHANTOMJS=	./node_modules/phantomjs/bin/phantomjs
+
 all: check
 
-clean distclean:
+clean:
+	rm -f mkws-error.png
+
+distclean: clean
+	rm -rf node_modules
+
+mkws-complete-syntax-check:
+	${MAKE} -C../tools/htdocs $@
 
-check:
-	jasmine-node ./spec 
+check: mkws-complete-syntax-check
+	jasmine-node --noColor --captureExceptions --forceexit ./spec
+	jasmine-node --noColor --captureExceptions --forceexit ./spec-sp
 
 test: check
 
-jsbeautifier:
-	for i in ./spec/*.js ./js/*.js; do \
+terse:
+	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
+
+phantomjs:
+	@# ${PHANTOMJS} phantom/evaluate.js https://mkws-dev.indexdata.com/jasmine-local-popup.html	
+	${PHANTOMJS} phantom/evaluate.js https://mkws-dev.indexdata.com/jasmine-popup.html	
+
+jsbeautifier jsb indent:
+	for i in ./spec*/*.js ./js/*.js; do \
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
 	done
 
+node-modules: node_modules
+node_modules:
+	npm install ${NPM_INSTALL_FLAGS} jQuery xmlhttprequest jsdom request jasmine-node phantomjs
+
 help:
-	@echo "make [ all | clean | check | jsbeautifier ]"
+	@echo "make [ all | check | phantomjs | clean | distclean ]"
+	@echo "     [ jsbeautifier | node-modules ]"