External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

use launch_url to specify awx host for workers

Browse Source
This commit is contained in:
Jake McDermott 2017-09-26 23:26:41 -04:00
parent 09a6a326d1
commit fddecfdd25
No known key found for this signature in database
GPG Key ID: 3B02CAD476EECB35
14 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/test/e2e/README.md
View File

@ -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`.

2
awx/ui/client/test/e2e/objects/activityStream.js
View File

@ -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',

2
awx/ui/client/test/e2e/objects/credentialTypes.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/credentials.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/inventories.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/inventoryScripts.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/login.js
View File

@ -1,6 +1,6 @@
module.exports = {
url() {
return `${this.api.globals.awxURL}/#/login`
return `${this.api.globals.launch_url}/#/login`
},
elements: {
username: '#login-username',

2
awx/ui/client/test/e2e/objects/notificationTemplates.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/organizations.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/projects.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/teams.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/templates.js
View File

@ -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,

2
awx/ui/client/test/e2e/objects/users.js
View File

@ -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,

2
awx/ui/client/test/e2e/settings.js
View File

@ -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: {