Fixing tests after minor UI updates

dannykopping · dannykopping · commit 978a1ee8e598 · 2025-04-22T17:02:58.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/site/e2e/constants.ts b/site/e2e/constants.ts
@@ -29,6 +29,7 @@ export const users = {
 		username: "admin",
 		password: defaultPassword,
 		email: "admin@coder.com",
+		roles: ["Owner"],
 	},
 	templateAdmin: {
 		username: "template-admin",
diff --git a/site/e2e/tests/presets/basic-presets-with-prebuild/main.tf b/site/e2e/tests/presets/basic-presets-with-prebuild/main.tf
@@ -60,15 +60,8 @@ resource "coder_agent" "main" {
     fi
   EOT
 
-  # These environment variables allow you to make Git commits right away after creating a
-  # workspace. Note that they take precedence over configuration defined in ~/.gitconfig!
-  # You can remove this block if you'd prefer to configure Git manually or using
-  # dotfiles. (see docs/dotfiles.md)
   env = {
-    GIT_AUTHOR_NAME     = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
-    GIT_AUTHOR_EMAIL    = "${data.coder_workspace_owner.me.email}"
-    GIT_COMMITTER_NAME  = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
-    GIT_COMMITTER_EMAIL = "${data.coder_workspace_owner.me.email}"
+    OWNER_EMAIL = data.coder_workspace_owner.me.email
   }
 
   # The following metadata blocks are optional. They are used to display
@@ -84,6 +77,14 @@ resource "coder_agent" "main" {
     timeout      = 1
   }
 
+  metadata {
+    display_name = "Owner"
+    key          = "owner"
+    script       = "echo $OWNER_EMAIL"
+    interval     = 10
+    timeout      = 1
+  }
+
   metadata {
     display_name = "Hostname"
     key          = "hostname"
diff --git a/site/e2e/tests/presets/prebuilds.spec.ts b/site/e2e/tests/presets/prebuilds.spec.ts
@@ -1,5 +1,5 @@
 import path from "node:path";
-import { type Locator, expect, test } from "@playwright/test";
+import {type Locator, expect, test, Page} from "@playwright/test";
 import { users } from "../../constants";
 import {
 	currentUser,
@@ -54,9 +54,7 @@ test("create template with desired prebuilds", async ({ page, baseURL }) => {
 	await waitForExpectedCount(prebuilds, expectedPrebuilds);
 
 	// Wait for prebuilds to start.
-	const runningPrebuilds = page
-		.getByTestId("build-status")
-		.getByText("Running");
+	const runningPrebuilds = runningPrebuildsLocator(page);
 	await waitForExpectedCount(runningPrebuilds, expectedPrebuilds);
 });
 
@@ -86,15 +84,15 @@ test("claim prebuild matching selected preset", async ({ page, baseURL }) => {
 	);
 
 	// Wait for prebuilds to start.
-	let runningPrebuilds = page.getByTestId("build-status").getByText("Running");
+	let runningPrebuilds = runningPrebuildsLocator(page);
 	await waitForExpectedCount(runningPrebuilds, expectedPrebuilds);
 
 	// Open the first prebuild.
 	await runningPrebuilds.first().click();
 	await page.waitForURL(/\/@prebuilds\/prebuild-.+/);
 
 	// Wait for the prebuild to become ready so it's eligible to be claimed.
-	await page.getByTestId("agent-status-ready").waitFor({ timeout: 60_000 });
+	await page.getByTestId("agent-status-ready").waitFor({ timeout: 120_000 });
 
 	// Logout as admin, and login as an unprivileged user.
 	await login(page, users.member);
@@ -127,12 +125,19 @@ test("claim prebuild matching selected preset", async ({ page, baseURL }) => {
 		timeout: waitForBuildTimeout, // Account for workspace build time.
 	});
 
-	// Validate the workspace metadata that it was indeed a claimed prebuild.
+	// Validate via the workspace metadata that it was indeed a claimed prebuild.
 	const indicator = page.getByText("Was Prebuild");
 	await indicator.waitFor({ timeout: 60_000 });
 	const text = indicator.locator("xpath=..").getByText("Yes");
 	await text.waitFor({ timeout: 30_000 });
 
+	// Validate via the workspace metadata that terraform was run again, injecting the new owner via agent environment,
+	// and the agent picked this up and reinitialized with a new environment.
+	const owner = page.getByText("Owner");
+	await owner.waitFor({ timeout: 60_000 });
+	const ownerTxt = owner.locator("xpath=..").getByText(users.member.email);
+	await ownerTxt.waitFor({ timeout: 30_000 });
+
 	// Logout as unprivileged user, and login as admin.
 	await login(page, users.admin);
 
@@ -156,10 +161,14 @@ test("claim prebuild matching selected preset", async ({ page, baseURL }) => {
 	expect(currentWorkspaceNames).not.toEqual(previousWorkspaceNames);
 
 	// Wait for prebuilds to start.
-	runningPrebuilds = page.getByTestId("build-status").getByText("Running");
+	runningPrebuilds = runningPrebuildsLocator(page);
 	await waitForExpectedCount(runningPrebuilds, expectedPrebuilds);
 });
 
+function runningPrebuildsLocator(page: Page): Locator {
+	return page.locator(".build-status").getByText("Running");
+}
+
 function waitForExpectedCount(prebuilds: Locator, expectedCount: number) {
 	return expect
 		.poll(
diff --git a/site/src/pages/WorkspacesPage/WorkspacesTable.tsx b/site/src/pages/WorkspacesPage/WorkspacesTable.tsx
@@ -376,7 +376,7 @@ const WorkspaceStatusCell: FC<WorkspaceStatusCellProps> = ({ workspace }) => {
 
 	return (
 		<TableCell>
-			<div className="flex flex-col">
+			<div className="flex flex-col build-status">
 				<StatusIndicator variant={variantByStatusType[type]}>
 					<StatusIndicatorDot />
 					{text}
