From 3b3f683f8cdff33c8c745e1da99596e7499ca2d6 Mon Sep 17 00:00:00 2001 From: "Acid Chicken (硫酸鶏)" Date: Thu, 6 Apr 2023 08:19:49 +0900 Subject: feat(#8149): respect nsfw settings on gallery list (#10481) * feat(#8149): respect nsfw settings on gallery list * ci(#10336): use pull_request * test(#8149): add interaction tests * test(#10336): use `waitFor` * chore: transition --- packages/frontend/src/components/global/MkAcct.stories.impl.ts | 4 ++-- packages/frontend/src/components/global/MkAvatar.stories.impl.ts | 4 ++-- packages/frontend/src/components/global/MkUrl.stories.impl.ts | 6 +++--- .../frontend/src/components/global/MkUserName.stories.impl.ts | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'packages/frontend/src/components/global') diff --git a/packages/frontend/src/components/global/MkAcct.stories.impl.ts b/packages/frontend/src/components/global/MkAcct.stories.impl.ts index 7dfa1a14f2..d5e3fc3568 100644 --- a/packages/frontend/src/components/global/MkAcct.stories.impl.ts +++ b/packages/frontend/src/components/global/MkAcct.stories.impl.ts @@ -25,7 +25,7 @@ export const Default = { }, args: { user: { - ...userDetailed, + ...userDetailed(), host: null, }, }, @@ -37,7 +37,7 @@ export const Detail = { ...Default, args: { ...Default.args, - user: userDetailed, + user: userDetailed(), detail: true, }, } satisfies StoryObj; diff --git a/packages/frontend/src/components/global/MkAvatar.stories.impl.ts b/packages/frontend/src/components/global/MkAvatar.stories.impl.ts index 6c46f75b5f..3c69c80825 100644 --- a/packages/frontend/src/components/global/MkAvatar.stories.impl.ts +++ b/packages/frontend/src/components/global/MkAvatar.stories.impl.ts @@ -24,7 +24,7 @@ const common = { }; }, args: { - user: userDetailed, + user: userDetailed(), }, decorators: [ (Story, context) => ({ @@ -49,7 +49,7 @@ export const ProfilePageCat = { args: { ...ProfilePage.args, user: { - ...userDetailed, + ...userDetailed(), isCat: true, }, }, diff --git a/packages/frontend/src/components/global/MkUrl.stories.impl.ts b/packages/frontend/src/components/global/MkUrl.stories.impl.ts index 2344c4851a..c5875d4779 100644 --- a/packages/frontend/src/components/global/MkUrl.stories.impl.ts +++ b/packages/frontend/src/components/global/MkUrl.stories.impl.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ import { expect } from '@storybook/jest'; -import { userEvent, within } from '@storybook/testing-library'; +import { userEvent, waitFor, within } from '@storybook/testing-library'; import { StoryObj } from '@storybook/vue3'; import { rest } from 'msw'; import { commonHandlers } from '../../../.storybook/mocks'; @@ -30,7 +30,7 @@ export const Default = { const canvas = within(canvasElement); const a = canvas.getByRole('link'); await expect(a).toHaveAttribute('href', 'https://misskey-hub.net/'); - await userEvent.hover(a); + await waitFor(() => userEvent.hover(a)); /* await tick(); // FIXME: wait for network request const anchors = canvas.getAllByRole('link'); @@ -44,7 +44,7 @@ export const Default = { await expect(icon).toBeInTheDocument(); await expect(icon).toHaveAttribute('src', 'https://misskey-hub.net/favicon.ico'); */ - await userEvent.unhover(a); + await waitFor(() => userEvent.unhover(a)); }, args: { url: 'https://misskey-hub.net/', diff --git a/packages/frontend/src/components/global/MkUserName.stories.impl.ts b/packages/frontend/src/components/global/MkUserName.stories.impl.ts index 41b1567a6f..fa4f0f3b72 100644 --- a/packages/frontend/src/components/global/MkUserName.stories.impl.ts +++ b/packages/frontend/src/components/global/MkUserName.stories.impl.ts @@ -26,10 +26,10 @@ export const Default = { }; }, async play({ canvasElement }) { - await expect(canvasElement).toHaveTextContent(userDetailed.name); + await expect(canvasElement).toHaveTextContent(userDetailed().name); }, args: { - user: userDetailed, + user: userDetailed(), }, parameters: { layout: 'centered', @@ -38,12 +38,12 @@ export const Default = { export const Anonymous = { ...Default, async play({ canvasElement }) { - await expect(canvasElement).toHaveTextContent(userDetailed.username); + await expect(canvasElement).toHaveTextContent(userDetailed().username); }, args: { ...Default.args, user: { - ...userDetailed, + ...userDetailed(), name: null, }, }, -- cgit v1.2.3-freya