mirror of
https://github.com/ansible/awx.git
synced 2026-03-26 05:15:02 -02:30
Merge pull request #3497 from dsesami/e2e_backport_3.5.0
E2E testing: compatibility edit to work with diff versions of node
This commit is contained in:
@@ -20,7 +20,7 @@ const store = {
|
|||||||
lastName: `last-admin-${testID}`,
|
lastName: `last-admin-${testID}`,
|
||||||
password: `admin-${testID}`,
|
password: `admin-${testID}`,
|
||||||
username: `admin-${testID}`,
|
username: `admin-${testID}`,
|
||||||
usernameDefault: `user-${testID}`,
|
usernameDefault: `admin-${testID}`,
|
||||||
type: 'administrator',
|
type: 'administrator',
|
||||||
},
|
},
|
||||||
auditor: {
|
auditor: {
|
||||||
@@ -29,7 +29,7 @@ const store = {
|
|||||||
lastName: `last-auditor-${testID}`,
|
lastName: `last-auditor-${testID}`,
|
||||||
password: `auditor-${testID}`,
|
password: `auditor-${testID}`,
|
||||||
username: `auditor-${testID}`,
|
username: `auditor-${testID}`,
|
||||||
usernameDefault: `user-${testID}`,
|
usernameDefault: `auditor-${testID}`,
|
||||||
type: 'auditor',
|
type: 'auditor',
|
||||||
},
|
},
|
||||||
user: {
|
user: {
|
||||||
@@ -47,7 +47,7 @@ module.exports = {
|
|||||||
before: (client, done) => {
|
before: (client, done) => {
|
||||||
// generate a unique username on each attempt.
|
// generate a unique username on each attempt.
|
||||||
const uniqueUser = uuid().substr(0, 8);
|
const uniqueUser = uuid().substr(0, 8);
|
||||||
Object.entries(store).forEach(([key]) => {
|
Object.keys(store).forEach(key => {
|
||||||
if ('username' in store[key]) {
|
if ('username' in store[key]) {
|
||||||
store[key].username = `${store[key].usernameDefault}-${uniqueUser}`;
|
store[key].username = `${store[key].usernameDefault}-${uniqueUser}`;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user