External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02: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
parent a9b6d42af5 0a78bdcf28
commit c7cc05747f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,7 +270,7 @@ function ListTemplatesController(
actionText: strings.get('COPY'), actionText: strings.get('COPY'),
body: buildWorkflowCopyPromptHTML(model.get('related.copy')), body: buildWorkflowCopyPromptHTML(model.get('related.copy')),
class: 'Modal-primaryButton', class: 'Modal-primaryButton',
hdr: strings.get('actions.COPY_WORKFLOW'), hdr: strings.get('listActions.COPY', template.name),
}); });
} else { } else {
Alert(strings.get('error.COPY'), strings.get('alert.NO_PERMISSION')); 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(promptActionButton).enabled;
templates.expect.element(promptCloseButton).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('Unified Job Templates');
templates.expect.element(promptWarning).text.contain(`${data.source.name}`); templates.expect.element(promptWarning).text.contain(`${data.source.name}`);