cleanup...

Author: mydea

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts

@@ -6,7 +6,7 @@ test('Creates a pageload transaction for app router routes', async ({ page }) =>
 
   const clientPageloadTransactionPromise = waitForTransaction('nextjs-13-app-dir', transactionEvent => {
     return (
-      transactionEvent?.transaction === `/server-component/parameter/${randomRoute}` &&
+      transactionEvent.transaction === `/server-component/parameter/${randomRoute}` &&
       transactionEvent.contexts?.trace?.op === 'pageload'
     );
   });
@@ -26,7 +26,7 @@ test('Creates a navigation transaction for app router routes', async ({ page })
       JSON.stringify(transactionEvent.contexts?.trace, null, 2),
     );
     return (
-      transactionEvent?.transaction === `/server-component/parameter/${randomRoute}` &&
+      transactionEvent.transaction === `/server-component/parameter/${randomRoute}` &&
       transactionEvent.contexts?.trace?.op === 'pageload'
     );
   });
@@ -42,7 +42,7 @@ test('Creates a navigation transaction for app router routes', async ({ page })
       JSON.stringify(transactionEvent.contexts?.trace, null, 2),
     );
     return (
-      transactionEvent?.transaction === '/server-component/parameter/foo/bar/baz' &&
+      transactionEvent.transaction === '/server-component/parameter/foo/bar/baz' &&
       transactionEvent.contexts?.trace?.op === 'navigation'
     );
   });
@@ -54,7 +54,7 @@ test('Creates a navigation transaction for app router routes', async ({ page })
       JSON.stringify(transactionEvent.contexts?.trace, null, 2),
     );
     return (
-      transactionEvent?.transaction === 'Page Server Component (/server-component/parameter/[...parameters])' &&
+      transactionEvent.transaction === 'Page Server Component (/server-component/parameter/[...parameters])' &&
       (await clientNavigationTransactionPromise).contexts?.trace?.trace_id ===
         transactionEvent.contexts?.trace?.trace_id
     );

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts

@@ -3,11 +3,11 @@ import { waitForError, waitForTransaction } from '@sentry-internal/event-proxy-s
 
 test('Should create a transaction for route handlers', async ({ request }) => {
   const routehandlerTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
-    console.log('should be GET /route-handlers/[param]', transactionEvent?.transaction);
+    console.log('should be GET /route-handlers/[param]', transactionEvent.transaction);
     // Sometimes, next.js adds /route there, we accept both variants
     return (
-      transactionEvent?.transaction === 'GET /route-handlers/[param]' ||
-      transactionEvent?.transaction === 'GET /route-handlers/[param]/route'
+      transactionEvent.transaction === 'GET /route-handlers/[param]' ||
+      transactionEvent.transaction === 'GET /route-handlers/[param]/route'
     );
   });
 
@@ -25,11 +25,11 @@ test('Should create a transaction for route handlers and correctly set span stat
   request,
 }) => {
   const routehandlerTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
-    console.log('should be POST /route-handlers/[param]', transactionEvent?.transaction);
+    console.log('should be POST /route-handlers/[param]', transactionEvent.transaction);
     // Sometimes, next.js adds /route there, we accept both variants
     return (
-      transactionEvent?.transaction === 'POST /route-handlers/[param]' ||
-      transactionEvent?.transaction === 'POST /route-handlers/[param]/route'
+      transactionEvent.transaction === 'POST /route-handlers/[param]' ||
+      transactionEvent.transaction === 'POST /route-handlers/[param]/route'
     );
   });
 
@@ -49,11 +49,11 @@ test('Should record exceptions and transactions for faulty route handlers', asyn
 
   const routehandlerTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
     console.log('transactionEvent3', JSON.stringify(transactionEvent, null, 2));
-    console.log('should be PUT /route-handlers/[param]', transactionEvent?.transaction);
+    console.log('should be PUT /route-handlers/[param]', transactionEvent.transaction);
     // Sometimes, next.js adds /route there, we accept both variants
     return (
-      transactionEvent?.transaction === 'PUT /route-handlers/[param]' ||
-      transactionEvent?.transaction === 'PUT /route-handlers/[param]/route'
+      transactionEvent.transaction === 'PUT /route-handlers/[param]' ||
+      transactionEvent.transaction === 'PUT /route-handlers/[param]/route'
     );
   });
 
@@ -82,7 +82,7 @@ test('Should record exceptions and transactions for faulty route handlers', asyn
 test.describe('Edge runtime', () => {
   test('should create a transaction for route handlers', async ({ request }) => {
     const routehandlerTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
-      return transactionEvent?.transaction === 'PATCH /route-handlers/[param]/edge';
+      return transactionEvent.transaction === 'PATCH /route-handlers/[param]/edge';
     });
 
     const response = await request.patch('/route-handlers/bar/edge');
@@ -100,7 +100,7 @@ test.describe('Edge runtime', () => {
     });
 
     const routehandlerTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
-      return transactionEvent?.transaction === 'DELETE /route-handlers/[param]/edge';
+      return transactionEvent.transaction === 'DELETE /route-handlers/[param]/edge';
     });
 
     await request.delete('/route-handlers/baz/edge').catch(() => {