From fddecfdd25bec6f6eaa3747f4ed7fbfe64bae5c5 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Tue, 26 Sep 2017 23:26:41 -0400 Subject: [PATCH] use launch_url to specify awx host for workers --- awx/ui/client/test/e2e/README.md | 2 +- awx/ui/client/test/e2e/objects/activityStream.js | 2 +- awx/ui/client/test/e2e/objects/credentialTypes.js | 2 +- awx/ui/client/test/e2e/objects/credentials.js | 2 +- awx/ui/client/test/e2e/objects/inventories.js | 2 +- awx/ui/client/test/e2e/objects/inventoryScripts.js | 2 +- awx/ui/client/test/e2e/objects/login.js | 2 +- awx/ui/client/test/e2e/objects/notificationTemplates.js | 2 +- awx/ui/client/test/e2e/objects/organizations.js | 2 +- awx/ui/client/test/e2e/objects/projects.js | 2 +- awx/ui/client/test/e2e/objects/teams.js | 2 +- awx/ui/client/test/e2e/objects/templates.js | 2 +- awx/ui/client/test/e2e/objects/users.js | 2 +- awx/ui/client/test/e2e/settings.js | 2 ++ 14 files changed, 15 insertions(+), 13 deletions(-) diff --git a/awx/ui/client/test/e2e/README.md b/awx/ui/client/test/e2e/README.md index 8cd57f38cd..b4c1a0aab8 100644 --- a/awx/ui/client/test/e2e/README.md +++ b/awx/ui/client/test/e2e/README.md @@ -17,7 +17,7 @@ docker-compose \ up --scale chrome=2 --scale firefox=0 # run headlessly with multiple workers on the cluster -AWX_E2E_URL='https://awx:8043' AWX_E2E_WORKERS=2 npm --prefix awx/ui run e2e +AWX_E2E_LAUNCH_URL='https://awx:8043' AWX_E2E_WORKERS=2 npm --prefix awx/ui run e2e ``` **Note:** Unless overridden in [settings](settings.js), tests will run against `localhost:8043`. diff --git a/awx/ui/client/test/e2e/objects/activityStream.js b/awx/ui/client/test/e2e/objects/activityStream.js index c59a615b9a..b122c02c68 100644 --- a/awx/ui/client/test/e2e/objects/activityStream.js +++ b/awx/ui/client/test/e2e/objects/activityStream.js @@ -1,6 +1,6 @@ module.exports = { url() { - return `${this.api.globals.awxURL}/#/activity_stream` + return `${this.api.globals.launch_url}/#/activity_stream` }, elements: { title: '.List-titleText', diff --git a/awx/ui/client/test/e2e/objects/credentialTypes.js b/awx/ui/client/test/e2e/objects/credentialTypes.js index 9b2f4f4385..4584309543 100644 --- a/awx/ui/client/test/e2e/objects/credentialTypes.js +++ b/awx/ui/client/test/e2e/objects/credentialTypes.js @@ -53,7 +53,7 @@ const listPanel = { module.exports = { url() { - return `${this.api.globals.awxURL}/#/credential_types` + return `${this.api.globals.launch_url}/#/credential_types` }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/credentials.js b/awx/ui/client/test/e2e/objects/credentials.js index 783cd7526e..7cb0a6de78 100644 --- a/awx/ui/client/test/e2e/objects/credentials.js +++ b/awx/ui/client/test/e2e/objects/credentials.js @@ -229,7 +229,7 @@ const details = _.merge({}, common, { module.exports = { url() { - return `${this.api.globals.awxURL}/#/credentials` + return `${this.api.globals.launch_url}/#/credentials` }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/inventories.js b/awx/ui/client/test/e2e/objects/inventories.js index 1bbae1a1e9..bbef08ff2e 100644 --- a/awx/ui/client/test/e2e/objects/inventories.js +++ b/awx/ui/client/test/e2e/objects/inventories.js @@ -37,7 +37,7 @@ const smartInvDetails = createFormSection({ module.exports = { url() { - return `${this.api.globals.awxURL}/#/inventories`; + return `${this.api.globals.launch_url}/#/inventories`; }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/inventoryScripts.js b/awx/ui/client/test/e2e/objects/inventoryScripts.js index a34cb6dca4..3a9da46f00 100644 --- a/awx/ui/client/test/e2e/objects/inventoryScripts.js +++ b/awx/ui/client/test/e2e/objects/inventoryScripts.js @@ -22,7 +22,7 @@ const details = createFormSection({ module.exports = { url() { - return `${this.api.globals.awxURL}/#/inventory_scripts`; + return `${this.api.globals.launch_url}/#/inventory_scripts`; }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/login.js b/awx/ui/client/test/e2e/objects/login.js index 12bdd45485..7613ee855b 100644 --- a/awx/ui/client/test/e2e/objects/login.js +++ b/awx/ui/client/test/e2e/objects/login.js @@ -1,6 +1,6 @@ module.exports = { url() { - return `${this.api.globals.awxURL}/#/login` + return `${this.api.globals.launch_url}/#/login` }, elements: { username: '#login-username', diff --git a/awx/ui/client/test/e2e/objects/notificationTemplates.js b/awx/ui/client/test/e2e/objects/notificationTemplates.js index dc7371eaaf..72ebd53045 100644 --- a/awx/ui/client/test/e2e/objects/notificationTemplates.js +++ b/awx/ui/client/test/e2e/objects/notificationTemplates.js @@ -27,7 +27,7 @@ const details = createFormSection({ module.exports = { url() { - return `${this.api.globals.awxURL}/#/notification_templates`; + return `${this.api.globals.launch_url}/#/notification_templates`; }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/organizations.js b/awx/ui/client/test/e2e/objects/organizations.js index ca945ff269..b17c1d55f1 100644 --- a/awx/ui/client/test/e2e/objects/organizations.js +++ b/awx/ui/client/test/e2e/objects/organizations.js @@ -20,7 +20,7 @@ const details = createFormSection({ module.exports = { url() { - return `${this.api.globals.awxURL}/#/organizations`; + return `${this.api.globals.launch_url}/#/organizations`; }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/projects.js b/awx/ui/client/test/e2e/objects/projects.js index 399468267a..e1956a8e83 100644 --- a/awx/ui/client/test/e2e/objects/projects.js +++ b/awx/ui/client/test/e2e/objects/projects.js @@ -23,7 +23,7 @@ const details = createFormSection({ module.exports = { url() { - return `${this.api.globals.awxURL}/#/projects`; + return `${this.api.globals.launch_url}/#/projects`; }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/teams.js b/awx/ui/client/test/e2e/objects/teams.js index fe2eb7ee12..245ee2eba2 100644 --- a/awx/ui/client/test/e2e/objects/teams.js +++ b/awx/ui/client/test/e2e/objects/teams.js @@ -21,7 +21,7 @@ const details = createFormSection({ module.exports = { url() { - return `${this.api.globals.awxURL}/#/teams`; + return `${this.api.globals.launch_url}/#/teams`; }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/templates.js b/awx/ui/client/test/e2e/objects/templates.js index 0ddcaeb978..4e3b69cc4f 100644 --- a/awx/ui/client/test/e2e/objects/templates.js +++ b/awx/ui/client/test/e2e/objects/templates.js @@ -25,7 +25,7 @@ const details = createFormSection({ module.exports = { url() { - return `${this.api.globals.awxURL}/#/templates`; + return `${this.api.globals.launch_url}/#/templates`; }, sections: { header, diff --git a/awx/ui/client/test/e2e/objects/users.js b/awx/ui/client/test/e2e/objects/users.js index 997f1b003b..9d8cdc0eeb 100644 --- a/awx/ui/client/test/e2e/objects/users.js +++ b/awx/ui/client/test/e2e/objects/users.js @@ -21,7 +21,7 @@ const details = createFormSection({ module.exports = { url() { - return `${this.api.globals.awxURL}/#/users`; + return `${this.api.globals.launch_url}/#/users`; }, sections: { header, diff --git a/awx/ui/client/test/e2e/settings.js b/awx/ui/client/test/e2e/settings.js index 6496ba0b75..0a5c892461 100644 --- a/awx/ui/client/test/e2e/settings.js +++ b/awx/ui/client/test/e2e/settings.js @@ -3,6 +3,7 @@ const AWX_E2E_USERNAME = process.env.AWX_E2E_USERNAME || 'awx-e2e'; const AWX_E2E_PASSWORD = process.env.AWX_E2E_PASSWORD || 'password'; const AWX_E2E_SELENIUM_HOST = process.env.AWX_E2E_SELENIUM_HOST || 'localhost'; const AWX_E2E_SELENIUM_PORT = process.env.AWX_E2E_SELENIUM_PORT || 4444; +const AWX_E2E_LAUNCH_URL = process.env.AWX_E2E_LAUNCH_URL || AWX_E2E_URL; const AWX_E2E_TIMEOUT_SHORT = process.env.AWX_E2E_TIMEOUT_SHORT || 1000; const AWX_E2E_TIMEOUT_MEDIUM = process.env.AWX_E2E_TIMEOUT_MEDIUM || 5000; const AWX_E2E_TIMEOUT_LONG = process.env.AWX_E2E_TIMEOUT_LONG || 10000; @@ -20,6 +21,7 @@ module.exports = { retryAssertionTimeout: AWX_E2E_TIMEOUT_MEDIUM, selenium_host: AWX_E2E_SELENIUM_HOST, selenium_port: AWX_E2E_SELENIUM_PORT, + launch_url: AWX_E2E_LAUNCH_URL, shortTimeout: AWX_E2E_TIMEOUT_SHORT, waitForConditionTimeout: AWX_E2E_TIMEOUT_MEDIUM, test_workers: {