External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 04:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3148 from elyezer/e2e-screenshots

Browse Source 
Add settings to control screenshot capturing

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-02-11 16:47:06 +00:00
committed by GitHub
parent d84b58c857 953b6679ef
commit 53a6341320
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/test/e2e/nightwatch.conf.js
View File

@@ -8,7 +8,11 @@ import {
AWX_E2E_CLUSTER_WORKERS, AWX_E2E_CLUSTER_WORKERS,
AWX_E2E_LAUNCH_URL, AWX_E2E_LAUNCH_URL,
AWX_E2E_TIMEOUT_ASYNC, AWX_E2E_TIMEOUT_ASYNC,
AWX_E2E_TIMEOUT_MEDIUM AWX_E2E_TIMEOUT_MEDIUM,
AWX_E2E_SCREENSHOTS_ENABLED,
AWX_E2E_SCREENSHOTS_ON_ERROR,
AWX_E2E_SCREENSHOTS_ON_FAILURE,
AWX_E2E_SCREENSHOTS_PATH,
} from './settings'; } from './settings';
const resolve = location => path.resolve(__dirname, location); const resolve = location => path.resolve(__dirname, location);
@@ -38,6 +42,12 @@ module.exports = {
chromedriver.stop(); chromedriver.stop();
done(); done();
} }
},
screenshots: {
enabled: AWX_E2E_SCREENSHOTS_ENABLED,
on_error: AWX_E2E_SCREENSHOTS_ON_ERROR,
on_failure: AWX_E2E_SCREENSHOTS_ON_FAILURE,
path: AWX_E2E_SCREENSHOTS_PATH,
} }
}, },
// Note: These are environment-specific overrides to the default // Note: These are environment-specific overrides to the default

12
awx/ui/test/e2e/settings.js
View File

@@ -10,6 +10,12 @@ const AWX_E2E_TIMEOUT_MEDIUM = process.env.AWX_E2E_TIMEOUT_MEDIUM || 5000;
const AWX_E2E_TIMEOUT_SHORT = process.env.AWX_E2E_TIMEOUT_SHORT || 1000; const AWX_E2E_TIMEOUT_SHORT = process.env.AWX_E2E_TIMEOUT_SHORT || 1000;
const AWX_E2E_LAUNCH_URL = process.env.AWX_E2E_LAUNCH_URL || AWX_E2E_URL; const AWX_E2E_LAUNCH_URL = process.env.AWX_E2E_LAUNCH_URL || AWX_E2E_URL;
// Screenshot capture settings
const AWX_E2E_SCREENSHOTS_ENABLED = process.env.AWX_E2E_SCREENSHOTS_ENABLED || false;
const AWX_E2E_SCREENSHOTS_ON_ERROR = process.env.AWX_E2E_SCREENSHOTS_ON_ERROR || true;
const AWX_E2E_SCREENSHOTS_ON_FAILURE = process.env.AWX_E2E_SCREENSHOTS_ON_FAILURE || true;
const AWX_E2E_SCREENSHOTS_PATH = process.env.AWX_E2E_SCREENSHOTS_PATH || '';
module.exports = { module.exports = {
AWX_E2E_CLUSTER_HOST, AWX_E2E_CLUSTER_HOST,
AWX_E2E_CLUSTER_PORT, AWX_E2E_CLUSTER_PORT,
@@ -21,5 +27,9 @@ module.exports = {
AWX_E2E_TIMEOUT_ASYNC, AWX_E2E_TIMEOUT_ASYNC,
AWX_E2E_TIMEOUT_LONG, AWX_E2E_TIMEOUT_LONG,
AWX_E2E_TIMEOUT_MEDIUM, AWX_E2E_TIMEOUT_MEDIUM,
AWX_E2E_TIMEOUT_SHORT AWX_E2E_TIMEOUT_SHORT,
AWX_E2E_SCREENSHOTS_ENABLED,
AWX_E2E_SCREENSHOTS_ON_ERROR,
AWX_E2E_SCREENSHOTS_ON_FAILURE,
AWX_E2E_SCREENSHOTS_PATH,
}; };