stop workspaces

mtojek · mtojek · commit fffe83a081d3 · 2023-08-31T18:42:01.000+02:00
diff --git a/site/e2e/tests/app.spec.ts b/site/e2e/tests/app.spec.ts
@@ -1,7 +1,12 @@
 import { test } from "@playwright/test"
 import { randomUUID } from "crypto"
 import * as http from "http"
-import { createTemplate, createWorkspace, startAgent } from "../helpers"
+import {
+  createTemplate,
+  createWorkspace,
+  startAgent,
+  stopWorkspace,
+} from "../helpers"
 import { beforeCoderTest } from "../hooks"
 
 test.beforeEach(async ({ page }) => await beforeCoderTest(page))
@@ -43,7 +48,7 @@ test("app", async ({ context, page }) => {
       },
     ],
   })
-  await createWorkspace(page, template)
+  const workspaceName = await createWorkspace(page, template)
   await startAgent(page, token)
 
   // Wait for the web terminal to open in a new tab
@@ -52,4 +57,6 @@ test("app", async ({ context, page }) => {
   const app = await pagePromise
   await app.waitForLoadState("domcontentloaded")
   await app.getByText(appContent).isVisible()
+
+  await stopWorkspace(page, workspaceName)
 })
diff --git a/site/e2e/tests/outdatedAgent.spec.ts b/site/e2e/tests/outdatedAgent.spec.ts
@@ -6,6 +6,7 @@ import {
   downloadCoderVersion,
   sshIntoWorkspace,
   startAgentWithCommand,
+  stopWorkspace,
 } from "../helpers"
 import { beforeCoderTest } from "../hooks"
 
@@ -32,11 +33,11 @@ test("ssh with agent " + agentVersion, async ({ page }) => {
       },
     ],
   })
-  const workspace = await createWorkspace(page, template)
+  const workspaceName = await createWorkspace(page, template)
   const binaryPath = await downloadCoderVersion(agentVersion)
   await startAgentWithCommand(page, token, binaryPath)
 
-  const client = await sshIntoWorkspace(page, workspace)
+  const client = await sshIntoWorkspace(page, workspaceName)
   await new Promise<void>((resolve, reject) => {
     // We just exec a command to be certain the agent is running!
     client.exec("exit 0", (err, stream) => {
@@ -52,4 +53,6 @@ test("ssh with agent " + agentVersion, async ({ page }) => {
       })
     })
   })
+
+  await stopWorkspace(page, workspaceName)
 })
diff --git a/site/e2e/tests/outdatedCLI.spec.ts b/site/e2e/tests/outdatedCLI.spec.ts
@@ -6,6 +6,7 @@ import {
   downloadCoderVersion,
   sshIntoWorkspace,
   startAgent,
+  stopWorkspace,
 } from "../helpers"
 import { beforeCoderTest } from "../hooks"
 
@@ -32,11 +33,11 @@ test("ssh with client " + clientVersion, async ({ page }) => {
       },
     ],
   })
-  const workspace = await createWorkspace(page, template)
+  const workspaceName = await createWorkspace(page, template)
   await startAgent(page, token)
   const binaryPath = await downloadCoderVersion(clientVersion)
 
-  const client = await sshIntoWorkspace(page, workspace, binaryPath)
+  const client = await sshIntoWorkspace(page, workspaceName, binaryPath)
   await new Promise<void>((resolve, reject) => {
     // We just exec a command to be certain the agent is running!
     client.exec("exit 0", (err, stream) => {
@@ -52,4 +53,6 @@ test("ssh with client " + clientVersion, async ({ page }) => {
       })
     })
   })
+
+  await stopWorkspace(page, workspaceName)
 })
