From 4b85156fb87e5499571af8d0d9fc95f448958c5c Mon Sep 17 00:00:00 2001 From: Julien Chanseaume Date: Mon, 11 Aug 2014 13:43:55 +0200 Subject: [PATCH] changed screenshot path --- .travis.yml | 3 +-- tests/functionnal/casperjs/conf/local.js | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d65dca2f..fabb7be2f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,7 @@ before_script: - git checkout tags/1.1-beta3 script: - - "DISPLAY=:99.0 ./bin/casperjs test ../thelia/tests/functionnal/casperjs/exe/front/ --pre=../thelia/tests/functionnal/casperjs/conf/local.js --verbose --thelia2_base_url='http://localhost:8000/index.php/'" - + - "DISPLAY=:99.0 ./bin/casperjs test ../thelia/tests/functionnal/casperjs/exe/front/ --pre=../thelia/tests/functionnal/casperjs/conf/local.js --verbose --thelia2_base_url='http://localhost:8000/index.php/' --thelia2_screenshot_path='../thelia/tests/functionnal/casperjs/screenshot/'" matrix: allow_failures: diff --git a/tests/functionnal/casperjs/conf/local.js b/tests/functionnal/casperjs/conf/local.js index 2ed42cef6..efa50a4f4 100644 --- a/tests/functionnal/casperjs/conf/local.js +++ b/tests/functionnal/casperjs/conf/local.js @@ -18,7 +18,9 @@ if (casper.cli.has('thelia2_base_url')){ } var screenshot_dir = 'tests/functionnal/casperjs/screenshot/'; - +if (casper.cli.has('thelia2_screenshot_path')){ + screenshot_dir = casper.cli.get('thelia2_screenshot_path'); +} casper.options.viewportSize = {width: 1024, height: 768};