fix: update tests

jaaydenh · jaaydenh · commit 9153ef7aa628 · 2025-04-30T20:45:12.000Z
diff --git a/site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.test.tsx b/site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.test.tsx
@@ -47,13 +47,18 @@ const renderPage = async () => {
 const removeMember = async () => {
 	const user = userEvent.setup();
 	// Click on the "Open menu" button to display the "Remove" option
-	const menuButtons = await screen.findAllByLabelText("Open menu");
+	const menuButtons = await screen.findAllByRole("button", { name: "Open menu" });
 	// get MockUser2
 	const selectedMenuButton = menuButtons[0];
 
 	await user.click(selectedMenuButton);
 
-	const removeButton = await within(document.body).findByText("Remove…");
+	// Wait for the dropdown menu to be visible and find the remove button
+	const menuItems = await screen.findAllByRole("menuitem");
+	const removeButton = menuItems.find(item => item.textContent === "Remove");
+	if (!removeButton) {
+		throw new Error("Remove button not found");
+	}
 	await user.click(removeButton);
 
 	const dialog = await within(document.body).findByRole("dialog");
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
@@ -202,9 +202,9 @@ export const OpenDownloadLogs: Story = {
 	},
 	play: async ({ canvasElement }) => {
 		const canvas = within(canvasElement);
-		await userEvent.click(canvas.getByRole("button", { name: "More options" }));
-		await userEvent.click(canvas.getByText("Download logs", { exact: false }));
+		await userEvent.click(canvas.getByRole("button", { name: "Workspace actions" }));
 		const screen = within(document.body);
+		await userEvent.click(screen.getByText("Download logs…"));
 		await expect(screen.getByTestId("dialog")).toBeInTheDocument();
 	},
 };
@@ -215,8 +215,9 @@ export const CanDeleteDormantWorkspace: Story = {
 	},
 	play: async ({ canvasElement }) => {
 		const canvas = within(canvasElement);
-		await userEvent.click(canvas.getByRole("button", { name: "More options" }));
-		const deleteButton = canvas.getByText("Delete…");
+		await userEvent.click(canvas.getByRole("button", { name: "Workspace actions" }));
+		const screen = within(document.body);
+		const deleteButton = screen.getByText("Delete…");
 		await expect(deleteButton).toBeEnabled();
 	},
 };
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx
@@ -182,13 +182,13 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
 					<Button
 						size="icon-lg"
 						variant="subtle"
-						aria-label="More options"
+						aria-label="Workspace actions"
 						data-testid="workspace-options-button"
 						aria-controls="workspace-options"
 						disabled={!canAcceptJobs}
 					>
 						<EllipsisVertical aria-hidden="true" />
-						<span className="sr-only">More options</span>
+						<span className="sr-only">Workspace actions</span>
 					</Button>
 				</DropdownMenuTrigger>
 
