Simplify playwright conifg

BrunoQuaresma · BrunoQuaresma · commit 4d7dbae6d59b · 2023-01-23T23:50:26.000Z
diff --git a/site/e2e/constants.ts b/site/e2e/constants.ts
@@ -1,6 +1,5 @@
-// Our base port. It's important to run on 3000,
-// which matches our api server
-export const basePort = 3000
+// Default port from the server
+export const defaultPort = 3000
 
 // Credentials for the default user when running in dev mode.
 export const username = "developer"
diff --git a/site/e2e/globalSetup.ts b/site/e2e/globalSetup.ts
@@ -3,8 +3,8 @@ import { createFirstUser } from "../src/api/api"
 import * as constants from "./constants"
 
 const globalSetup = async (): Promise<void> => {
-  axios.defaults.baseURL = `http://localhost:${constants.basePort}`
-  // Create a user
+  axios.defaults.baseURL = `http://localhost:${constants.defaultPort}`
+  // Create first user
   await createFirstUser({
     email: constants.email,
     username: constants.username,
diff --git a/site/e2e/playwright.config.ts b/site/e2e/playwright.config.ts
@@ -1,33 +1,23 @@
 import { PlaywrightTestConfig } from "@playwright/test"
-import * as path from "path"
-import { basePort } from "./constants"
+import path from "path"
+import { defaultPort } from "./constants"
+
+const port = process.env.CODER_E2E_PORT
+  ? Number(process.env.CODER_E2E_PORT)
+  : defaultPort
+
+const coderMain = path.join(__dirname, "../../enterprise/cmd/coder/main.go")
 
 const config: PlaywrightTestConfig = {
   testDir: "tests",
   globalSetup: require.resolve("./globalSetup"),
-
-  // Create junit report file for upload to DataDog
-  reporter: [["junit", { outputFile: "test-results/junit.xml" }]],
-
-  // NOTE: if Playwright complains about the port being taken
-  // do not change the basePort (it must match our api server).
-  // Instead, simply run the test suite without running our local server.
   use: {
-    baseURL: `http://localhost:${basePort}`,
+    baseURL: `http://localhost:${port}`,
     video: "retain-on-failure",
   },
-
-  // `webServer` tells Playwright to launch a test server - more details here:
-  // https://playwright.dev/docs/test-advanced#launching-a-development-web-server-during-the-tests
   webServer: {
-    // Run the coder daemon directly.
-    command: `go run -tags embed ${path.join(
-      __dirname,
-      "../../enterprise/cmd/coder/main.go",
-    )} server --in-memory --access-url http://127.0.0.1:${basePort}`,
-    port: basePort,
-    timeout: 120 * 10000,
-    reuseExistingServer: false,
+    command: `go run -tags embed ${coderMain} server --global-config /tmp`,
+    port,
   },
 }
 
