X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=451371cd0514e41f0c96be51ca3f38548f541b2e;hb=6867e9bed4f7cf9c211e5efeaa0b6f116a35c688;hp=308fca16295a803e498e24947ccccf255fe16ada;hpb=6032621cef45d171adf3da84762c45b0aac6cdd7;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 308fca1..451371c 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
@@ -61,13 +62,13 @@ phantomjs p: check-js apache-stop apache-start _phantomjs
 	${MAKE} apache-stop
 
 _phantomjs:
-	./bin/bomb --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-cms-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 +88,7 @@ screenshot-indexdata:
 	done; wait
 	ls -l ${IMAGES}
 
-screenshots:
+screenshots: check
 	${MAKE} -C ./widgets $@
 
 jsbeautifier jsb indent: