test: expect elements rendered by Popover

aqandrew · aqandrew · commit 259e8a3bf41a · 2025-09-05T00:45:35.000Z
diff --git a/site/src/components/Filter/SelectFilter.stories.tsx b/site/src/components/Filter/SelectFilter.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import { Avatar } from "components/Avatar/Avatar";
 import { useState } from "react";
 import { action } from "storybook/actions";
-import { expect, userEvent, within } from "storybook/test";
+import { expect, screen, userEvent, within } from "storybook/test";
 import {
 	SelectFilter,
 	type SelectFilterOption,
@@ -88,7 +88,7 @@ export const SelectingOption: Story = {
 		const canvas = within(canvasElement);
 		const button = canvas.getByRole("button");
 		await userEvent.click(button);
-		const option = canvas.getByText("Option 25");
+		const option = screen.getByText("Option 25");
 		await userEvent.click(option);
 		await expect(button).toHaveTextContent("Option 25");
 	},
@@ -102,7 +102,7 @@ export const UnselectingOption: Story = {
 		const canvas = within(canvasElement);
 		const button = canvas.getByRole("button");
 		await userEvent.click(button);
-		const menu = canvasElement.querySelector<HTMLElement>("[role=menu]")!;
+		const menu = screen.getByRole("menu");
 		const option = within(menu).getByText("Option 26");
 		await userEvent.click(option);
 		await expect(button).toHaveTextContent("All options");
@@ -140,7 +140,7 @@ export const SearchingOption: Story = {
 		const canvas = within(canvasElement);
 		const button = canvas.getByRole("button");
 		await userEvent.click(button);
-		const search = canvas.getByLabelText("Search options");
+		const search = screen.getByLabelText("Search options");
 		await userEvent.type(search, "option-2");
 	},
 };
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/DebugButton.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/DebugButton.stories.tsx
@@ -1,6 +1,6 @@
 import { MockWorkspace } from "testHelpers/entities";
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import { expect, userEvent, waitFor, within } from "storybook/test";
+import { expect, screen, userEvent, waitFor } from "storybook/test";
 import { DebugButton } from "./DebugButton";
 
 const meta: Meta<typeof DebugButton> = {
@@ -41,9 +41,7 @@ export const WithOpenBuildParameters: Story = {
 			},
 		],
 	},
-	play: async ({ canvasElement, step }) => {
-		const screen = within(canvasElement);
-
+	play: async ({ step }) => {
 		await step("open popover", async () => {
 			await userEvent.click(screen.getByTestId("build-parameters-button"));
 			await waitFor(() =>
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/RetryButton.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/RetryButton.stories.tsx
@@ -4,7 +4,7 @@ import {
 	MockWorkspace,
 } from "testHelpers/entities";
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import { expect, userEvent, waitFor, within } from "storybook/test";
+import { expect, screen, userEvent, waitFor } from "storybook/test";
 import { RetryButton } from "./RetryButton";
 
 const meta: Meta<typeof RetryButton> = {
@@ -45,9 +45,7 @@ export const WithOpenBuildParameters: Story = {
 			},
 		],
 	},
-	play: async ({ canvasElement, step }) => {
-		const screen = within(canvasElement);
-
+	play: async ({ step }) => {
 		await step("open popover", async () => {
 			await userEvent.click(screen.getByTestId("build-parameters-button"));
 			await waitFor(() =>
@@ -73,13 +71,15 @@ export const WithOpenEphemeralBuildParameters: Story = {
 			},
 		],
 	},
-	play: async ({ canvasElement, step }) => {
-		const screen = within(canvasElement);
-
+	play: async ({ step }) => {
 		await step("open popover", async () => {
 			await userEvent.click(screen.getByTestId("build-parameters-button"));
 			await waitFor(() =>
-				expect(screen.getByText("Build Options")).toBeInTheDocument(),
+				expect(
+					screen.getByText(
+						"These parameters only apply for a single workspace start.",
+					),
+				).toBeInTheDocument(),
 			);
 		});
 	},
@@ -105,13 +105,15 @@ export const WithOpenEphemeralBuildParametersNotClassic: Story = {
 			},
 		],
 	},
-	play: async ({ canvasElement, step }) => {
-		const screen = within(canvasElement);
-
+	play: async ({ step }) => {
 		await step("open popover", async () => {
 			await userEvent.click(screen.getByTestId("build-parameters-button"));
 			await waitFor(() =>
-				expect(screen.getByText("Build Options")).toBeInTheDocument(),
+				expect(
+					screen.getByText(
+						"This workspace has ephemeral parameters which may use a temporary value on workspace start. Configure the following parameters in workspace settings.",
+					),
+				).toBeInTheDocument(),
 			);
 		});
 	},
