CR

Author: rudream

Makefile

@@ -1103,11 +1103,6 @@ test-sh:
 	fi; \
 	bats $(BATSFLAGS) ./assets/aws/files/tests
 
-
-.PHONY: test-e2e
-test-e2e:
-	make -C e2e test
-
 .PHONY: run-etcd
 run-etcd:
 	docker build -f .github/services/Dockerfile.etcd -t etcdbox --build-arg=ETCD_VERSION=3.5.9 .
@@ -1906,4 +1901,4 @@ dump-preset-roles:
 
 .PHONY: test-web-e2e
 test-web-e2e: ensure-webassets
-	$(CGOFLAG) go test -tags=webassets_embed ./e2e/web-e2e_test.go
+	(cd e2e && pnpm install) && $(CGOFLAG) go test -tags=webassets_embed ./e2e/web-e2e_test.go

e2e/README.md

@@ -5,6 +5,8 @@ This directory contains the configuration and tests for end-to-end testing again
 E2E tests should be run by a corresponding Go test in `web-e2e_test.go` and run
 using `make test-web-e2e`. To run only the Playwright test directly, you'll need a Teleport instance running locally.
 
+Any test that involves an authenticated user should be run with a `START_URL` env variable that contains an invite link for the test user, this should be generated and provided by the corresponding Go test.
+
 ### Setup
 
 Before being able to run any tests, you'll need to install the playwright package and the chromium browser.

e2e/package.json

@@ -2,13 +2,11 @@
   "name": "playwright-e2e-testing",
   "version": "1.0.0",
   "description": "Playwright tests for e2e testing.",
-  "main": "index.js",
   "scripts": {
     "test": "playwright test --project=chromium",
     "report": "playwright show-report"
   },
-  "author": "",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "devDependencies": {
     "@playwright/test": "^1.51.1"
   }

e2e/pnpm-lock.yaml

@@ -0,0 +1 @@
+sharedWorkspaceLockfile: false

e2e/pnpm-workspace.yaml

@@ -17,22 +17,22 @@ import (
 
 // TestSignup sets up a test instance of Teleport and runs a playwright test against it to test the signup flow.
 func TestSignup(t *testing.T) {
-	setupAndRunBasicTest(t, "signup.spec.ts")
+	makeBasicSetupAndRunTest(t, "signup.spec.ts")
 }
 
 // TestCreateNewRole sets up a test instance of Teleport and a user to test role management in the UI.
 func TestRoleManagement(t *testing.T) {
-	setupAndRunBasicTest(t, "roles.spec.ts")
+	makeBasicSetupAndRunTest(t, "roles.spec.ts")
 }
 
 // TestAuthConnectorManagement sets up a test instance of Teleport and a user to test auth connector management in the UI.
 func TestAuthConnectorManagement(t *testing.T) {
-	setupAndRunBasicTest(t, "authconnectors.spec.ts")
+	makeBasicSetupAndRunTest(t, "authconnectors.spec.ts")
 }
 
-// setupAndRunBasicTest sets up a test instance of Teleport and a user with the access and editor roles and runs a playwright test.
+// makeBasicSetupAndRunTest sets up a test instance of Teleport and a user with the access and editor roles and runs a playwright test.
 // This is a helper function in cases where there is no additional backend setup required beyond creating an invite link.
-func setupAndRunBasicTest(t *testing.T, playwrightTest string) {
+func makeBasicSetupAndRunTest(t *testing.T, playwrightTest string) {
 	rc, ctx := helpers.CreateTeleportTestInstance(t)
 
 	as := rc.Process.GetAuthServer()

e2e/web-e2e_test.go

@@ -17,7 +17,6 @@
     "test": "jest",
     "test-coverage": "jest --coverage && web/scripts/print-coverage-link.sh",
     "test-update-snapshot": "pnpm run test --updateSnapshot",
-    "test-e2e": "pnpm --dir=./e2e test",
     "tdd": "jest --watch",
     "lint": "pnpm eslint && pnpm prettier-check",
     "lint-fix": "pnpm eslint --fix && pnpm prettier-write",
@@ -113,4 +112,4 @@
   "engines": {
     "node": "^22"
   }
-}
+}

package.json

@@ -5,4 +5,4 @@ coverage
 dist
 **/dist
 *DS_store
-certs
+certs