From 282f03efe9f5debd901e654e01297118bfcd71af Mon Sep 17 00:00:00 2001 From: Prabhat Khera Date: Tue, 26 Sep 2023 11:38:00 +1300 Subject: [PATCH] fix tests --- .../AccessControlPaneDetails.test.tsx | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/react/portainer/access-control/AccessControlPanel/AccessControlPaneDetails.test.tsx b/app/react/portainer/access-control/AccessControlPanel/AccessControlPaneDetails.test.tsx index 9970da4d9..907a24e2c 100644 --- a/app/react/portainer/access-control/AccessControlPanel/AccessControlPaneDetails.test.tsx +++ b/app/react/portainer/access-control/AccessControlPanel/AccessControlPaneDetails.test.tsx @@ -27,20 +27,20 @@ test.each([ const resourceControl = buildViewModel(ownership); const { queryByLabelText } = await renderComponent( ResourceControlType.Container, - resourceControl + resourceControl, ); expect(queryByLabelText('ownership')).toHaveTextContent(ownership); - } + }, ); test('when resource control is not supplied, show administrators', async () => { const { queryByLabelText } = await renderComponent( - ResourceControlType.Container + ResourceControlType.Container, ); expect(queryByLabelText('ownership')).toHaveTextContent( - ResourceControlOwnership.ADMINISTRATORS + ResourceControlOwnership.ADMINISTRATORS, ); }); @@ -71,19 +71,19 @@ for (let i = 0; i < inheritanceTests.length; i += 1) { test(`when resource is ${ResourceControlType[resourceType]} and resource control is ${ResourceControlType[parentType]}, show message`, async () => { const resourceControl = buildViewModel( ResourceControlOwnership.ADMINISTRATORS, - parentType + parentType, ); const { queryByLabelText } = await renderComponent( resourceType, - resourceControl + resourceControl, ); const inheritanceMessage = queryByLabelText('inheritance-message'); expect(inheritanceMessage).toBeVisible(); }); } -test('when resource is limited to specific users, show comma separated list of their names', async () => { +test('when resource is limited to specific users, show number of users', async () => { const users = createMockUsers(10, Role.Standard); server.use(rest.get('/api/users', (req, res, ctx) => res(ctx.json(users)))); @@ -96,18 +96,18 @@ test('when resource is limited to specific users, show comma separated list of t restrictedToUsers.map((user) => ({ UserId: user.Id, AccessLevel: 1, - })) + })), ); const { queryByText, findByLabelText } = await renderComponent( undefined, - resourceControl + resourceControl, ); expect(queryByText(/Authorized users/)).toBeVisible(); await expect(findByLabelText('authorized-users')).resolves.toHaveTextContent( - restrictedToUsers.map((user) => user.Username).join(', ') + `${restrictedToUsers.length} users`, ); }); @@ -125,28 +125,28 @@ test('when resource is limited to specific teams, show comma separated list of t restrictedToTeams.map((team) => ({ TeamId: team.Id, AccessLevel: 1, - })) + })), ); const { queryByText, findByLabelText } = await renderComponent( undefined, - resourceControl + resourceControl, ); expect(queryByText(/Authorized teams/)).toBeVisible(); await expect(findByLabelText('authorized-teams')).resolves.toHaveTextContent( - restrictedToTeams.map((team) => team.Name).join(', ') + restrictedToTeams.map((team) => team.Name).join(', '), ); }); async function renderComponent( resourceType: ResourceControlType = ResourceControlType.Container, - resourceControl?: ResourceControlViewModel + resourceControl?: ResourceControlViewModel, ) { const WithUser = withUserProvider(AccessControlPanelDetails); const queries = renderWithQueryClient( - + , ); await expect(queries.findByText('Ownership')).resolves.toBeVisible(); @@ -157,7 +157,7 @@ function buildViewModel( ownership: ResourceControlOwnership, type: ResourceControlType = ResourceControlType.Config, users: UserResourceAccess[] = [], - teams: TeamResourceAccess[] = [] + teams: TeamResourceAccess[] = [], ): ResourceControlViewModel { return { Id: 0,