shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-27 00:55:06 +03:00
Code Releases Activity

add UserTeamList tests

Browse Source
This commit is contained in:
Keith Grant 2020-05-22 11:05:32 -07:00
parent 1bb29ec5f7
commit 75fd703530
8 changed files with 134 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/api/models/Users.js
View File

@ -40,6 +40,10 @@ class Users extends Base {
params,
});
}
readTeamsOptions(userId) {
return this.http.options(`${this.baseUrl}${userId}/teams/`);
}
}
export default Users;

2
awx/ui_next/src/screens/Team/TeamList/TeamListItem.jsx
View File

@ -58,7 +58,7 @@ class TeamListItem extends React.Component {
<DataListCell key="organization">
{team.summary_fields.organization && (
<Fragment>
<b css="margin-right: 24px">{i18n._(t`Organization`)}</b>
<b>{i18n._(t`Organization`)}</b>{' '}
<Link
to={`/organizations/${team.summary_fields.organization.id}/details`}
>

2
awx/ui_next/src/screens/User/User.jsx
View File

@ -108,7 +108,7 @@ function User({ i18n, setBreadcrumb }) {
<UserOrganizations id={Number(match.params.id)} />
</Route>
<Route path="/users/:id/teams">
<UserTeams id={Number(match.params.id)} />
<UserTeams userId={Number(match.params.id)} />
</Route>
{user && (
<Route path="/users/:id/access">

6
awx/ui_next/src/screens/User/UserTeams/UserTeamsList.jsx → awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx
View File

@ -7,7 +7,7 @@ import PaginatedDataList from '../../../components/PaginatedDataList';
import useRequest from '../../../util/useRequest';
import { UsersAPI } from '../../../api';
import { getQSConfig, parseQueryString } from '../../../util/qs';
import UserTeamListItem from './UserTeamsListItem';
import UserTeamListItem from './UserTeamListItem';
const QS_CONFIG = getQSConfig('teams', {
page: 1,
@ -15,7 +15,7 @@ const QS_CONFIG = getQSConfig('teams', {
order_by: 'name',
});
function UserTeamsList({ i18n }) {
function UserTeamList({ i18n }) {
const location = useLocation();
const { id: userId } = useParams();
@ -67,4 +67,4 @@ function UserTeamsList({ i18n }) {
);
}
export default withI18n()(UserTeamsList);
export default withI18n()(UserTeamList);

82
awx/ui_next/src/screens/User/UserTeams/UserTeamList.test.jsx Normal file
View File

@ -0,0 +1,82 @@
import React from 'react';
import { act } from 'react-dom/test-utils';
import { UsersAPI } from '../../../api';
import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
import UserTeamList from './UserTeamList';
jest.mock('../../../api');
const mockAPIUserTeamList = {
data: {
count: 3,
results: [
{
name: 'Team 0',
id: 1,
url: '/teams/1',
summary_fields: {
user_capabilities: {
delete: true,
edit: true,
},
},
},
{
name: 'Team 1',
id: 2,
url: '/teams/2',
summary_fields: {
user_capabilities: {
delete: true,
edit: true,
},
},
},
{
name: 'Team 2',
id: 3,
url: '/teams/3',
summary_fields: {
user_capabilities: {
delete: true,
edit: true,
},
},
},
],
},
isModalOpen: false,
warningTitle: 'title',
warningMsg: 'message',
};
describe('<UserTeamList />', () => {
beforeEach(() => {
UsersAPI.readTeams = jest.fn(() =>
Promise.resolve({
data: mockAPIUserTeamList.data,
})
);
UsersAPI.readOptions = jest.fn(() =>
Promise.resolve({
data: {
actions: {
GET: {},
POST: {},
},
},
})
);
});
test('should load and render teams', async () => {
let wrapper;
await act(async () => {
wrapper = mountWithContexts(<UserTeamList />);
});
wrapper.update();
expect(wrapper.find('UserTeamListItem')).toHaveLength(3);
});
});

6
awx/ui_next/src/screens/User/UserTeams/UserTeamsListItem.jsx → awx/ui_next/src/screens/User/UserTeams/UserTeamListItem.jsx
View File

@ -9,7 +9,7 @@ import {
} from '@patternfly/react-core';
import DataListCell from '../../../components/DataListCell';
function UserTeamsListItem({ team, i18n }) {
function UserTeamListItem({ team, i18n }) {
return (
<DataListItem aria-labelledby={`team-${team.id}`}>
<DataListItemRow>
@ -23,7 +23,7 @@ function UserTeamsListItem({ team, i18n }) {
<DataListCell key="organization">
{team.summary_fields.organization && (
<>
<b css="margin-right: 24px">{i18n._(t`Organization`)}</b>
<b>{i18n._(t`Organization`)}</b>{' '}
<Link
to={`/organizations/${team.summary_fields.organization.id}/details`}
>
@ -40,4 +40,4 @@ function UserTeamsListItem({ team, i18n }) {
);
}
export default withI18n()(UserTeamsListItem);
export default withI18n()(UserTeamListItem);

38
awx/ui_next/src/screens/User/UserTeams/UserTeamListItem.test.jsx Normal file
View File

@ -0,0 +1,38 @@
import React from 'react';
import { MemoryRouter } from 'react-router-dom';
import { I18nProvider } from '@lingui/react';
import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
import UserTeamListItem from './UserTeamListItem';
describe('<UserTeamListItem />', () => {
test('should render item', () => {
const wrapper = mountWithContexts(
<I18nProvider>
<MemoryRouter initialEntries={['/teams']} initialIndex={0}>
<UserTeamListItem
team={{
id: 1,
name: 'Team 1',
description: 'something something team',
summary_fields: {
organization: {
id: 2,
name: 'The Org',
},
},
}}
detailUrl="/team/1"
isSelected
onSelect={() => {}}
/>
</MemoryRouter>
</I18nProvider>
);
const cells = wrapper.find('DataListCell');
expect(cells).toHaveLength(3);
expect(cells.at(0).text()).toEqual('Team 1');
expect(cells.at(1).text()).toEqual('Organization The Org');
expect(cells.at(2).text()).toEqual('something something team');
});
});

4
awx/ui_next/src/screens/User/UserTeams/UserTeams.jsx
View File

@ -1,6 +1,6 @@
import React from 'react';
import UserTeamsList from './UserTeamsList';
import UserTeamList from './UserTeamList';
export default function UserTeams() {
return <UserTeamsList />;
return <UserTeamList />;
}