From d829d2541f6636d3c939c1c8eb1afa492aa444dd Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Fri, 27 Jan 2017 11:20:45 -0700 Subject: [PATCH] Added new env var for e2e reports --- circle.yml | 2 +- nightwatch.conf.js | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index 6009a88e6..c511715a5 100644 --- a/circle.yml +++ b/circle.yml @@ -22,7 +22,7 @@ test: # Run the tests using the junit reporter. - MOCHA_FILE=$CIRCLE_TEST_REPORTS/junit/test-results.xml NPM_PACKAGE_CONFIG_MOCHA_REPORTER=mocha-junit-reporter npm run test # Run the e2e test suite - - npm run e2e + - E2E_REPORT_PATH=$CIRCLE_TEST_REPORTS/e2e npm run e2e deployment: release: diff --git a/nightwatch.conf.js b/nightwatch.conf.js index 3b6b356b6..2e0cc5020 100644 --- a/nightwatch.conf.js +++ b/nightwatch.conf.js @@ -1,8 +1,13 @@ require('babel-core/register'); +let E2E_REPORT_PATH = './test/e2e/reports'; +if (process.env.E2E_REPORT_PATH && process.env.E2E_REPORT_PATH.length > 0) { + E2E_REPORT_PATH = process.env.E2E_REPORT_PATH; +} + module.exports = { 'src_folders': './test/e2e/tests', - 'output_folder': './test/e2e/reports', + 'output_folder': E2E_REPORT_PATH, 'page_objects_path': './test/e2e/pages', 'globals_path': './test/e2e/globals', 'custom_commands_path' : '', @@ -10,7 +15,7 @@ module.exports = { 'selenium': { 'start_process': true, 'server_path': 'node_modules/selenium-standalone/.selenium/selenium-server/2.53.1-server.jar', - 'log_path': './test/e2e/reports', + 'log_path': E2E_REPORT_PATH, 'host': '127.0.0.1', 'port': 6666, 'cli_args': { @@ -36,7 +41,7 @@ module.exports = { 'enabled': true, 'on_failure': true, 'on_error': true, - 'path': './tests/e2e/reports' + 'path': E2E_REPORT_PATH }, 'exclude': [ './tests/e2e/tests/EmbedStreamTests.js' @@ -47,7 +52,3 @@ module.exports = { } } }; - -// "chromeOptions" : { -// "args" : ["start-fullscreen"] -// }