feat: add task assignment
This commit is contained in:
@ -22,6 +22,7 @@ const tasks = [
|
||||
description: 'Bottenvåningen',
|
||||
status: 'WAITING',
|
||||
points: 7,
|
||||
assignee: null,
|
||||
createdAt: '2026-07-24T10:00:00Z',
|
||||
},
|
||||
{
|
||||
@ -30,6 +31,7 @@ const tasks = [
|
||||
description: null,
|
||||
status: 'IN_PROGRESS',
|
||||
points: 3,
|
||||
assignee: { id: users[1].id, name: users[1].name },
|
||||
createdAt: '2026-07-24T10:01:00Z',
|
||||
},
|
||||
{
|
||||
@ -38,6 +40,7 @@ const tasks = [
|
||||
description: null,
|
||||
status: 'COMPLETED',
|
||||
points: 5,
|
||||
assignee: null,
|
||||
createdAt: '2026-07-24T10:02:00Z',
|
||||
},
|
||||
]
|
||||
@ -193,6 +196,13 @@ test('Ny uppgift öppnar modalen med fokus i titelfältet', async () => {
|
||||
expect(screen.getByRole('dialog', { name: 'Skapa ny uppgift' })).toBeInTheDocument()
|
||||
expect(screen.getByLabelText('Titel')).toHaveFocus()
|
||||
expect(screen.getByLabelText('Poäng')).toHaveValue(1)
|
||||
expect(screen.getByLabelText('Tilldela')).toHaveValue('')
|
||||
expect(within(screen.getByLabelText('Tilldela')).getByRole('option', { name: 'Ingen' }))
|
||||
.toBeInTheDocument()
|
||||
expect(within(screen.getByLabelText('Tilldela')).getByRole('option', { name: 'Urban' }))
|
||||
.toBeInTheDocument()
|
||||
expect(within(screen.getByLabelText('Tilldela')).getByRole('option', { name: 'Anna' }))
|
||||
.toBeInTheDocument()
|
||||
})
|
||||
|
||||
test.each([
|
||||
@ -246,6 +256,7 @@ test('en skapad uppgift visas längst ned i Väntande och modalen stängs', asyn
|
||||
description: 'Köket',
|
||||
status: 'WAITING',
|
||||
points: 7,
|
||||
assignee: { id: users[1].id, name: users[1].name },
|
||||
createdAt: '2026-07-24T10:03:00Z',
|
||||
}
|
||||
window.localStorage.setItem('hemhub.activeUserId', users[0].id)
|
||||
@ -263,6 +274,7 @@ test('en skapad uppgift visas längst ned i Väntande och modalen stängs', asyn
|
||||
target: { value: ' Köket ' },
|
||||
})
|
||||
fireEvent.change(screen.getByLabelText('Poäng'), { target: { value: '7' } })
|
||||
fireEvent.change(screen.getByLabelText('Tilldela'), { target: { value: users[1].id } })
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Skapa uppgift' }))
|
||||
|
||||
await waitFor(() =>
|
||||
@ -270,17 +282,148 @@ test('en skapad uppgift visas längst ned i Väntande och modalen stängs', asyn
|
||||
)
|
||||
const waiting = screen.getByRole('region', { name: 'Väntande' })
|
||||
expect(within(waiting).getAllByRole('article').map((card) => card.textContent)).toEqual([
|
||||
'Dammsuga7 pBottenvåningen',
|
||||
'Putsa fönster7 pKöket',
|
||||
'Dammsuga7 pBottenvåningenTa uppgift',
|
||||
'Putsa fönster7 pKöketAnna',
|
||||
])
|
||||
expect(fetchMock).toHaveBeenLastCalledWith('/api/tasks', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ title: 'Putsa fönster', description: 'Köket', points: 7 }),
|
||||
body: JSON.stringify({
|
||||
title: 'Putsa fönster',
|
||||
description: 'Köket',
|
||||
points: 7,
|
||||
assigneeId: users[1].id,
|
||||
}),
|
||||
})
|
||||
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Ny uppgift' }))
|
||||
expect(screen.getByLabelText('Poäng')).toHaveValue(1)
|
||||
expect(screen.getByLabelText('Tilldela')).toHaveValue('')
|
||||
})
|
||||
|
||||
test('Ingen skickas som null när en uppgift skapas', async () => {
|
||||
const createdTask = {
|
||||
...tasks[0],
|
||||
id: '00000000-0000-0000-0000-000000000010',
|
||||
title: 'Torka bordet',
|
||||
}
|
||||
window.localStorage.setItem('hemhub.activeUserId', users[0].id)
|
||||
const fetchMock = vi.spyOn(globalThis, 'fetch')
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse(users))
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse([]))
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse(createdTask, 201))
|
||||
render(<App />)
|
||||
|
||||
await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2))
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Ny uppgift' }))
|
||||
fireEvent.change(screen.getByLabelText('Titel'), { target: { value: 'Torka bordet' } })
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Skapa uppgift' }))
|
||||
|
||||
await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(3))
|
||||
expect(fetchMock).toHaveBeenLastCalledWith('/api/tasks', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
title: 'Torka bordet',
|
||||
description: null,
|
||||
points: 1,
|
||||
assigneeId: null,
|
||||
}),
|
||||
})
|
||||
})
|
||||
|
||||
test('kort visar ansvarig och endast väntande uppgifter har redigerbar kontroll', async () => {
|
||||
window.localStorage.setItem('hemhub.activeUserId', users[0].id)
|
||||
mockUsersAndTasks(users, tasks)
|
||||
render(<App />)
|
||||
|
||||
const waitingCard = (await screen.findByText('Dammsuga')).closest('article')
|
||||
const inProgressCard = screen.getByText('Diska').closest('article')
|
||||
const completedCard = screen.getByText('Vattna blommor').closest('article')
|
||||
|
||||
expect(waitingCard).not.toBeNull()
|
||||
expect(inProgressCard).not.toBeNull()
|
||||
expect(completedCard).not.toBeNull()
|
||||
expect(within(waitingCard!).getByRole('button', { name: 'Ändra ansvarig för Dammsuga' }))
|
||||
.toHaveTextContent('Ta uppgift')
|
||||
expect(within(inProgressCard!).getByText('Anna')).toBeInTheDocument()
|
||||
expect(within(inProgressCard!).queryByRole('button', { name: /ansvarig/i })).not.toBeInTheDocument()
|
||||
expect(within(completedCard!).getByText('Otilldelad')).toBeInTheDocument()
|
||||
})
|
||||
|
||||
test('val av ansvarig anropar endpointen och uppdaterar kortet efter svar', async () => {
|
||||
const updatedTask = { ...tasks[0], assignee: { id: users[1].id, name: users[1].name } }
|
||||
let resolveAssignment!: (response: Response) => void
|
||||
const assignmentResponse = new Promise<Response>((resolve) => {
|
||||
resolveAssignment = resolve
|
||||
})
|
||||
window.localStorage.setItem('hemhub.activeUserId', users[0].id)
|
||||
const fetchMock = vi.spyOn(globalThis, 'fetch')
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse(users))
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse([tasks[0]]))
|
||||
fetchMock.mockReturnValueOnce(assignmentResponse)
|
||||
render(<App />)
|
||||
|
||||
fireEvent.click(await screen.findByRole('button', { name: 'Ändra ansvarig för Dammsuga' }))
|
||||
const select = screen.getByRole('combobox', { name: 'Ansvarig för Dammsuga' })
|
||||
fireEvent.change(select, { target: { value: users[1].id } })
|
||||
|
||||
expect(select).toBeDisabled()
|
||||
expect(fetchMock).toHaveBeenLastCalledWith(`/api/tasks/${tasks[0].id}/assignee`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ assigneeId: users[1].id }),
|
||||
})
|
||||
|
||||
resolveAssignment(jsonResponse(updatedTask))
|
||||
await waitFor(() =>
|
||||
expect(screen.getByRole('button', { name: 'Ändra ansvarig för Dammsuga' }))
|
||||
.toHaveTextContent('Anna'),
|
||||
)
|
||||
expect(screen.queryByRole('combobox', { name: 'Ansvarig för Dammsuga' })).not.toBeInTheDocument()
|
||||
})
|
||||
|
||||
test('val av Ingen av-tilldelar en väntande uppgift', async () => {
|
||||
const assignedTask = { ...tasks[0], assignee: { id: users[1].id, name: users[1].name } }
|
||||
const unassignedTask = { ...assignedTask, assignee: null }
|
||||
window.localStorage.setItem('hemhub.activeUserId', users[0].id)
|
||||
const fetchMock = vi.spyOn(globalThis, 'fetch')
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse(users))
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse([assignedTask]))
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse(unassignedTask))
|
||||
render(<App />)
|
||||
|
||||
fireEvent.click(await screen.findByRole('button', { name: 'Ändra ansvarig för Dammsuga' }))
|
||||
fireEvent.change(screen.getByRole('combobox', { name: 'Ansvarig för Dammsuga' }), {
|
||||
target: { value: '' },
|
||||
})
|
||||
|
||||
await screen.findByText('Ta uppgift')
|
||||
expect(fetchMock).toHaveBeenLastCalledWith(`/api/tasks/${tasks[0].id}/assignee`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ assigneeId: null }),
|
||||
})
|
||||
})
|
||||
|
||||
test('misslyckad tilldelning behåller ansvarig och visar fel', async () => {
|
||||
const assignedTask = { ...tasks[0], assignee: { id: users[1].id, name: users[1].name } }
|
||||
window.localStorage.setItem('hemhub.activeUserId', users[0].id)
|
||||
const fetchMock = vi.spyOn(globalThis, 'fetch')
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse(users))
|
||||
fetchMock.mockResolvedValueOnce(jsonResponse([assignedTask]))
|
||||
fetchMock.mockResolvedValueOnce(
|
||||
jsonResponse({ code: 'USER_NOT_FOUND', message: 'Användaren finns inte.' }, 404),
|
||||
)
|
||||
render(<App />)
|
||||
|
||||
fireEvent.click(await screen.findByRole('button', { name: 'Ändra ansvarig för Dammsuga' }))
|
||||
fireEvent.change(screen.getByRole('combobox', { name: 'Ansvarig för Dammsuga' }), {
|
||||
target: { value: users[0].id },
|
||||
})
|
||||
|
||||
expect(await screen.findByRole('alert')).toHaveTextContent('Användaren finns inte.')
|
||||
expect(screen.getByRole('combobox', { name: 'Ansvarig för Dammsuga' })).toHaveValue(users[1].id)
|
||||
})
|
||||
|
||||
test.each([
|
||||
@ -321,9 +464,11 @@ test('formulärdata bevaras när skapande av uppgift misslyckas', async () => {
|
||||
const title = screen.getByLabelText('Titel')
|
||||
const description = screen.getByLabelText('Beskrivning (valfri)')
|
||||
const points = screen.getByLabelText('Poäng')
|
||||
const assignee = screen.getByLabelText('Tilldela')
|
||||
fireEvent.change(title, { target: { value: 'Dammsuga' } })
|
||||
fireEvent.change(description, { target: { value: 'Bottenvåningen' } })
|
||||
fireEvent.change(points, { target: { value: '7' } })
|
||||
fireEvent.change(assignee, { target: { value: users[1].id } })
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Skapa uppgift' }))
|
||||
|
||||
expect(await screen.findByRole('alert')).toHaveTextContent('Uppgiften är ogiltig.')
|
||||
@ -331,6 +476,7 @@ test('formulärdata bevaras när skapande av uppgift misslyckas', async () => {
|
||||
expect(title).toHaveValue('Dammsuga')
|
||||
expect(description).toHaveValue('Bottenvåningen')
|
||||
expect(points).toHaveValue(7)
|
||||
expect(assignee).toHaveValue(users[1].id)
|
||||
})
|
||||
|
||||
function mockUsersAndTasks(userResponse: unknown, taskResponse: unknown) {
|
||||
|
||||
Reference in New Issue
Block a user