fix(repo): Better route interception hierarchy

Author: jacekradko

integration/testUtils/index.ts

@@ -102,9 +102,9 @@ const createClerkUtils = ({ page }: TestArgs) => {
   };
 };
 
-const createTestingTokenUtils = ({ page }: TestArgs) => {
+const createTestingTokenUtils = ({ context }: TestArgs) => {
   return {
-    setup: async () => setupClerkTestingToken({ page }),
+    setup: async () => setupClerkTestingToken({ context }),
   };
 };
 

integration/tests/non-secure-context.test.ts

@@ -51,8 +51,8 @@ testAgainstRunningApps({ withPattern: ['next.appRouter.withEmailCodes'] })(
       server.close();
     });
 
-    test('sign-in flow', async ({ page }) => {
-      const u = createTestUtils({ app, page });
+    test('sign-in flow', async ({ context, page }) => {
+      const u = createTestUtils({ app, context, page });
 
       await u.po.testingToken.setup();
       await u.page.goto(`http://${APP_HOST}`, { timeout: 50000 });

integration/tests/resiliency.test.ts

@@ -197,8 +197,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
       await expect(page.getByText('Clerk is loading', { exact: true })).toBeHidden();
     });
 
-    // TODO: Fix detection of hotloaded clerk-js failing
-    test.skip('clerk-js client fails and status degraded', async ({ page, context }) => {
+    test('clerk-js client fails and status degraded', async ({ page, context }) => {
       const u = createTestUtils({ app, page, context });
 
       await page.route('**/v1/client?**', route => route.fulfill(make500ClerkResponse()));
@@ -227,8 +226,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
       await expect(page.getByText('Clerk is loading', { exact: true })).toBeHidden();
     });
 
-    // TODO: Fix flakiness when intercepting environment requests
-    test.skip('clerk-js environment fails and status degraded', async ({ page, context }) => {
+    test('clerk-js environment fails and status degraded', async ({ page, context }) => {
       const u = createTestUtils({ app, page, context });
 
       await page.route('**/v1/environment?**', route => route.fulfill(make500ClerkResponse()));

integration/tests/reverification.test.ts

@@ -37,10 +37,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
     });
 
     test.afterAll(async () => {
-      await fakeOrganization.delete();
-      await fakeViewer.deleteIfExists();
-      await fakeAdmin.deleteIfExists();
-      await app.teardown();
+      try {
+        await fakeOrganization.delete();
+        await fakeViewer.deleteIfExists();
+        await fakeAdmin.deleteIfExists();
+      } catch (error) {
+        console.error(error);
+      } finally {
+        await app.teardown();
+      }
     });
 
     test('reverification prompt on adding new email address', async ({ page, context }) => {

packages/testing/src/playwright/helpers.ts

@@ -88,7 +88,12 @@ type PlaywrightClerkSignInParams = {
 };
 
 const signIn = async ({ page, signInParams, setupClerkTestingTokenOptions }: PlaywrightClerkSignInParams) => {
-  await setupClerkTestingToken({ page, options: setupClerkTestingTokenOptions });
+  const context = page.context();
+  if (!context) {
+    throw new Error('Page context is not available. Make sure the page is properly initialized.');
+  }
+
+  await setupClerkTestingToken({ context, options: setupClerkTestingTokenOptions });
   await loaded({ page });
 
   await page.evaluate(signInHelper, { signInParams });

packages/testing/src/playwright/setupClerkTestingToken.ts

@@ -1,37 +1,46 @@
-import type { Page } from '@playwright/test';
+import type { BrowserContext, Page } from '@playwright/test';
 
 import type { SetupClerkTestingTokenOptions } from '../common';
 import { ERROR_MISSING_FRONTEND_API_URL, TESTING_TOKEN_PARAM } from '../common';
 
 type SetupClerkTestingTokenParams = {
-  page: Page;
+  context?: BrowserContext;
+  page?: Page;
   options?: SetupClerkTestingTokenOptions;
 };
 
 /**
  * Bypasses bot protection by appending the testing token in the Frontend API requests.
  *
+ * @param params.context - The Playwright browser context object.
  * @param params.page - The Playwright page object.
  * @param params.options.frontendApiUrl - The frontend API URL for your Clerk dev instance, without the protocol.
  * @returns A promise that resolves when the bot protection bypass is set up.
  * @throws An error if the Frontend API URL is not provided.
  * @example
  * import { setupClerkTestingToken } from '@clerk/testing/playwright';
  *
- * test('should bypass bot protection', async ({ page }) => {
- *    await setupClerkTestingToken({ page });
+ * test('should bypass bot protection', async ({ context }) => {
+ *    await setupClerkTestingToken({ context });
+ *    const page = await context.newPage();
  *    await page.goto('https://your-app.com');
  *    // Continue with your test...
  *  });
  */
-export const setupClerkTestingToken = async ({ page, options }: SetupClerkTestingTokenParams) => {
+export const setupClerkTestingToken = async ({ context, options, page }: SetupClerkTestingTokenParams) => {
+  const browserContext = context ?? page?.context();
+
+  if (!browserContext) {
+    throw new Error('Either context or page must be provided to setup testing token');
+  }
+
   const fapiUrl = options?.frontendApiUrl || process.env.CLERK_FAPI;
   if (!fapiUrl) {
     throw new Error(ERROR_MISSING_FRONTEND_API_URL);
   }
   const apiUrl = `https://${fapiUrl}/v1/**/*`;
 
-  await page.route(apiUrl, async route => {
+  await browserContext.route(apiUrl, async route => {
     const originalUrl = new URL(route.request().url());
     const testingToken = process.env.CLERK_TESTING_TOKEN;