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

Merge branch 'devel' into workflow-visualizer-search

Browse Source
This commit is contained in:
Daniel Sami
2018-10-18 14:48:36 -04:00
committed by GitHub
parent b4549e5581 3afed6adb7
commit f3ee93b67f
63 changed files with 776 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/test/e2e/objects/configuration.js
View File

@@ -14,6 +14,17 @@ const commands = [{
return this.navigate();
},
selectSubcategory (name) {
const spinny = 'div.spinny';
const categoryName = `//*[text() = '${name}']`;
this.api.useXpath();
this.api.waitForElementVisible(categoryName);
this.api.click(categoryName);
this.api.useCss();
return this;
},
selectDropDownContainer (name) {
const spinny = 'div.spinny';
const select = '#configure-dropdown-nav';
const arrow = `${select} + span span[class$="arrow"]`;

5
awx/ui/test/e2e/objects/sections/navigation.js
View File

@@ -18,7 +18,10 @@ const navigation = {
notifications: 'i[class$="fa-bell"]',
managementJobs: 'i[class$="fa-wrench"]',
instanceGroups: 'i[class$="fa-server"]',
settings: 'i[class$="fa-cog"]',
settings: 'i[class*="fa-cog"]',
settingsSubPane: '.at-SettingsSubPane',
settingsSubPaneSystem: 'a[href="#/settings/system"]',
settingsSubPaneAuth: 'a[href="#/settings/auth"]'
}
};

25
awx/ui/test/e2e/tests/test-configuration-ldap-fields.js
View File

@@ -1,9 +1,7 @@
module.exports = {
'expected LDAP codemirror fields are rendered when returning from another tab': client => {
const authTab = '#auth_tab';
const authView = 'div[ui-view="auth"]';
const ldapForm = '#configuration_ldap_template_form';
const systemTab = '#system_tab';
const systemView = 'div[ui-view="system"]';
const { navigation } = client.page.dashboard().section;
@@ -14,20 +12,23 @@ module.exports = {
navigation
.waitForElementVisible('@settings')
.click('@settings');
.moveToElement('@settings', 0, 0)
.waitForElementVisible('@settingsSubPaneSystem')
.click('@settingsSubPaneSystem');
configuration.waitForElementVisible(authView);
configuration.waitForElementVisible(systemTab);
configuration.click(systemTab);
configuration.waitForElementNotVisible(authView);
configuration.waitForElementVisible(systemView);
configuration.waitForElementVisible(authTab);
configuration.click(authTab);
configuration.waitForElementNotVisible(systemView);
navigation
.waitForElementVisible('@settings')
.moveToElement('@settings', 0, 0)
.waitForElementVisible('@settingsSubPane')
.waitForElementVisible('@settingsSubPaneAuth')
.click('@settingsSubPaneAuth');
configuration.waitForElementVisible(authView);
// works as xpath const categoryName =
// `//*[@id="configuration_edit"]/div[1]/div/div/div[4]`;
configuration.selectSubcategory('LDAP');
configuration.waitForElementVisible(ldapForm);
@@ -41,7 +42,7 @@ module.exports = {
'AUTH_LDAP_TEAM_MAP',
];
const ldapCodeMirrors = `${ldapForm} div[class^="CodeMirror"] textarea`;
const ldapCodeMirrors = `${ldapForm} div[class^="CodeMirror"] textarea`;
client.elements('css selector', ldapCodeMirrors, ({ value }) => {
client.assert.equal(value.length, expectedCodemirrorFields.length);