wip: migrate more tests

Author: jsjoeio

test/e2e/routes.test.ts

@@ -56,6 +56,20 @@ describe("VS Code Routes with code-workspace", ["--disable-workspace-trust", COD
   })
 })
 
+const CODE_FOLDER_DIR = process.env.CODE_FOLDER_DIR || ""
+describe("VS Code Routes with code-workspace", ["--disable-workspace-trust", CODE_FOLDER_DIR], {}, async () => {
+  const testName = "vscode-routes"
+  test.beforeAll(async () => {
+    await clean(testName)
+  })
+
+  test.only("should redirect to the passed in folder using human-readable query", async ({ codeServerPage }) => {
+    const url = new URL(codeServerPage.page.url())
+    expect(url.pathname).toBe("/")
+    expect(url.search).toBe(`?folder=${CODE_FOLDER_DIR}`)
+  })
+})
+
 describe(
   "VS Code Routes with ignore-last-opened",
   ["--disable-workspace-trust", "--ignore-last-opened"],

test/unit/node/routes/vscode.test.ts

@@ -23,49 +23,6 @@ describe.skip("vscode", () => {
 
   const routes = ["/", "/vscode", "/vscode/"]
 
-  it("should load all route variations", async () => {
-    codeServer = await integration.setup(["--auth=none"], "")
-
-    for (const route of routes) {
-      const resp = await codeServer.fetch(route)
-      expect(resp.status).toBe(200)
-      const html = await resp.text()
-      const url = new URL(resp.url) // Check there were no redirections.
-      expect(url.pathname + url.search).toBe(route)
-
-      switch (route) {
-        case "/":
-        case "/vscode/":
-          expect(html).toMatch(/src="\.\/[a-z]+-[0-9a-z]+\/static\//)
-          break
-        case "/vscode":
-          expect(html).toMatch(/src="\.\/vscode\/[a-z]+-[0-9a-z]+\/static\//)
-          break
-      }
-    }
-  })
-
-  it("should redirect to the passed in workspace using human-readable query", async () => {
-    const workspace = path.join(await tmpdir(testName), "test.code-workspace")
-    await fs.writeFile(workspace, "")
-    codeServer = await integration.setup(["--auth=none", workspace], "")
-
-    const resp = await codeServer.fetch("/")
-    const url = new URL(resp.url)
-    expect(url.pathname).toBe("/")
-    expect(url.search).toBe(`?workspace=${workspace}`)
-  })
-
-  it("should redirect to the passed in folder using human-readable query", async () => {
-    const folder = await tmpdir(testName)
-    codeServer = await integration.setup(["--auth=none", folder], "")
-
-    const resp = await codeServer.fetch("/")
-    const url = new URL(resp.url)
-    expect(url.pathname).toBe("/")
-    expect(url.search).toBe(`?folder=${folder}`)
-  })
-
   it("should redirect to last query folder/workspace", async () => {
     codeServer = await integration.setup(["--auth=none"], "")
 

test/utils/globalE2eSetup.ts

@@ -19,10 +19,14 @@ export default async function () {
     wtfnode.setup()
   }
 
-  // Create dummy code-workspace
+  // Create dummy code-workspace for routes.test.ts
   const codeWorkspace = path.join(await tmpdir(workspaceDir), "test.code-workspace")
   await fs.writeFile(codeWorkspace, "")
   process.env.CODE_WORKSPACE_DIR = codeWorkspace
 
+  // Create dummy folder for routes.test.ts
+  const folder = await tmpdir(workspaceDir)
+  process.env.CODE_FOLDER_DIR = folder
+
   console.log("✅ Global Setup for Playwright End-to-End Tests is now complete.")
 }