Wait for agent ready

mtojek · mtojek · commit 5396dcdbcf96 · 2023-04-20T12:28:30.000+02:00
diff --git a/site/e2e/playwright.config.ts b/site/e2e/playwright.config.ts
@@ -20,6 +20,7 @@ const config: PlaywrightTestConfig = {
     port,
     reuseExistingServer: false,
   },
+  timeout: 120 * 1000,
 }
 
 export default config
diff --git a/site/e2e/pom/CreateTemplatePage.ts b/site/e2e/pom/CreateTemplatePage.ts
@@ -21,10 +21,12 @@ export class CreateTemplatePage extends BasePom {
 
   async submitForm() {
     await this.createTemplateForm
-    .getByTestId("form-template-upload")
-    .setInputFiles("./e2e/testdata/docker.tar")
+      .getByTestId("form-template-upload")
+      .setInputFiles("./e2e/testdata/docker.tar")
     await this.createTemplateForm.getByLabel("Name *").fill("my-first-template")
-    await this.createTemplateForm.getByLabel("Display name").fill("My First Template")
+    await this.createTemplateForm
+      .getByLabel("Display name")
+      .fill("My First Template")
     await this.createTemplateForm
       .getByLabel("Description")
       .fill("This is my first template.")
diff --git a/site/e2e/pom/CreateWorkspacePage.ts b/site/e2e/pom/CreateWorkspacePage.ts
@@ -20,7 +20,9 @@ export class CreateWorkspacePage extends BasePom {
   }
 
   async submitForm() {
-    await this.createWorkspaceForm.getByLabel("Workspace Name").fill("my-first-workspace")
+    await this.createWorkspaceForm
+      .getByLabel("Workspace Name")
+      .fill("my-first-workspace")
 
     await this.submitButton.click()
   }
diff --git a/site/e2e/pom/WorkspacePage.ts b/site/e2e/pom/WorkspacePage.ts
@@ -4,13 +4,23 @@ import { BasePom } from "./BasePom"
 export class WorkspacePage extends BasePom {
   readonly workspaceRunningBadge: Locator
   readonly workspaceStoppedBadge: Locator
+  readonly terminalButton: Locator
+  readonly agentVersion: Locator
+  readonly agentLifecycleReady: Locator
   readonly stopWorkspaceButton: Locator
 
   constructor(baseURL: string | undefined, page: Page) {
     super(baseURL, `/templates/docker/workspace`, page)
 
-    this.workspaceRunningBadge = page.getByTestId("badge-workspace-status-running")
-    this.workspaceStoppedBadge = page.getByTestId("badge-workspace-status-stopped")
+    this.workspaceRunningBadge = page.getByTestId(
+      "badge-workspace-status-running",
+    )
+    this.workspaceStoppedBadge = page.getByTestId(
+      "badge-workspace-status-stopped",
+    )
+    this.terminalButton = page.getByTestId("button-terminal")
+    this.agentVersion = page.getByTestId("agent-version")
+    this.agentLifecycleReady = page.getByTestId("agent-lifecycle-ready")
     this.stopWorkspaceButton = page.getByTestId("button-stop-workspace")
   }
 
@@ -21,6 +31,10 @@ export class WorkspacePage extends BasePom {
 
   async isRunning() {
     await this.workspaceRunningBadge.waitFor({ state: "visible" })
+    await this.terminalButton.waitFor({ state: "visible" })
+    await this.agentVersion.waitFor({ state: "visible" })
+    await this.agentLifecycleReady.waitFor({ state: "visible" })
+    await this.page.waitForTimeout(1000) // Wait for 1s to snapshot the agent status on the video
   }
 
   async stop() {
diff --git a/site/e2e/tests/basicScenario.spec.ts b/site/e2e/tests/basicScenario.spec.ts
@@ -28,27 +28,27 @@ test("Basic scenario", async ({ page, baseURL }) => {
     await templatePage.loaded()
   })
 
-  await test.step("Start a workspace", async() => {
+  await test.step("Start a workspace", async () => {
     await templatePage.createWorkspace()
     await createWorkspacePage.loaded()
 
     await createWorkspacePage.submitForm()
     await workspacePage.loaded()
   })
 
-  await test.step("Workspace is up and running", async() => {
+  await test.step("Workspace is up and running", async () => {
     await workspacePage.isRunning()
   })
 
-  await test.step("Stop the workspace", async() => {
+  await test.step("Stop the workspace", async () => {
     await workspacePage.stop()
   })
 
-  await test.step("Workspace is stopped", async() => {
+  await test.step("Workspace is stopped", async () => {
     await workspacePage.isStopped()
   })
 
-  await test.step("Finally", async() => {
+  await test.step("Finally", async () => {
     await page.waitForTimeout(5 * 60 * 1000) // FIXME
   })
 })
diff --git a/site/src/components/Resources/AgentStatus.tsx b/site/src/components/Resources/AgentStatus.tsx
@@ -28,6 +28,7 @@ const ReadyLifecycle: React.FC = () => {
       role="status"
       aria-label={t("agentStatus.connected.ready")}
       className={combineClasses([styles.status, styles.connected])}
+      data-testid="agent-lifecycle-ready"
     />
   )
 }
diff --git a/site/src/components/Resources/AgentVersion.tsx b/site/src/components/Resources/AgentVersion.tsx
@@ -19,7 +19,7 @@ export const AgentVersion: FC<{
   )
 
   if (!outdated) {
-    return <span>{displayVersion}</span>
+    return <span data-testid="agent-version">{displayVersion}</span>
   }
 
   return (
@@ -31,6 +31,7 @@ export const AgentVersion: FC<{
         onMouseEnter={() => setIsOpen(true)}
         onMouseLeave={() => setIsOpen(false)}
         className={styles.trigger}
+        data-testid="agent-version"
       >
         Agent Outdated
       </span>
diff --git a/site/src/components/TerminalLink/TerminalLink.tsx b/site/src/components/TerminalLink/TerminalLink.tsx
@@ -42,6 +42,7 @@ export const TerminalLink: FC<React.PropsWithChildren<TerminalLinkProps>> = ({
       href={href}
       className={combineClasses([styles.link, className])}
       target="_blank"
+      data-testid="button-terminal"
       onClick={(event) => {
         event.preventDefault()
         window.open(
diff --git a/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx b/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx
@@ -100,6 +100,13 @@ export const WorkspaceStatusBadge: FC<
   PropsWithChildren<WorkspaceStatusBadgeProps>
 > = ({ build, className }) => {
   const { text, icon, type } = getStatus(build.status)
-  return <Pill className={className} icon={icon} text={text} type={type} dataTestId={"badge-workspace-status-" + build.status }
-  />
+  return (
+    <Pill
+      className={className}
+      icon={icon}
+      text={text}
+      type={type}
+      dataTestId={"badge-workspace-status-" + build.status}
+    />
+  )
 }
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -211,7 +211,10 @@ export const CreateWorkspacePageView: FC<
 
   return (
     <FullPageHorizontalForm title="New workspace" onCancel={props.onCancel}>
-      <HorizontalForm onSubmit={form.handleSubmit} data-testid="form-create-workspace">
+      <HorizontalForm
+        onSubmit={form.handleSubmit}
+        data-testid="form-create-workspace"
+      >
         {/* General info */}
         <FormSection
           title="General info"
diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx
@@ -51,7 +51,7 @@ export const TemplateSummaryPageView: FC<TemplateSummaryPageViewProps> = ({
     <Stack spacing={4}>
       <TemplateStats template={template} activeVersion={activeVersion} />
       {daus && <DAUChart daus={daus} />}
-      <TemplateResourcesTable resources={getStartedResources(resources)}/>
+      <TemplateResourcesTable resources={getStartedResources(resources)} />
     </Stack>
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ const config: PlaywrightTestConfig = {`
`20`	`20`	`port,`
`21`	`21`	`reuseExistingServer: false,`
`22`	`22`	`},`
	`23`	`+ timeout: 120 * 1000,`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`export default config`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ export class CreateWorkspacePage extends BasePom {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`async submitForm() {`
`23`		`- await this.createWorkspaceForm.getByLabel("Workspace Name").fill("my-first-workspace")`
	`23`	`+ await this.createWorkspaceForm`
	`24`	`+ .getByLabel("Workspace Name")`
	`25`	`+ .fill("my-first-workspace")`
`24`	`26`
`25`	`27`	`await this.submitButton.click()`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ const ReadyLifecycle: React.FC = () => {`
`28`	`28`	`role="status"`
`29`	`29`	`aria-label={t("agentStatus.connected.ready")}`
`30`	`30`	`className={combineClasses([styles.status, styles.connected])}`
	`31`	`+ data-testid="agent-lifecycle-ready"`
`31`	`32`	`/>`
`32`	`33`	`)`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export const AgentVersion: FC<{`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`if (!outdated) {`
`22`		`- return <span>{displayVersion}</span>`
	`22`	`+ return <span data-testid="agent-version">{displayVersion}</span>`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`return (`
`@@ -31,6 +31,7 @@ export const AgentVersion: FC<{`
`31`	`31`	`onMouseEnter={() => setIsOpen(true)}`
`32`	`32`	`onMouseLeave={() => setIsOpen(false)}`
`33`	`33`	`className={styles.trigger}`
	`34`	`+ data-testid="agent-version"`
`34`	`35`	`>`
`35`	`36`	`Agent Outdated`
`36`	`37`	`</span>`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export const TemplateSummaryPageView: FC<TemplateSummaryPageViewProps> = ({`
`51`	`51`	`<Stack spacing={4}>`
`52`	`52`	`<TemplateStats template={template} activeVersion={activeVersion} />`
`53`	`53`	`{daus && <DAUChart daus={daus} />}`
`54`		`- <TemplateResourcesTable resources={getStartedResources(resources)}/>`
	`54`	`+ <TemplateResourcesTable resources={getStartedResources(resources)} />`
`55`	`55`	`</Stack>`
`56`	`56`	`)`
`57`	`57`	`}`