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

Refactor Access List.

Browse Source 
- Derive Team Roles without making extra API call.
- Consistent variable naming convention use camelCase.
- More informative error display.
This commit is contained in:
Kia Lam
2019-03-01 10:12:36 -05:00
parent a3a80bc23e
commit bf7e6201a2
5 changed files with 62 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
__tests__/components/AccessList.test.jsx
View File

@@ -31,19 +31,6 @@ const mockUserRoles = [
}
];
const mockUserTeams = [
{
id: 3,
}
];
const mockTeamRoles = [
{
id: 4,
name: 'baz',
}
];
describe('<AccessList />', () => {
test('initially renders succesfully', () => {
mount(
@@ -54,8 +41,6 @@ describe('<AccessList />', () => {
location={{ search: '', pathname: '/organizations/1/access' }}
getAccessList={() => {}}
getUserRoles={() => {}}
getUserTeams={() => {}}
getTeamRoles={() => {}}
/>
</MemoryRouter>
</I18nProvider>
@@ -71,8 +56,6 @@ describe('<AccessList />', () => {
location={{ search: '', pathname: '/organizations/1/access' }}
getAccessList={() => ({ data: { count: 1, results: mockResults } })}
getUserRoles={() => ({ data: { results: mockUserRoles } })}
getUserTeams={() => ({ data: { results: mockUserTeams } })}
getTeamRoles={() => ({ data: { results: mockTeamRoles } })}
/>
</MemoryRouter>
</I18nProvider>
@@ -95,8 +78,6 @@ describe('<AccessList />', () => {
location={{ search: '', pathname: '/organizations/1/access' }}
getAccessList={() => ({ data: { count: 1, results: mockResults } })}
getUserRoles={() => ({ data: { results: mockUserRoles } })}
getUserTeams={() => ({ data: { results: mockUserTeams } })}
getTeamRoles={() => ({ data: { results: mockTeamRoles } })}
/>
</MemoryRouter>
</I18nProvider>
@@ -124,8 +105,6 @@ describe('<AccessList />', () => {
location={{ search: '', pathname: '/organizations/1/access' }}
getAccessList={() => ({ data: { count: 1, results: mockResults } })}
getUserRoles={() => ({ data: { results: mockUserRoles } })}
getUserTeams={() => ({ data: { results: mockUserTeams } })}
getTeamRoles={() => ({ data: { results: mockTeamRoles } })}
/>
</MemoryRouter>
</I18nProvider>

22
__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx
View File

@@ -10,12 +10,6 @@ const mockAPIAccessList = {
const mockAPIRoles = {
bar: 'baz',
};
const mockAPITeams = {
qux: 'quux',
};
const mockAPITeamRoles = {
quuz: 'quuz',
};
const mockGetOrganzationAccessList = jest.fn(() => (
Promise.resolve(mockAPIAccessList)
@@ -25,14 +19,6 @@ const mockGetUserRoles = jest.fn(() => (
Promise.resolve(mockAPIRoles)
));
const mockGetUserTeams = jest.fn(() => (
Promise.resolve(mockAPITeams)
));
const mockGetTeamRoles = jest.fn(() => (
Promise.resolve(mockAPITeamRoles)
));
describe('<OrganizationAccess />', () => {
test('initially renders succesfully', () => {
mount(
@@ -44,8 +30,6 @@ describe('<OrganizationAccess />', () => {
api={{
getOrganzationAccessList: jest.fn(),
getUserRoles: jest.fn(),
getUserTeams: jest.fn(),
getTeamRoles: jest.fn(),
}}
/>
</MemoryRouter>
@@ -62,8 +46,6 @@ describe('<OrganizationAccess />', () => {
api={{
getOrganzationAccessList: mockGetOrganzationAccessList,
getUserRoles: mockGetUserRoles,
getUserTeams: mockGetUserTeams,
getTeamRoles: mockGetTeamRoles,
}}
/>
</MemoryRouter>
@@ -72,9 +54,5 @@ describe('<OrganizationAccess />', () => {
expect(accessList).toEqual(mockAPIAccessList);
const userRoles = await wrapper.instance().getUserRoles();
expect(userRoles).toEqual(mockAPIRoles);
const userTeams = await wrapper.instance().getUserTeams();
expect(userTeams).toEqual(mockAPITeams);
const teamRoles = await wrapper.instance().getTeamRoles();
expect(teamRoles).toEqual(mockAPITeamRoles);
});
});