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

diff --git a/test/Makefile b/test/Makefile
index 5f059cc..7e77b0b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,11 +1,14 @@
-# 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
+
+PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html	
+PHANTOMJS_TIMEOUT=12	
+
 NPM_INSTALL_FLAGS=-q
-PHANTOMJS=	./node_modules/phantomjs/bin/phantomjs
-PHANTOMJS_URL=	https://mkws-dev.indexdata.com/jasmine-popup.html	
-PHANTOMJS_TIMEOUT=	12	
+JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
+PHANTOMJS=	./bomb.pl ./node_modules/phantomjs/bin/phantomjs
 IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 
@@ -22,15 +25,14 @@ 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
 
 terse:
 	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs:
+phantomjs p:
 	${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 screenshot:
@@ -49,15 +51,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 PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html"
+