replace networkidle with domcontentloaded

mtojek · mtojek · commit 3cdff53421ce · 2023-08-31T17:40:24.000+02:00
diff --git a/site/e2e/global.setup.ts b/site/e2e/global.setup.ts
@@ -4,7 +4,7 @@ import { STORAGE_STATE } from "./playwright.config"
 import { Language } from "../src/components/CreateUserForm/CreateUserForm"
 
 test("create first user", async ({ page }) => {
-  await page.goto("/", { waitUntil: "networkidle" })
+  await page.goto("/", { waitUntil: "domcontentloaded" })
 
   await page.getByLabel(Language.usernameLabel).fill(constants.username)
   await page.getByLabel(Language.emailLabel).fill(constants.email)
diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
@@ -29,7 +29,7 @@ export const createWorkspace = async (
   buildParameters: WorkspaceBuildParameter[] = [],
 ): Promise<string> => {
   await page.goto("/templates/" + templateName + "/workspace", {
-    waitUntil: "networkidle",
+    waitUntil: "domcontentloaded",
   })
   await expect(page).toHaveURL("/templates/" + templateName + "/workspace")
 
@@ -57,7 +57,7 @@ export const verifyParameters = async (
   expectedBuildParameters: WorkspaceBuildParameter[],
 ) => {
   await page.goto("/@admin/" + workspaceName + "/settings/parameters", {
-    waitUntil: "networkidle",
+    waitUntil: "domcontentloaded",
   })
   await expect(page).toHaveURL(
     "/@admin/" + workspaceName + "/settings/parameters",
@@ -120,7 +120,7 @@ export const createTemplate = async (
     content: "window.playwright = true",
   })
 
-  await page.goto("/templates/new", { waitUntil: "networkidle" })
+  await page.goto("/templates/new", { waitUntil: "domcontentloaded" })
   await expect(page).toHaveURL("/templates/new")
 
   await page.getByTestId("file-upload").setInputFiles({
diff --git a/site/e2e/tests/app.spec.ts b/site/e2e/tests/app.spec.ts
@@ -50,6 +50,6 @@ test("app", async ({ context, page }) => {
   const pagePromise = context.waitForEvent("page")
   await page.getByText(appName).click()
   const app = await pagePromise
-  await app.waitForLoadState("networkidle")
+  await app.waitForLoadState("domcontentloaded")
   await app.getByText(appContent).isVisible()
 })
diff --git a/site/e2e/tests/gitAuth.spec.ts b/site/e2e/tests/gitAuth.spec.ts
@@ -47,7 +47,7 @@ test("git auth device", async ({ page }) => {
   })
 
   await page.goto(`/gitauth/${gitAuth.deviceProvider}`, {
-    waitUntil: "networkidle",
+    waitUntil: "domcontentloaded",
   })
   await page.getByText(device.user_code).isVisible()
   await sentPending.wait()
@@ -75,7 +75,7 @@ test("git auth web", async ({ baseURL, page }) => {
     )
   })
   await page.goto(`/gitauth/${gitAuth.webProvider}`, {
-    waitUntil: "networkidle",
+    waitUntil: "domcontentloaded",
   })
   // This endpoint doesn't have the installations URL set intentionally!
   await page.waitForSelector("text=You've authenticated with GitHub!")
diff --git a/site/e2e/tests/listTemplates.spec.ts b/site/e2e/tests/listTemplates.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test"
 
 test("list templates", async ({ page, baseURL }) => {
-  await page.goto(`${baseURL}/templates`, { waitUntil: "networkidle" })
+  await page.goto(`${baseURL}/templates`, { waitUntil: "domcontentloaded" })
   await expect(page).toHaveTitle("Templates - Coder")
 })
diff --git a/site/e2e/tests/updateWorkspace.spec.ts b/site/e2e/tests/updateWorkspace.spec.ts
@@ -127,7 +127,6 @@ test("update workspace with ephemeral parameter enabled", async ({ page }) => {
   )
 
   // Verify that parameter values are default.
-  // WIP
   await verifyParameters(page, workspaceName, richParameters, [
     { name: firstParameter.name, value: firstParameter.defaultValue },
     { name: secondBuildOption.name, value: secondBuildOption.defaultValue },
diff --git a/site/e2e/tests/webTerminal.spec.ts b/site/e2e/tests/webTerminal.spec.ts
@@ -34,7 +34,7 @@ test("web terminal", async ({ context, page }) => {
   const pagePromise = context.waitForEvent("page")
   await page.getByTestId("terminal").click()
   const terminal = await pagePromise
-  await terminal.waitForLoadState("networkidle")
+  await terminal.waitForLoadState("domcontentloaded")
 
   // Ensure that we can type in it
   await terminal.keyboard.type("echo hello")

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,6 @@ test("update workspace with ephemeral parameter enabled", async ({ page }) => {`
`127`	`127`	`)`
`128`	`128`
`129`	`129`	`// Verify that parameter values are default.`
`130`		`- // WIP`
`131`	`130`	`await verifyParameters(page, workspaceName, richParameters, [`
`132`	`131`	`{ name: firstParameter.name, value: firstParameter.defaultValue },`
`133`	`132`	`{ name: secondBuildOption.name, value: secondBuildOption.defaultValue },`