External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update e2e tests after rebasing

Browse Source
This commit is contained in:
gconsidine
2017-09-19 11:36:56 -04:00
parent 777ef3fe90
commit fad12e3a13
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/lib/components/form/form.directive.js
View File

@@ -138,21 +138,21 @@ function AtFormController (eventService, strings) {
vm.setValidationMessages = (errors, errorSet) => { vm.setValidationMessages = (errors, errorSet) => {
let errorMessageSet = errorSet || false; let errorMessageSet = errorSet || false;
Object.keys(errors).forEach(error => { Object.keys(errors).forEach(id => {
if (!Array.isArray(error) && typeof error === 'object') { if (!Array.isArray(errors[id]) && typeof errors[id] === 'object') {
errorMessageSet = vm.setValidationMessages(error, errorMessageSet); errorMessageSet = vm.setValidationMessages(errors[id], errorMessageSet);
return; return;
} }
vm.components vm.components
.filter(component => component.category === 'input') .filter(component => component.category === 'input')
.filter(component => error[component.state.id]) .filter(component => errors[component.state.id])
.forEach(component => { .forEach(component => {
errorMessageSet = true; errorMessageSet = true;
component.state._rejected = true; component.state._rejected = true;
component.state._message = error[component.state.id].join(' '); component.state._message = errors[component.state.id].join(' ');
}); });
}); });

4
awx/ui/client/lib/components/modal/modal.directive.js
View File

@@ -30,12 +30,10 @@ function AtModalController (eventService, strings) {
vm.modal.hide = vm.hide; vm.modal.hide = vm.hide;
}; };
vm.show = (title, message, event) => { vm.show = (title, message) => {
vm.modal.title = title; vm.modal.title = title;
vm.modal.message = message; vm.modal.message = message;
event.stopPropagation();
listeners = eventService.addListeners([ listeners = eventService.addListeners([
[window, 'click', vm.clickToHide] [window, 'click', vm.clickToHide]
]); ]);

9
awx/ui/client/test/e2e/.babelrc Normal file
View File

@@ -0,0 +1,9 @@
{
"presets": [
["env", {
"targets": {
"node": 6
}
}]
]
}

2
awx/ui/client/test/e2e/runner.js
View File

@@ -1,3 +1,3 @@
#!/usr/bin/env node #!/usr/bin/env node
require('babel-register'); require('babel-core/register');
require('nightwatch/bin/runner.js'); require('nightwatch/bin/runner.js');

2
awx/ui/package.json
View File

@@ -79,8 +79,8 @@
"less-plugin-autoprefix": "^1.4.2", "less-plugin-autoprefix": "^1.4.2",
"load-grunt-configs": "^1.0.0", "load-grunt-configs": "^1.0.0",
"load-grunt-tasks": "^3.5.0", "load-grunt-tasks": "^3.5.0",
"nightwatch": "^0.9.16",
"ngtemplate-loader": "^2.0.1", "ngtemplate-loader": "^2.0.1",
"nightwatch": "^0.9.16",
"phantomjs-prebuilt": "^2.1.12", "phantomjs-prebuilt": "^2.1.12",
"script-loader": "^0.7.0", "script-loader": "^0.7.0",
"style-loader": "^0.18.2", "style-loader": "^0.18.2",