From 06c6052959307f4f9e7b2c6607109b58b28ba1da Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Thu, 25 Jun 2015 11:13:31 +0200 Subject: [PATCH] ignore SSL errors for local tests, part of MKWS-391 phantomjs --ignore-ssl-errors=true --- test/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index 2d3e8bb..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,7 +62,7 @@ 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 -- 1.7.10.4