more improvements

coder · mtojek · Aug 30, 2023 · Aug 30, 2023 · Aug 30, 2023 · Aug 30, 2023
commit 5fcd53d076fd20b85946aa4b393eccab23e57d8c
diff --git a/site/e2e/hooks.ts b/site/e2e/hooks.ts
@@ -28,8 +28,9 @@ export const beforeCoderTest = async (page: Page) => {
     let responseText = ""
     try {
       if (shouldLogResponse) {
-        const buffer = await response.body() // Read the response as a buffer
-        responseText = buffer.toString("utf-8") // Convert the buffer to text
+        const buffer = await response.body()
+        responseText = buffer.toString("utf-8")
+        responseText = responseText.replace(/\n$/g, "")
       } else {
         responseText = "skipped..."
       }

diff --git a/site/e2e/tests/app.spec.ts b/site/e2e/tests/app.spec.ts
@@ -3,6 +3,8 @@ import { randomUUID } from "crypto"
 import * as http from "http"
 import { createTemplate, createWorkspace, startAgent } from "../helpers"
 
+test.beforeEach(async ({ page }) => await beforeCoderTest(page))
+
 test("app", async ({ context, page }) => {
   const appContent = "Hello World"
   const token = randomUUID()

diff --git a/site/e2e/tests/gitAuth.spec.ts b/site/e2e/tests/gitAuth.spec.ts
@@ -3,6 +3,9 @@ import { gitAuth } from "../constants"
 import { Endpoints } from "@octokit/types"
 import { GitAuthDevice } from "api/typesGenerated"
 import { Awaiter, createServer } from "../helpers"
+import { beforeCoderTest } from "../hooks"
+
+test.beforeEach(async ({ page }) => await beforeCoderTest(page))
 
 // Ensures that a Git auth provider with the device flow functions and completes!
 test("git auth device", async ({ page }) => {

diff --git a/site/e2e/tests/outdatedAgent.spec.ts b/site/e2e/tests/outdatedAgent.spec.ts
@@ -7,9 +7,12 @@ import {
   sshIntoWorkspace,
   startAgentWithCommand,
 } from "../helpers"
+import { beforeCoderTest } from "../hooks"
 
 const agentVersion = "v0.14.0"
 
+test.beforeEach(async ({ page }) => await beforeCoderTest(page))
+
 test("ssh with agent " + agentVersion, async ({ page }) => {
   const token = randomUUID()
   const template = await createTemplate(page, {

diff --git a/site/e2e/tests/outdatedCLI.spec.ts b/site/e2e/tests/outdatedCLI.spec.ts
@@ -7,9 +7,12 @@ import {
   sshIntoWorkspace,
   startAgent,
 } from "../helpers"
+import { beforeCoderTest } from "../hooks"
 
 const clientVersion = "v0.14.0"
 
+test.beforeEach(async ({ page }) => await beforeCoderTest(page))
+
 test("ssh with client " + clientVersion, async ({ page }) => {
   const token = randomUUID()
   const template = await createTemplate(page, {

diff --git a/site/e2e/tests/restartWorkspace.spec.ts b/site/e2e/tests/restartWorkspace.spec.ts
@@ -9,6 +9,9 @@ import {
 
 import { firstBuildOption, secondBuildOption } from "../parameters"
 import { RichParameter } from "../provisionerGenerated"
+import { beforeCoderTest } from "../hooks"
+
+test.beforeEach(async ({ page }) => await beforeCoderTest(page))
 
 test("restart workspace with ephemeral parameters", async ({ page }) => {
   const richParameters: RichParameter[] = [firstBuildOption, secondBuildOption]

diff --git a/site/e2e/tests/webTerminal.spec.ts b/site/e2e/tests/webTerminal.spec.ts
@@ -1,6 +1,9 @@
 import { test } from "@playwright/test"
 import { createTemplate, createWorkspace, startAgent } from "../helpers"
 import { randomUUID } from "crypto"
+import { beforeCoderTest } from "../hooks"
+
+test.beforeEach(async ({ page }) => await beforeCoderTest(page))
 
 test("web terminal", async ({ context, page }) => {
   const token = randomUUID()