X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile;h=23d1ab8eb314614118412818c4afef1ec628bdcb;hp=c4cb34679274f7ff4ad9bb196ca05be2fdfa91af;hb=e037fab727a9eb80c33f1693fcd6d0b67b84da32;hpb=0b8db87910e02328db600f653e8a4421a94bc3aa

diff --git a/test/Makefile b/test/Makefile
index c4cb346..23d1ab8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,6 +9,7 @@ APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
 PHANTOMJS_PATH=jasmine-local-popup.html
 PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
 PHANTOMJS_TIMEOUT ?= 30
+PHANTOMJS_FLAGS ?= --ignore-ssl-errors=true
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
@@ -45,6 +46,9 @@ mkws-complete-syntax-check:
 check check-js: node-modules mkws-complete-syntax-check
 	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
 
+check-dev: node-modules mkws-complete-syntax-check
+	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec-dev
+
 check-node-installation:
 	@if [ ! -e node_modules ]; then \
 	    echo "==> please run first: make node-modules"; \
@@ -61,13 +65,13 @@ phantomjs p: check-js apache-stop apache-start _phantomjs
 	${MAKE} apache-stop
 
 _phantomjs:
-	perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+	./bin/bomb --timeout="${PHANTOMJS_TIMEOUT}.5" -- ${PHANTOMJS} ${PHANTOMJS_FLAGS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 phantomjs-all p-all:
 	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html
-	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html
-	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
-	${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html?lang=de
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cms-popup.html?lang=en
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html?lang=da
 
 mike-test:
 	$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
@@ -87,7 +91,7 @@ screenshot-indexdata:
 	done; wait
 	ls -l ${IMAGES}
 
-screenshots:
+screenshots: check
 	${MAKE} -C ./widgets $@
 
 jsbeautifier jsb indent:
@@ -118,7 +122,7 @@ apache-stop:
 	rm -f ${APACHE_PID_FILE}
 
 help:
-	@echo "make [ all | check | clean | distclean ]"
+	@echo "make [ all | check | check-dev | clean | distclean ]"
 	@echo "     [ phantomjs | phantomjs-all ]"
 	@echo "     [ jsbeautifier | perltidy | screenshot ]"
 	@echo "     [ screenshots ]"