refactor(app/tests): Make createMockUsers more deterministic [r8s-406] (#887)

pull/12512/merge
James Player 2025-07-14 17:16:33 +12:00 committed by GitHub
parent db2e168540
commit 9f906b7417
5 changed files with 40 additions and 11 deletions

View File

@ -10,7 +10,7 @@ import {
export function createMockUsers(
count: number,
roles: Role | Role[] | ((id: UserId) => Role) = () => _.random(1, 3)
roles: Role | Role[] | ((id: UserId) => Role)
): User[] {
return _.range(1, count + 1).map((value) => ({
Id: value,
@ -40,7 +40,14 @@ function getRoles(
return roles;
}
return roles[id];
// Roles is an array
if (roles.length === 0) {
throw new Error('No roles provided');
}
// The number of roles is not necessarily the same length as the number of users
// so we need to distribute the roles evenly and consistently
return roles[(id - 1) % roles.length];
}
export function createMockTeams(count: number): Team[] {

View File

@ -2,7 +2,7 @@ import { Meta } from '@storybook/react';
import { useMemo, useState } from 'react';
import { createMockUsers } from '@/react-tools/test-mocks';
import { Role, User } from '@/portainer/users/types';
import { Role } from '@/portainer/users/types';
import { UserViewModel } from '@/portainer/models/user';
import { UserContext } from '@/react/hooks/useUser';
@ -28,7 +28,7 @@ function Example({ userRole }: Args) {
() => ({ user: new UserViewModel({ Role: userRole }) }),
[userRole]
);
const [users] = useState(createMockUsers(20) as User[]);
const [users] = useState(createMockUsers(20, Role.Standard));
const [memberships] = useState<Omit<TeamMembership, 'Id' | 'TeamID'>[]>(
users

View File

@ -28,7 +28,7 @@ function Example({ userRole }: Args) {
[userRole]
);
const [users] = useState(createMockUsers(20));
const [users] = useState(createMockUsers(20, Role.Standard));
const [roles] = useState(
Object.fromEntries(
users.map((user) => [

View File

@ -1,6 +1,10 @@
import { Meta } from '@storybook/react';
import { useMemo } from 'react';
import { createMockUsers } from '@/react-tools/test-mocks';
import { Role } from '@/portainer/users/types';
import { UserContext } from '@/react/hooks/useUser';
import { UserViewModel } from '@/portainer/models/user';
import { UsersList } from './UsersList';
@ -13,10 +17,25 @@ export default meta;
export { Example };
function Example() {
const users = createMockUsers(20);
return <UsersList users={users} teamId={3} />;
interface Args {
userRole: Role;
}
Example.args = {};
function Example({ userRole }: Args) {
const userProviderState = useMemo(
() => ({ user: new UserViewModel({ Role: userRole }) }),
[userRole]
);
const users = createMockUsers(20, Role.Standard);
return (
<UserContext.Provider value={userProviderState}>
<UsersList users={users} teamId={3} />
</UserContext.Provider>
);
}
Example.args = {
userRole: Role.Admin,
};

View File

@ -2,9 +2,12 @@ import { http, HttpResponse } from 'msw';
import { TeamMembership } from '@/react/portainer/users/teams/types';
import { createMockUsers } from '@/react-tools/test-mocks';
import { Role } from '@/portainer/users/types';
export const userHandlers = [
http.get('/api/users', async () => HttpResponse.json(createMockUsers(10))),
http.get('/api/users', async () =>
HttpResponse.json(createMockUsers(10, Role.Standard))
),
http.get<never, never, TeamMembership[]>(
'/api/users/:userId/memberships',
() => HttpResponse.json([])