From 1aae30270442f31de384423a4360e256cc6e941f Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 22 Oct 2014 17:03:09 +0100 Subject: [PATCH 1/1] Up the default PHANTOMJS_TIMEOUT to 30 seconds, as the old 18-second default times out about half the time for me --- test/Makefile | 2 +- test/widgets/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 1.7.10.4