From: Mike Taylor <mike@indexdata.com>
Date: Wed, 22 Oct 2014 16:03:09 +0000 (+0100)
Subject: Up the default PHANTOMJS_TIMEOUT to 30 seconds, as the old 18-second default times... 
X-Git-Tag: 1.0.0~138^2~4
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=1aae30270442f31de384423a4360e256cc6e941f

Up the default PHANTOMJS_TIMEOUT to 30 seconds, as the old 18-second default times out about half the time for me
---

diff --git a/test/Makefile b/test/Makefile
index 5705e4d..a7c1ea0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,7 +8,7 @@ APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
 #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
 PHANTOMJS_PATH=jasmine-local-popup.html
 PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
-PHANTOMJS_TIMEOUT=18
+PHANTOMJS_TIMEOUT=30
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index 94ff158..18a303c 100644
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -1,6 +1,6 @@
 # Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
-PHANTOMJS_TIMEOUT=18
+PHANTOMJS_TIMEOUT=30
 PHANTOMJS=	../node_modules/phantomjs/bin/phantomjs
 IMAGES=		./images
 SCREENSHOT_WIDTH_HEIGHT=	1000 1200