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

Rename createInstanceGroups api method to associateInstanceGroup

Browse Source
This commit is contained in:
Marliana Lara 2019-02-22 14:47:25 -05:00
parent 92d3cb6dc4
commit b6eacbab86
No known key found for this signature in database
GPG Key ID: 38C73B40DFA809EE
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
View File

@ -71,7 +71,7 @@ describe('<OrganizationAdd />', () => {
test('Successful form submission triggers redirect', (done) => {
const onSuccess = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'onSuccess');
const mockedResp = { data: { id: 1, related: { instance_groups: '/bar' } } };
const api = { createOrganization: jest.fn().mockResolvedValue(mockedResp), createInstanceGroups: jest.fn().mockResolvedValue('done') };
const api = { createOrganization: jest.fn().mockResolvedValue(mockedResp), associateInstanceGroup: jest.fn().mockResolvedValue('done') };
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@ -131,10 +131,10 @@ describe('<OrganizationAdd />', () => {
}
}
});
const createInstanceGroupsFn = jest.fn().mockResolvedValue('done');
const associateInstanceGroupFn = jest.fn().mockResolvedValue('done');
const api = {
createOrganization: createOrganizationFn,
createInstanceGroups: createInstanceGroupsFn
associateInstanceGroup: associateInstanceGroupFn
};
const wrapper = mount(
<MemoryRouter>
@ -156,7 +156,7 @@ describe('<OrganizationAdd />', () => {
description: '',
name: 'mock org'
});
expect(createInstanceGroupsFn).toHaveBeenCalledWith('/api/v2/organizations/1/instance_groups', 1);
expect(associateInstanceGroupFn).toHaveBeenCalledWith('/api/v2/organizations/1/instance_groups', 1);
});
test('AnsibleSelect component renders if there are virtual environments', () => {

2
src/api.js
View File

@ -110,7 +110,7 @@ class APIClient {
return this.http.get(API_INSTANCE_GROUPS, { params });
}
createInstanceGroups (url, id) {
associateInstanceGroup (url, id) {
return this.http.post(url, { id });
}
}

2
src/pages/Organizations/screens/OrganizationAdd.jsx
View File

@ -61,7 +61,7 @@ class OrganizationAdd extends React.Component {
try {
if (instanceGroups.length > 0) {
instanceGroups.forEach(async (select) => {
await api.createInstanceGroups(instanceGroupsUrl, select.id);
await api.associateInstanceGroup(instanceGroupsUrl, select.id);
});
}
} catch (err) {