X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=ee50534304f92d8fc5f78e8cce87cb6c9cf1cb23;hb=7a2a4a467eb521089fe51e9a346b420d4826d142;hp=5f059cc9eb4723224744af4987c8046f23f36044;hpb=3fc3a18add283ac313600a8a342b53f45686b4a0;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 5f059cc..ee50534 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,11 @@
-# Copyright (c) 2013 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 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
+JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
+PHANTOMJS=	./bomb.pl ./node_modules/phantomjs/bin/phantomjs
 PHANTOMJS_URL=	https://mkws-dev.indexdata.com/jasmine-popup.html	
 PHANTOMJS_TIMEOUT=	12	
 IMAGES=	./images
@@ -22,8 +24,7 @@ mkws-complete-syntax-check:
 
 check: mkws-complete-syntax-check
 	@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
+	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
 
 test: check
 
@@ -49,15 +50,17 @@ screenshot-indexdata:
 	ls -l ${IMAGES}
 
 jsbeautifier jsb indent:
-	for i in ./spec*/*.js ./js/*.js ./phantom/*.js; do \
+	for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.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
+node_modules node-modules:
+	npm install ${NPM_INSTALL_FLAGS}
 
 help:
 	@echo "make [ all | check | clean | distclean ]"
 	@echo "     [ phantomjs | screenshot ]"
 	@echo "     [ jsbeautifier | node-modules ]"
+	@echo ""
+	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOM_URL=https://mkws-dev.indexdata.com/jasmine-popup.html"
+