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

Merge pull request #2787 from mabashian/fix-e2e-tests

Browse Source 
Fixes e2e test failure checking copy wf warning title
This commit is contained in:
Michael Abashian 2018-08-07 16:53:55 -04:00 committed by GitHub
commit c7cc05747f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/features/templates/templatesList.controller.js
View File

@ -187,7 +187,7 @@ function ListTemplatesController(
return strings.get('list.ADD_DD_WF_LABEL');;
}
};
function refreshTemplates() {
Wait('start');
let path = GetBasePath('unified_job_templates');
@ -270,7 +270,7 @@ function ListTemplatesController(
actionText: strings.get('COPY'),
body: buildWorkflowCopyPromptHTML(model.get('related.copy')),
class: 'Modal-primaryButton',
hdr: strings.get('actions.COPY_WORKFLOW'),
hdr: strings.get('listActions.COPY', template.name),
});
} else {
Alert(strings.get('error.COPY'), strings.get('alert.NO_PERMISSION'));

3
awx/ui/test/e2e/tests/test-templates-copy-delete-warnings.js
View File

@ -201,7 +201,8 @@ module.exports = {
templates.expect.element(promptActionButton).enabled;
templates.expect.element(promptCloseButton).enabled;
templates.expect.element(promptHeader).text.contain('COPY WORKFLOW');
templates.expect.element(promptHeader).text.contain('COPY');
templates.expect.element(promptHeader).text.contain(`${data.workflow.name.toUpperCase()}`);
templates.expect.element(promptWarning).text.contain('Unified Job Templates');
templates.expect.element(promptWarning).text.contain(`${data.source.name}`);