mirror of
https://github.com/bitsocialnet/5chan.git
synced 2026-08-03 07:41:04 +02:00
Merge branch 'codex/fix/short-publish-error'
This commit is contained in:
@@ -129,15 +129,16 @@ vi.mock('../../loading-ellipsis', () => ({
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock('../../error-display/error-display', () => ({
|
vi.mock('../../error-display/error-display', () => ({
|
||||||
default: ({ error, inline, showImmediately }: { error?: Error; inline?: boolean; showImmediately?: boolean }) =>
|
default: ({ displayMessage, error, inline, showImmediately }: { displayMessage?: string; error?: Error; inline?: boolean; showImmediately?: boolean }) =>
|
||||||
createElement(
|
createElement(
|
||||||
'button',
|
'button',
|
||||||
{
|
{
|
||||||
|
'data-display-message': displayMessage,
|
||||||
'data-testid': 'error-display',
|
'data-testid': 'error-display',
|
||||||
'data-inline': String(Boolean(inline)),
|
'data-inline': String(Boolean(inline)),
|
||||||
'data-show-immediately': String(Boolean(showImmediately)),
|
'data-show-immediately': String(Boolean(showImmediately)),
|
||||||
},
|
},
|
||||||
error?.message || String(error),
|
displayMessage || error?.message || String(error),
|
||||||
),
|
),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
@@ -420,7 +421,8 @@ describe('CommentContent', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const errorDisplay = container.querySelector('[data-testid="error-display"]');
|
const errorDisplay = container.querySelector('[data-testid="error-display"]');
|
||||||
expect(errorDisplay?.textContent).toBe('spam blocker server error');
|
expect(errorDisplay?.textContent).toBe('Error');
|
||||||
|
expect(errorDisplay?.getAttribute('data-display-message')).toBe('Error');
|
||||||
expect(errorDisplay?.getAttribute('data-inline')).toBe('true');
|
expect(errorDisplay?.getAttribute('data-inline')).toBe('true');
|
||||||
expect(errorDisplay?.getAttribute('data-show-immediately')).toBe('true');
|
expect(errorDisplay?.getAttribute('data-show-immediately')).toBe('true');
|
||||||
expect(container.querySelector('[data-testid="loading-ellipsis"]')).toBeNull();
|
expect(container.querySelector('[data-testid="loading-ellipsis"]')).toBeNull();
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ const CommentContent = ({ comment: post, prependContent }: { comment: Comment; p
|
|||||||
const loadingString = (
|
const loadingString = (
|
||||||
<div className={styles.stateString}>
|
<div className={styles.stateString}>
|
||||||
{failedError ? (
|
{failedError ? (
|
||||||
<ErrorDisplay error={failedError} inline={true} showImmediately={true} />
|
<ErrorDisplay error={failedError} displayMessage={capitalize(t('error'))} inline={true} showImmediately={true} />
|
||||||
) : !hasFailedState ? (
|
) : !hasFailedState ? (
|
||||||
<LoadingEllipsis string={stateString || t('loading')} />
|
<LoadingEllipsis string={stateString || t('loading')} />
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
Reference in New Issue
Block a user