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

Merge pull request #771 from gconsidine/ui/fix/input-replace-revert

Browse Source 
Ui/fix/input replace revert
This commit is contained in:
Greg Considine 2017-12-05 13:43:32 -05:00 committed by GitHub
commit e1e225d6a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/features/credentials/edit-credentials.controller.js
View File

@ -23,7 +23,7 @@ function EditCredentialsController (models, $state, $scope, strings, componentsS
};
$scope.$watch('$state.current.name', (value) => {
if (/credentials.edit($|\.organization$)/.test(value)) {
if (/credentials.edit($|\.organization$|\.credentialType$)/.test(value)) {
vm.tab.details._active = true;
vm.tab.permissions._active = false;
} else {

6
awx/ui/client/lib/components/input/secret.directive.js
View File

@ -37,6 +37,12 @@ function AtInputSecretController (baseInputController) {
vm.check();
};
vm.toggleRevertReplace = () => {
scope.state._isBeingReplaced = !scope.state._isBeingReplaced;
vm.onRevertReplaceToggle();
};
vm.toggleShowHide = () => {
if (scope.type === 'password') {
scope.type = 'text';

24
awx/ui/test/e2e/tests/test-credentials-add-edit-machine.js
View File

@ -177,6 +177,30 @@ module.exports = {
credentials.waitForElementNotPresent(`${row}:nth-of-type(2)`);
credentials.expect.element(row).text.contain(store.credential.name);
},
'change the password after saving': client => {
const credentials = client.page.credentials();
const { edit } = credentials.section;
const { machine } = edit.section.details.section;
machine.section.password.expect.element('@replace').visible;
machine.section.password.expect.element('@replace').enabled;
machine.section.password.expect.element('@revert').not.present;
machine.expect.element('@password').not.enabled;
machine.section.password.click('@replace');
machine.section.password.expect.element('@replace').not.present;
machine.section.password.expect.element('@revert').visible;
machine.expect.element('@password').enabled;
machine.setValue('@password', 'newpassword');
edit.section.details.click('@save');
credentials
.waitForElementVisible('div.spinny')
.waitForElementNotVisible('div.spinny');
client.end();
}