Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-27 22:49:56 -05:00
Code Issues Activity

Fixed tests

Browse source
This commit is contained in:
Ronald Langeveld 2024-10-21 16:25:36 +09:00
parent d41ce80e4a
commit a45c53cce7
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/comments-ui/src/components/content/Content.tsx
View file

@ -41,7 +41,7 @@ const Content = () => {
const isPaidOnly = commentsEnabled === 'paid';
const isPaidMember = member && !!member.paid;
const showCTA = !member || (isPaidOnly && !isPaidMember);
// const showCTA = !member || (isPaidOnly && !isPaidMember);
const hasOpenReplyForms = secundaryFormCount > 0;
return (
@ -49,7 +49,7 @@ const Content = () => {
<>
<ContentTitle count={commentCount} showCount={showCount} title={title}/>
<div>
{member ? (isPaidMember || !paidOnly ? <MainForm commentsCount={commentCount} /> : <CTABox isFirst={pagination?.total === 0} isPaid={paidOnly} />) : <CTABox isFirst={pagination?.total === 0} isPaid={paidOnly} />}
{member ? (isPaidMember || !isPaidOnly ? <MainForm commentsCount={commentCount} /> : <CTABox isFirst={pagination?.total === 0} isPaid={isPaidOnly} />) : <CTABox isFirst={pagination?.total === 0} isPaid={isPaidOnly} />}
</div>
<div className="z-20 mb-7 mt-3">
<span className="flex items-center gap-1.5 text-sm font-medium text-neutral-900 dark:text-neutral-100">
@ -60,6 +60,9 @@ const Content = () => {
{commentsElements}
</div>
<Pagination />
{
labs?.testFlag ? <div data-testid="this-comes-from-a-flag" style={{display: 'none'}}></div> : null
}
</>
) : (
<>
@ -69,11 +72,14 @@ const Content = () => {
{commentsElements}
</div>
<div>
{!hasOpenSecundaryForms
? (member ? (isPaidMember || !paidOnly ? <MainForm commentsCount={commentCount} /> : <CTABox isFirst={pagination?.total === 0} isPaid={paidOnly} />) : <CTABox isFirst={pagination?.total === 0} isPaid={paidOnly} />)
{!hasOpenReplyForms
? (member ? (isPaidMember || !isPaidOnly ? <MainForm commentsCount={commentCount} /> : <CTABox isFirst={pagination?.total === 0} isPaid={isPaidOnly} />) : <CTABox isFirst={pagination?.total === 0} isPaid={isPaidOnly} />)
: null
}
</div>
{
labs?.testFlag ? <div data-testid="this-comes-from-a-flag" style={{display: 'none'}}></div> : null
}
</>
)
);

2
apps/comments-ui/test/e2e/actions.test.ts
View file

@ -154,7 +154,7 @@ test.describe('Actions', async () => {
const replyReplyButton = replyComment.getByTestId('reply-button');
await replyReplyButton.click();
const editor = frame.getByTestId('form-editor');
const editor = frame.getByTestId('form-editor').nth(1);
await expect(editor).toBeVisible();
await waitEditorFocused(editor);