X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=cecb5fc20052539b256626e7774baacaf951eb39;hb=d2481365789565539ddf25550910ddb9be29c701;hp=d4106a555e6c1110d16b8a64b94d9edb4a00f38f;hpb=ef2dbd376deeb747a3e14bf93a4323eba41ea749;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index d4106a5..cecb5fc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,37 +2,44 @@
 
 # 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
+PHANTOMJS_URL=	https://mkws-dev.indexdata.com/jasmine-popup.html	
+PHANTOMJS_TIMEOUT=	8
 
 all: check
 
 clean:
+	rm -f mkws-error.png mkws-error.html
 
-distclean:
+distclean: clean
 	rm -rf node_modules
 
 mkws-complete-syntax-check:
 	${MAKE} -C../tools/htdocs $@
 
 check: mkws-complete-syntax-check
-	for i in ./spec/*.js; do \
-	  echo "$$i"; \
-	  jasmine-node --noColor --captureExceptions --forceexit $$i; \
-	done
+	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
+	jasmine-node --noColor --captureExceptions --forceexit ./spec
+	jasmine-node --noColor --captureExceptions --forceexit ./spec-sp
 
 test: check
 
 terse:
 	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
+phantomjs:
+	${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+
 jsbeautifier jsb indent:
-	for i in ./spec/*.js ./js/*.js; do \
+	for i in ./spec*/*.js ./js/*.js ./phantom/*.js; do \
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
 	done
 
 node-modules: node_modules
 node_modules:
-	npm install jQuery xmlhttprequest jsdom request jasmine-node
+	npm install ${NPM_INSTALL_FLAGS} jQuery xmlhttprequest jsdom request jasmine-node phantomjs
 
 help:
-	@echo "make [ all | check | clean | distclean ]"
+	@echo "make [ all | check | phantomjs | clean | distclean ]"
 	@echo "     [ jsbeautifier | node-modules ]"