tests: adjust assertions to be consistent

Author: logaretm

dev-packages/e2e-tests/test-applications/create-next-app/tests/server-transactions.test.ts

@@ -40,8 +40,7 @@ test('Sends server-side transactions to Sentry', async ({ baseURL }) => {
           },
           description: 'test-span',
           origin: 'manual',
-          // Note: parent_span_id may be the root span or an intermediate "executing api route" span
-          // depending on Next.js instrumentation, so we just check it exists
+          // Won't be the trace span id because we don't wrap the Next.js span in the wrapper
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),

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

@@ -39,12 +39,12 @@ test('should create a transaction for a CJS pages router API endpoint', async ({
         data: {
           'http.response.status_code': 200,
           'sentry.op': 'http.server',
-          'sentry.origin': 'auto',
+          'sentry.origin': 'auto.http.nextjs',
           'sentry.sample_rate': 1,
           'sentry.source': 'route',
         },
         op: 'http.server',
-        origin: 'auto',
+        origin: 'auto.http.nextjs',
         span_id: expect.stringMatching(/[a-f0-9]{16}/),
         status: 'ok',
         trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -57,7 +57,7 @@ test('should create a transaction for a CJS pages router API endpoint', async ({
       cookies: expect.any(Object),
       headers: expect.any(Object),
       method: 'GET',
-      url: expect.stringMatching(/\/api\/cjs-api-endpoint$/),
+      url: expect.stringMatching(/^http.*\/api\/cjs-api-endpoint$/),
     },
     spans: expect.arrayContaining([]),
     start_timestamp: expect.any(Number),
@@ -102,12 +102,12 @@ test('should not mess up require statements in CJS API endpoints', async ({ requ
         data: {
           'http.response.status_code': 200,
           'sentry.op': 'http.server',
-          'sentry.origin': 'auto',
+          'sentry.origin': 'auto.http.nextjs',
           'sentry.sample_rate': 1,
           'sentry.source': 'route',
         },
         op: 'http.server',
-        origin: 'auto',
+        origin: 'auto.http.nextjs',
         span_id: expect.stringMatching(/[a-f0-9]{16}/),
         status: 'ok',
         trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -120,7 +120,7 @@ test('should not mess up require statements in CJS API endpoints', async ({ requ
       cookies: expect.any(Object),
       headers: expect.any(Object),
       method: 'GET',
-      url: expect.stringMatching(/\/api\/cjs-api-endpoint-with-require$/),
+      url: expect.stringMatching(/^http.*\/api\/cjs-api-endpoint-with-require$/),
     },
     spans: expect.arrayContaining([]),
     start_timestamp: expect.any(Number),

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

@@ -55,11 +55,11 @@ test('Should report an error event for errors thrown in pages router api routes'
         data: {
           'http.response.status_code': 500,
           'sentry.op': 'http.server',
-          'sentry.origin': 'auto',
+          'sentry.origin': 'auto.http.nextjs',
           'sentry.source': 'route',
         },
         op: 'http.server',
-        origin: 'auto',
+        origin: 'auto.http.nextjs',
         span_id: expect.stringMatching(/[a-f0-9]{16}/),
         status: 'internal_error',
         trace_id: (await errorEventPromise).contexts?.trace?.trace_id,
@@ -98,11 +98,11 @@ test('Should report a transaction event for a successful pages router api route'
         data: {
           'http.response.status_code': 200,
           'sentry.op': 'http.server',
-          'sentry.origin': 'auto',
+          'sentry.origin': 'auto.http.nextjs',
           'sentry.source': 'route',
         },
         op: 'http.server',
-        origin: 'auto',
+        origin: 'auto.http.nextjs',
         span_id: expect.stringMatching(/[a-f0-9]{16}/),
         status: 'ok',
         trace_id: expect.stringMatching(/[a-f0-9]{32}/),

dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/edge-route.test.ts

@@ -54,8 +54,12 @@ test('Faulty edge routes', async ({ request }) => {
 
   test.step('should have scope isolation', () => {
     expect(edgerouteTransaction.tags?.['my-isolated-tag']).toBe(true);
-    expect(edgerouteTransaction.tags?.['my-global-scope-isolated-tag']).not.toBeDefined();
+    // No longer valid since we removed the global scope isolation from the wrapper
+    // expect(edgerouteTransaction.tags?.['my-global-scope-isolated-tag']).not.toBeDefined();
+    expect(edgerouteTransaction.tags?.['my-global-scope-isolated-tag']).toBeDefined();
     expect(errorEvent.tags?.['my-isolated-tag']).toBe(true);
-    expect(errorEvent.tags?.['my-global-scope-isolated-tag']).not.toBeDefined();
+    // No longer valid since we removed the global scope isolation from the wrapper
+    // expect(errorEvent.tags?.['my-global-scope-isolated-tag']).not.toBeDefined();
+    expect(errorEvent.tags?.['my-global-scope-isolated-tag']).toBeDefined();
   });
 });