Skip to content

Commit 2ff9e66

Browse files
committed
test: expect elements + text content rendered by HelpTooltip
1 parent d22a040 commit 2ff9e66

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

site/src/components/InfoTooltip/InfoTooltip.stories.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Meta, StoryObj } from "@storybook/react-vite";
2-
import { expect, userEvent, waitFor, within } from "storybook/test";
2+
import { expect, screen, userEvent, waitFor } from "storybook/test";
33
import { InfoTooltip } from "./InfoTooltip";
44

55
const meta = {
@@ -16,13 +16,13 @@ export default meta;
1616
type Story = StoryObj<typeof InfoTooltip>;
1717

1818
export const Example: Story = {
19-
play: async ({ canvasElement, step }) => {
20-
const screen = within(canvasElement);
21-
19+
play: async ({ step }) => {
2220
await step("activate hover trigger", async () => {
2321
await userEvent.hover(screen.getByRole("button"));
2422
await waitFor(() =>
25-
expect(screen.getByText(meta.args.message)).toBeInTheDocument(),
23+
expect(screen.getByRole("tooltip")).toHaveTextContent(
24+
meta.args.message,
25+
),
2626
);
2727
});
2828
},
@@ -33,13 +33,13 @@ export const Notice = {
3333
type: "notice",
3434
message: "Unfortunately, there's a radio connected to my brain",
3535
},
36-
play: async ({ canvasElement, step }) => {
37-
const screen = within(canvasElement);
38-
36+
play: async ({ step }) => {
3937
await step("activate hover trigger", async () => {
4038
await userEvent.hover(screen.getByRole("button"));
4139
await waitFor(() =>
42-
expect(screen.getByText(Notice.args.message)).toBeInTheDocument(),
40+
expect(screen.getByRole("tooltip")).toHaveTextContent(
41+
Notice.args.message,
42+
),
4343
);
4444
});
4545
},
@@ -50,13 +50,13 @@ export const Warning = {
5050
type: "warning",
5151
message: "Unfortunately, there's a radio connected to my brain",
5252
},
53-
play: async ({ canvasElement, step }) => {
54-
const screen = within(canvasElement);
55-
53+
play: async ({ step }) => {
5654
await step("activate hover trigger", async () => {
5755
await userEvent.hover(screen.getByRole("button"));
5856
await waitFor(() =>
59-
expect(screen.getByText(Warning.args.message)).toBeInTheDocument(),
57+
expect(screen.getByRole("tooltip")).toHaveTextContent(
58+
Warning.args.message,
59+
),
6060
);
6161
});
6262
},

site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.stories.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from "testHelpers/entities";
66
import { withDashboardProvider } from "testHelpers/storybook";
77
import type { Meta, StoryObj } from "@storybook/react-vite";
8-
import { expect, userEvent, waitFor, within } from "storybook/test";
8+
import { expect, screen, userEvent, waitFor, within } from "storybook/test";
99
import { WorkspaceOutdatedTooltip } from "./WorkspaceOutdatedTooltip";
1010

1111
const meta: Meta<typeof WorkspaceOutdatedTooltip> = {
@@ -39,7 +39,9 @@ const Example: Story = {
3939
await step("activate hover trigger", async () => {
4040
await userEvent.hover(body.getByRole("button"));
4141
await waitFor(() =>
42-
expect(body.getByText(MockTemplateVersion.message)).toBeInTheDocument(),
42+
expect(screen.getByRole("tooltip")).toHaveTextContent(
43+
MockTemplateVersion.message,
44+
),
4345
);
4446
});
4547
},

site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ export const TemplateInfoPopover: Story = {
320320
await step("activate hover trigger", async () => {
321321
await userEvent.hover(canvas.getByText(baseWorkspace.name));
322322
await waitFor(() =>
323-
expect(
324-
canvas.getByRole("presentation", { hidden: true }),
325-
).toHaveTextContent(MockTemplate.display_name),
323+
expect(screen.getByRole("tooltip")).toHaveTextContent(
324+
MockTemplate.display_name,
325+
),
326326
);
327327
});
328328
},
@@ -346,9 +346,9 @@ export const TemplateInfoPopoverWithoutDisplayName: Story = {
346346
await step("activate hover trigger", async () => {
347347
await userEvent.hover(canvas.getByText(baseWorkspace.name));
348348
await waitFor(() =>
349-
expect(
350-
canvas.getByRole("presentation", { hidden: true }),
351-
).toHaveTextContent(MockTemplate.name),
349+
expect(screen.getByRole("tooltip")).toHaveTextContent(
350+
MockTemplate.name,
351+
),
352352
);
353353
});
354354
},

0 commit comments

Comments
 (0)