Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions packages/ui/src/elements/Toasts/fieldErrors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,15 @@ export function FieldErrorsToast({ errorMessage }) {
<div>
{message}
{Array.isArray(errors) && errors.length > 0 ? (
<ul data-testid="field-errors">
{errors.map((error, index) => {
return <li key={index}>{error}</li>
})}
</ul>
errors.length === 1 ? (
<span data-testid="field-error">{errors[0]}</span>
) : (
<ul data-testid="field-errors">
{errors.map((error, index) => {
return <li key={index}>{error}</li>
})}
</ul>
)
) : null}
</div>
)
Expand Down
31 changes: 18 additions & 13 deletions test/helpers/assertToastErrors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,24 @@ export async function assertToastErrors({
errors: string[]
page: Page
}): Promise<void> {
const message =
errors.length === 1
? 'The following field is invalid:'
: `The following fields are invalid (${errors.length}):`
await expect(
page.locator('.payload-toast-container li').filter({ hasText: message }),
).toBeVisible()
for (let i = 0; i < errors.length; i++) {
const error = errors[i]
if (error) {
await expect(
page.locator('.payload-toast-container [data-testid="field-errors"] li').nth(i),
).toHaveText(error)
const isSingleError = errors.length === 1
const message = isSingleError
? 'The following field is invalid:'
: `The following fields are invalid (${errors.length}):`

// Check the intro message text
await expect(page.locator('.payload-toast-container')).toContainText(message)

// Check single error
if (isSingleError) {
await expect(page.locator('.payload-toast-container [data-testid="field-error"]')).toHaveText(
errors[0]!,
)
} else {
// Check multiple errors
const errorItems = page.locator('.payload-toast-container [data-testid="field-errors"] li')
for (let i = 0; i < errors.length; i++) {
await expect(errorItems.nth(i)).toHaveText(errors[i]!)
}
}

Expand Down
Loading