fix canary tests I missed in #13154

Author: Luca Forstner

dev-packages/e2e-tests/test-applications/nextjs-13/package.json

@@ -24,17 +24,17 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.44.1",
-    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@sentry-internal/browser-utils": "latest || *",
     "@sentry-internal/feedback": "latest || *",
+    "@sentry-internal/replay": "latest || *",
     "@sentry-internal/replay-canvas": "latest || *",
-    "@sentry-internal/browser-utils": "latest || *",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
     "@sentry/browser": "latest || *",
     "@sentry/core": "latest || *",
     "@sentry/nextjs": "latest || *",
     "@sentry/node": "latest || *",
     "@sentry/opentelemetry": "latest || *",
     "@sentry/react": "latest || *",
-    "@sentry-internal/replay": "latest || *",
     "@sentry/types": "latest || *",
     "@sentry/utils": "latest || *",
     "@sentry/vercel-edge": "latest || *"

dev-packages/e2e-tests/test-applications/nextjs-13/pages/api/endpoint-excluded-with-regex.ts

@@ -1,7 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
-const handler = async (_req: NextApiRequest, res: NextApiResponse): Promise<void> => {
+export default async (_req: NextApiRequest, res: NextApiResponse): Promise<void> => {
   res.status(200).json({ success: true });
 };
-
-module.exports = handler;

dev-packages/e2e-tests/test-applications/nextjs-13/pages/api/endpoint-excluded-with-string.ts

@@ -1,7 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
-const handler = async (_req: NextApiRequest, res: NextApiResponse): Promise<void> => {
+export default async (_req: NextApiRequest, res: NextApiResponse): Promise<void> => {
   res.status(200).json({ success: true });
 };
-
-module.exports = handler;

dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/cjs-api-endpoints.test.ts

@@ -1,7 +1,13 @@
 import { expect, test } from '@playwright/test';
 import { waitForTransaction } from '@sentry-internal/test-utils';
 
+const packageJson = require('../../package.json');
+const nextjsVersion = packageJson.dependencies.next;
+const nextjsMajor = Number(nextjsVersion.split('.')[0]);
+
 test('should create a transaction for a CJS pages router API endpoint', async ({ request }) => {
+  test.skip(nextjsMajor > 13, 'Next.js does not like CJS routes after a certain point.');
+
   const transactionPromise = waitForTransaction('nextjs-13', async transactionEvent => {
     return (
       transactionEvent.transaction === 'GET /api/cjs-api-endpoint' &&
@@ -62,6 +68,8 @@ test('should create a transaction for a CJS pages router API endpoint', async ({
 });
 
 test('should not mess up require statements in CJS API endpoints', async ({ request }) => {
+  test.skip(nextjsMajor > 13, 'Next.js does not like CJS routes after a certain point.');
+
   const transactionPromise = waitForTransaction('nextjs-13', async transactionEvent => {
     return (
       transactionEvent.transaction === 'GET /api/cjs-api-endpoint-with-require' &&

dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/excluded-api-endpoints.test.ts

@@ -11,7 +11,7 @@ test('should not automatically create transactions for routes that were excluded
     );
   });
 
-  await (await request.get(`/api/endpoint-excluded-with-string`)).json();
+  expect(await (await request.get(`/api/endpoint-excluded-with-string`)).text()).toBe('{"success":true}');
 
   let transactionPromiseReceived = false;
   transactionPromise.then(() => {
@@ -33,7 +33,7 @@ test('should not automatically create transactions for routes that were excluded
     );
   });
 
-  await (await request.get(`/api/endpoint-excluded-with-regex`)).json();
+  expect(await (await request.get(`/api/endpoint-excluded-with-regex`)).text()).toBe('{"success":true}');
 
   let transactionPromiseReceived = false;
   transactionPromise.then(() => {

dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/server-component-error.test.ts

@@ -12,7 +12,6 @@ test('Should capture an error thrown in a server component', async ({ page }) =>
     contexts: {
       runtime: { name: 'node', version: expect.any(String) },
       trace: {
-        parent_span_id: expect.any(String),
         span_id: expect.any(String),
         trace_id: expect.any(String),
       },
@@ -27,7 +26,6 @@ test('Should capture an error thrown in a server component', async ({ page }) =>
         },
       ],
     },
-    modules: { next: '13.2.0' },
     platform: 'node',
     request: {
       cookies: expect.any(Object),

dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/wrapApiHandlerWithSentry.test.ts

@@ -22,7 +22,6 @@ const cases = [
 cases.forEach(({ name, url, transactionName }) => {
   test(`Should capture transactions for routes with various shapes (${name})`, async ({ request }) => {
     const transactionEventPromise = waitForTransaction('nextjs-13', transactionEvent => {
-      console.log({ t: transactionEvent.transaction });
       return transactionEvent.transaction === transactionName && transactionEvent.contexts?.trace?.op === 'http.server';
     });