From ec99fc09061e9941f4d7ef54c8dfc2299c127a2d Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Fri, 31 Jan 2014 14:00:34 +0000 Subject: [PATCH] configurable test URL --- test/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index c1c74e9..b1e02f9 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,6 +4,8 @@ MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin NPM_INSTALL_FLAGS=-q PHANTOMJS= ./node_modules/phantomjs/bin/phantomjs +PHANTOMJS_URL= https://mkws-dev.indexdata.com/jasmine-popup.html +PHANTOMJS_TIMEOUT= 8 all: check @@ -27,8 +29,7 @@ terse: $(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec phantomjs: - @# ${PHANTOMJS} phantom/evaluate.js https://mkws-dev.indexdata.com/jasmine-local-popup.html - ${PHANTOMJS} phantom/evaluate.js https://mkws-dev.indexdata.com/jasmine-popup.html + ${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} jsbeautifier jsb indent: for i in ./spec*/*.js ./js/*.js; do \ -- 1.7.10.4