X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=003bcac825f94e91b8617cf36a8c040ced9fc019;hb=8fce278d9a8d7ced8c2c46a1c7eec3b5bfd4ad8c;hp=a1f9dc97a30ff8cadf91de1c699e434ca9b0ac41;hpb=3b4089755502f07322ce6028d955d7b56230dd69;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index a1f9dc9..003bcac 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,7 +4,7 @@ MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html -PHANTOMJS_TIMEOUT=12 +PHANTOMJS_TIMEOUT=16 NPM_INSTALL_FLAGS=-q JASMINE_NODE= ./node_modules/jasmine-node/bin/jasmine-node @@ -33,7 +33,7 @@ terse: $(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec phantomjs p: - ./bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} + ./bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} screenshot: ${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000