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

Check for null resource and update e2e model usage

Browse Source
This commit is contained in:
gconsidine
2017-11-10 15:59:38 -05:00
parent 5fcff09aae
commit aa38c1123c
9 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/lib/models/Base.js
View File

@@ -447,13 +447,17 @@ function parseRequestConfig (method, resource, config) {
if (Array.isArray(method)) { if (Array.isArray(method)) {
if (Array.isArray(resource)) { if (Array.isArray(resource)) {
req.resource = resource; req.resource = resource;
} else if (resource === null) {
req.resource = undefined;
} else if (typeof resource === 'object') { } else if (typeof resource === 'object') {
req = resource; req = resource;
} }
req.method = method; req.method = method;
} else if (typeof method === 'string') { } else if (typeof method === 'string') {
if (typeof resource === 'object') { if (resource === null) {
req.resource = undefined;
} else if (typeof resource === 'object') {
req = resource; req = resource;
} else { } else {
req.resource = resource; req.resource = resource;
@@ -465,7 +469,7 @@ function parseRequestConfig (method, resource, config) {
} else { } else {
req = config; req = config;
req.method = method; req.method = method;
req.resource = resource; req.resource = resource === null ? undefined : resource;
} }
return req; return req;

2
awx/ui/test/e2e/tests/test-credentials-add-edit-aws.js
View File

@@ -20,7 +20,7 @@ module.exports = {
client.inject( client.inject(
[store, 'OrganizationModel'], [store, 'OrganizationModel'],
(_store_, Model) => new Model().http.post(_store_.organization), (_store_, Model) => new Model().http.post({ data: _store_.organization }),
({ data }) => { store.organization = data; } ({ data }) => { store.organization = data; }
); );

2
awx/ui/test/e2e/tests/test-credentials-add-edit-custom.js
View File

@@ -92,7 +92,7 @@ module.exports = {
client.inject( client.inject(
[store.credentialType, 'CredentialTypeModel'], [store.credentialType, 'CredentialTypeModel'],
(data, Model) => new Model().http.post(data), (data, Model) => new Model().http.post({ data }),
({ data }) => { store.credentialType.response = data; } ({ data }) => { store.credentialType.response = data; }
); );

2
awx/ui/test/e2e/tests/test-credentials-add-edit-gce.js
View File

@@ -23,7 +23,7 @@ module.exports = {
client.inject( client.inject(
[store, 'OrganizationModel'], [store, 'OrganizationModel'],
(_store_, Model) => new Model().http.post(_store_.organization), (_store_, Model) => new Model().http.post({ data: _store_.organization }),
({ data }) => { store.organization = data; } ({ data }) => { store.organization = data; }
); );

2
awx/ui/test/e2e/tests/test-credentials-add-edit-insights.js
View File

@@ -23,7 +23,7 @@ module.exports = {
client.inject( client.inject(
[store, 'OrganizationModel'], [store, 'OrganizationModel'],
(_store_, Model) => new Model().http.post(_store_.organization), (_store_, Model) => new Model().http.post({ data: _store_.organization }),
({ data }) => { store.organization = data; } ({ data }) => { store.organization = data; }
); );

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

@@ -23,7 +23,7 @@ module.exports = {
client.inject( client.inject(
[store, 'OrganizationModel'], [store, 'OrganizationModel'],
(_store_, Model) => new Model().http.post(_store_.organization), (_store_, Model) => new Model().http.post({ data: _store_.organization }),
({ data }) => { store.organization = data; } ({ data }) => { store.organization = data; }
); );

2
awx/ui/test/e2e/tests/test-credentials-add-edit-network.js
View File

@@ -23,7 +23,7 @@ module.exports = {
client.inject( client.inject(
[store, 'OrganizationModel'], [store, 'OrganizationModel'],
(_store_, Model) => new Model().http.post(_store_.organization), (_store_, Model) => new Model().http.post({ data: _store_.organization }),
({ data }) => { store.organization = data; } ({ data }) => { store.organization = data; }
); );

2
awx/ui/test/e2e/tests/test-credentials-add-edit-scm.js
View File

@@ -23,7 +23,7 @@ module.exports = {
client.inject( client.inject(
[store, 'OrganizationModel'], [store, 'OrganizationModel'],
(_store_, Model) => new Model().http.post(_store_.organization), (_store_, Model) => new Model().http.post({ data: _store_.organization }),
({ data }) => { store.organization = data; } ({ data }) => { store.organization = data; }
); );

2
awx/ui/test/e2e/tests/test-credentials-add-edit-vault.js
View File

@@ -23,7 +23,7 @@ module.exports = {
client.inject( client.inject(
[store, 'OrganizationModel'], [store, 'OrganizationModel'],
(_store_, Model) => new Model().http.post(_store_.organization), (_store_, Model) => new Model().http.post({ data: _store_.organization }),
({ data }) => { store.organization = data; } ({ data }) => { store.organization = data; }
); );