WIP

mtojek · mtojek · commit 3cac0ee4fe7e · 2023-04-20T11:30:28.000+02:00
diff --git a/site/e2e/pom/WorkspacePage.ts b/site/e2e/pom/WorkspacePage.ts
@@ -2,21 +2,32 @@ import { expect, Locator, Page } from "@playwright/test"
 import { BasePom } from "./BasePom"
 
 export class WorkspacePage extends BasePom {
+  readonly workspaceRunningBadge: Locator
+  readonly workspaceStoppedBadge: 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.stopWorkspaceButton = page.getByTestId("button-stop-workspace")
   }
 
   async loaded() {
     await this.stopWorkspaceButton.waitFor({ state: "visible" })
+    await expect(this.page).toHaveTitle("admin/my-first-workspace - Coder")
+  }
 
-    await expect(this.page).toHaveTitle("admin/workspace-1 - Coder")
+  async isRunning() {
+    await this.workspaceRunningBadge.waitFor({ state: "visible" })
   }
 
   async stop() {
     await this.stopWorkspaceButton.click()
   }
+
+  async isStopped() {
+    await this.workspaceStoppedBadge.waitFor({ state: "visible" })
+  }
 }
diff --git a/site/e2e/tests/basicScenario.spec.ts b/site/e2e/tests/basicScenario.spec.ts
@@ -36,9 +36,17 @@ test("Basic scenario", async ({ page, baseURL }) => {
     await workspacePage.loaded()
   })
 
-  // await test.step("Workspace is up and running", async() => {
-  //   await workspacePage.isRunning()
-  // })
+  await test.step("Workspace is up and running", async() => {
+    await workspacePage.isRunning()
+  })
+
+  await test.step("Stop the workspace", async() => {
+    await workspacePage.stop()
+  })
+
+  await test.step("Workspace is stopped", async() => {
+    await workspacePage.isStopped()
+  })
 
   await test.step("Finally", async() => {
     await page.waitForTimeout(5 * 60 * 1000) // FIXME
diff --git a/site/src/components/Pill/Pill.tsx b/site/src/components/Pill/Pill.tsx
@@ -10,16 +10,18 @@ export interface PillProps {
   type?: PaletteIndex
   lightBorder?: boolean
   title?: string
+  dataTestId?: string
 }
 
 export const Pill: FC<PillProps> = (props) => {
-  const { className, icon, text = false, title } = props
+  const { className, icon, text = false, title, dataTestId } = props
   const styles = useStyles(props)
   return (
     <div
       className={combineClasses([styles.wrapper, styles.pillColor, className])}
       role="status"
       title={title}
+      data-testid={dataTestId}
     >
       {icon && <div className={styles.iconWrapper}>{icon}</div>}
       {text}
diff --git a/site/src/components/WorkspaceActions/Buttons.tsx b/site/src/components/WorkspaceActions/Buttons.tsx
@@ -61,6 +61,7 @@ export const StopButton: FC<PropsWithChildren<WorkspaceAction>> = ({
       startIcon={<CropSquareIcon />}
       onClick={handleAction}
       className={styles.fixedWidth}
+      data-testid="button-stop-workspace"
     >
       {t("actionButton.stop")}
     </Button>
diff --git a/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx b/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx
@@ -100,6 +100,6 @@ 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} data-testid={"workspace-status-" + type }
+  return <Pill className={className} icon={icon} text={text} type={type} dataTestId={"badge-workspace-status-" + build.status }
   />
 }

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ export const StopButton: FC<PropsWithChildren<WorkspaceAction>> = ({`
`61`	`61`	`startIcon={<CropSquareIcon />}`
`62`	`62`	`onClick={handleAction}`
`63`	`63`	`className={styles.fixedWidth}`
	`64`	`+ data-testid="button-stop-workspace"`
`64`	`65`	`>`
`65`	`66`	`{t("actionButton.stop")}`
`66`	`67`	`</Button>`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,6 @@ export const WorkspaceStatusBadge: FC<`
`100`	`100`	`PropsWithChildren<WorkspaceStatusBadgeProps>`
`101`	`101`	`> = ({ build, className }) => {`
`102`	`102`	`const { text, icon, type } = getStatus(build.status)`
`103`		`- return <Pill className={className} icon={icon} text={text} type={type} data-testid={"workspace-status-" + type }`
	`103`	`+ return <Pill className={className} icon={icon} text={text} type={type} dataTestId={"badge-workspace-status-" + build.status }`
`104`	`104`	`/>`
`105`	`105`	`}`