test(nextjs): Fix canary tests (#12875)

getsentry · Jul 11, 2024 · 963eab7 · 963eab7
1 parent 9c613be
commit 963eab7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts b/...e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts
@@ -39,7 +39,10 @@ test('Creates a navigation transaction for app router routes', async ({ page })
 
   const serverComponentTransactionPromise = waitForTransaction('nextjs-app-dir', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'GET /server-component/parameter/foo/bar/baz' &&
+      // It seems to differ between Next.js versions whether the route is parameterized or not
+      (transactionEvent?.transaction === 'GET /server-component/parameter/foo/bar/baz' ||
+        transactionEvent?.transaction === 'GET /server-component/parameter/[...parameters]') &&
+      transactionEvent.contexts?.trace?.data?.['http.target'].startsWith('/server-component/parameter/foo/bar/baz') &&
       (await clientNavigationTransactionPromise).contexts?.trace?.trace_id ===
         transactionEvent.contexts?.trace?.trace_id
     );

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts
@@ -3,7 +3,10 @@ import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Sends a transaction for a request to app router', async ({ page }) => {
   const serverComponentTransactionPromise = waitForTransaction('nextjs-app-dir', transactionEvent => {
-    return transactionEvent?.transaction === 'GET /server-component/parameter/[...parameters]';
+    return (
+      transactionEvent?.transaction === 'GET /server-component/parameter/[...parameters]' &&
+      transactionEvent.contexts?.trace?.data?.['http.target'].startsWith('/server-component/parameter/1337/42')
+    );
   });
 
   await page.goto('/server-component/parameter/1337/42');