Simplify E2E global setup and require auth token

- Refactor teardown logic to always require token (remove E2E_LOCAL/E2E_DEV special cases)
- Add E2E env vars to docker-compose.yml for local testing
- Use private-cloud image for enterprise test support

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: kyle-ssg

docker-compose.yml

@@ -21,7 +21,7 @@ services:
       start_period: 20s
 
   flagsmith:
-    image: docker.flagsmith.com/flagsmith/flagsmith:latest
+    image: flagsmith/flagsmith-private-cloud:latest
     environment:
       # All environments variables are available here:
       # API: https://docs.flagsmith.com/deployment/locally-api#environment-variables
@@ -41,6 +41,10 @@ services:
       TASK_RUN_METHOD: TASK_PROCESSOR # other options are: SYNCHRONOUSLY, SEPARATE_THREAD (default)
       PROMETHEUS_ENABLED: 'true'
 
+      # E2E Testing
+      E2E_TEST_AUTH_TOKEN: 'some-token'
+      ENABLE_FE_E2E: 'true'
+
       # Uncomment if you want to enable Google OAuth. Note this does not turn Google OAuth on. You still need to use
       # Flagsmith on Flagsmith to enable it - https://docs.flagsmith.com/deployment/#oauth_google
       # DJANGO_SECURE_CROSS_ORIGIN_OPENER_POLICY: 'same-origin-allow-popups'
@@ -63,7 +67,7 @@ services:
   # The flagsmith_processor service is only needed if TASK_RUN_METHOD set to TASK_PROCESSOR
   # in the application environment
   flagsmith-task-processor:
-    image: docker.flagsmith.com/flagsmith/flagsmith:latest
+    image: flagsmith/flagsmith-private-cloud:latest
     environment:
       DATABASE_URL: postgresql://postgres:password@postgres:5432/flagsmith
       USE_POSTGRES_FOR_ANALYTICS: 'true'

frontend/e2e/global-setup.playwright.ts

@@ -36,65 +36,53 @@ async function globalSetup(config: FullConfig) {
   });
 
   // Teardown previous test data with retry logic
-  if (token) {
-    const maxAttempts = 3;
-    const delayMs = 2000;
-    let teardownSuccess = false;
+  if (!token) {
+    const errorMsg = 'e2e teardown failed - no available token (set E2E_TEST_TOKEN or E2E_TEST_TOKEN_<ENV>)';
+    console.error('\n', '\x1b[31m', errorMsg, '\x1b[0m', '\n');
+    throw new Error(errorMsg);
+  }
 
-    for (let attempt = 0; attempt < maxAttempts; attempt++) {
-      if (attempt > 0) {
-        console.log(`\x1b[33m%s\x1b[0m`, `Retrying teardown (attempt ${attempt + 1}/${maxAttempts})...`);
-        await new Promise(resolve => setTimeout(resolve, delayMs));
-      }
+  const maxAttempts = 3;
+  const delayMs = 2000;
+
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    if (attempt > 0) {
+      console.log(`\x1b[33m%s\x1b[0m`, `Retrying teardown (attempt ${attempt + 1}/${maxAttempts})...`);
+      await new Promise(resolve => setTimeout(resolve, delayMs));
+    }
 
-      try {
-        const res = await fetch(e2eTestApi, {
-          body: JSON.stringify({}),
-          headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-            'X-E2E-Test-Auth-Token': token.trim(),
-          },
-          method: 'POST',
-        });
+    try {
+      const res = await fetch(e2eTestApi, {
+        body: JSON.stringify({}),
+        headers: {
+          'Accept': 'application/json',
+          'Content-Type': 'application/json',
+          'X-E2E-Test-Auth-Token': token.trim(),
+        },
+        method: 'POST',
+      });
 
-        if (res.ok) {
-          console.log('\n', '\x1b[32m', 'e2e teardown successful', '\x1b[0m', '\n');
-          teardownSuccess = true;
-          break;
-        } else {
-          console.error('\x1b[31m%s\x1b[0m', `✗ E2E teardown failed: ${res.status}`);
-          if (attempt < maxAttempts - 1) {
-            console.log('');
-          }
-        }
-      } catch (error) {
-        console.error('\x1b[31m%s\x1b[0m', `✗ E2E teardown error: ${error.message || String(error)}`);
-        if (attempt < maxAttempts - 1) {
-          console.log('');
-        }
+      if (res.ok) {
+        console.log('\n', '\x1b[32m', 'e2e teardown successful', '\x1b[0m', '\n');
+        console.log('Starting E2E tests');
+        return;
       }
-    }
 
-    if (!teardownSuccess) {
-      const errorMsg = `e2e teardown failed after ${maxAttempts} attempts`;
-      console.error('\n', '\x1b[31m', errorMsg, '\x1b[0m', '\n');
-      if (process.env.E2E_LOCAL !== 'true' && process.env.E2E_DEV !== 'true') {
-        throw new Error(errorMsg); // Fail tests early in CI if teardown fails
+      console.error('\x1b[31m%s\x1b[0m', `✗ E2E teardown failed: ${res.status}`);
+      if (attempt < maxAttempts - 1) {
+        console.log('');
+      }
+    } catch (error) {
+      console.error('\x1b[31m%s\x1b[0m', `✗ E2E teardown error: ${error.message || String(error)}`);
+      if (attempt < maxAttempts - 1) {
+        console.log('');
       }
-    }
-  } else {
-    // Only warn for local/dev testing, don't fail
-    if (process.env.E2E_LOCAL === 'true' || process.env.E2E_DEV === 'true') {
-      console.log('\n', '\x1b[33m', 'e2e teardown skipped (no token) - OK for local testing', '\x1b[0m', '\n');
-    } else {
-      const errorMsg = 'e2e teardown failed - no available token (set E2E_TEST_TOKEN or E2E_TEST_TOKEN_<ENV>)';
-      console.error('\n', '\x1b[31m', errorMsg, '\x1b[0m', '\n');
-      throw new Error(errorMsg); // Fail tests in CI if token is missing
     }
   }
 
-  console.log('Starting E2E tests');
+  const errorMsg = `e2e teardown failed after ${maxAttempts} attempts`;
+  console.error('\n', '\x1b[31m', errorMsg, '\x1b[0m', '\n');
+  throw new Error(errorMsg);
 }
 
 export default globalSetup;

frontend/package.json

@@ -12,7 +12,7 @@
     "test": "npx -y tsx e2e/run-with-retry.ts",
     "test:run": "npm run test:bundle && cross-env NODE_ENV=production E2E=true npx playwright test",
     "test:dev": "cross-env NODE_ENV=production E2E=true E2E_DEV=true npx playwright test --ui",
-    "test:devlocal": "cross-env NODE_ENV=production E2E_LOCAL=true E2E_CONCURRENCY=1 E2E=true E2E_DEV=true npx playwright test --ui",
+    "test:devlocal": "cross-env NODE_ENV=production E2E=true E2E_DEV=true E2E_LOCAL=true E2E_CONCURRENCY=1 npx playwright test --ui",
     "test:devBundle": "npm run test:bundle && npm run test:dev",
     "test:install": "npx playwright install firefox",
     "test:teardown": "npx tsx e2e/teardown.ts",