fix streaming tests + cleanup

Author: chargome

packages/react-router/test/server/wrapSentryHandleRequest.test.ts

@@ -176,58 +176,6 @@ describe('wrapSentryHandleRequest', () => {
   });
 });
 
-test('should call original handler with same parameters', async () => {
-  const originalHandler = vi.fn().mockResolvedValue('original response');
-  const wrappedHandler = wrapSentryHandleRequest(originalHandler);
-
-  const request = new Request('https://taco.burrito');
-  const responseStatusCode = 200;
-  const responseHeaders = new Headers();
-  const routerContext = { staticHandlerContext: { matches: [] } } as any;
-  const loadContext = {} as any;
-
-  const result = await wrappedHandler(request, responseStatusCode, responseHeaders, routerContext, loadContext);
-
-  expect(originalHandler).toHaveBeenCalledWith(
-    request,
-    responseStatusCode,
-    responseHeaders,
-    routerContext,
-    loadContext,
-  );
-  expect(result).toBe('original response');
-});
-
-test('should set span attributes when parameterized path exists and active span exists', async () => {
-  const originalHandler = vi.fn().mockResolvedValue('test');
-  const wrappedHandler = wrapSentryHandleRequest(originalHandler);
-
-  const mockActiveSpan = {};
-  const mockRootSpan = { setAttributes: vi.fn() };
-  const mockRpcMetadata = { type: RPCType.HTTP, route: '/some-path' };
-
-  (getActiveSpan as unknown as ReturnType<typeof vi.fn>).mockReturnValue(mockActiveSpan);
-  (getRootSpan as unknown as ReturnType<typeof vi.fn>).mockReturnValue(mockRootSpan);
-  const getRPCMetadata = vi.fn().mockReturnValue(mockRpcMetadata);
-  (vi.importActual('@opentelemetry/core') as unknown as { getRPCMetadata: typeof getRPCMetadata }).getRPCMetadata =
-    getRPCMetadata;
-
-  const routerContext = {
-    staticHandlerContext: {
-      matches: [{ route: { path: 'some-path' } }],
-    },
-  } as any;
-
-  await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);
-
-  expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
-    [ATTR_HTTP_ROUTE]: '/some-path',
-    [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.request-handler',
-  });
-  expect(mockRpcMetadata.route).toBe('/some-path');
-});
-
 test('should not set span attributes when parameterized path does not exist', async () => {
   const mockActiveSpan = {};
   const mockRootSpan = { setAttributes: vi.fn() };
@@ -249,29 +197,6 @@ test('should not set span attributes when parameterized path does not exist', as
   expect(mockRootSpan.setAttributes).not.toHaveBeenCalled();
 });
 
-test('should not set span attributes when active span does not exist', async () => {
-  const originalHandler = vi.fn().mockResolvedValue('test');
-  const wrappedHandler = wrapSentryHandleRequest(originalHandler);
-
-  const mockRpcMetadata = { type: RPCType.HTTP, route: '/some-path' };
-
-  (getActiveSpan as unknown as ReturnType<typeof vi.fn>).mockReturnValue(null);
-
-  const getRPCMetadata = vi.fn().mockReturnValue(mockRpcMetadata);
-  (vi.importActual('@opentelemetry/core') as unknown as { getRPCMetadata: typeof getRPCMetadata }).getRPCMetadata =
-    getRPCMetadata;
-
-  const routerContext = {
-    staticHandlerContext: {
-      matches: [{ route: { path: 'some-path' } }],
-    },
-  } as any;
-
-  await wrappedHandler(new Request('https://tio.pepe'), 200, new Headers(), routerContext, {} as any);
-
-  expect(getRPCMetadata).not.toHaveBeenCalled();
-});
-
 describe('getMetaTagTransformer', () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -281,64 +206,63 @@ describe('getMetaTagTransformer', () => {
   });
 
   test('should inject meta tags before closing head tag', () => {
-    const outputStream = new PassThrough();
-    const bodyStream = new PassThrough();
-    const transformer = getMetaTagTransformer(bodyStream);
-
-    let outputData = '';
-    outputStream.on('data', chunk => {
-      outputData += chunk.toString();
-    });
-
-    outputStream.on('end', () => {
-      expect(outputData).toContain('<meta name="sentry-trace" content="test-trace-id"></head>');
-      expect(outputData).not.toContain('</head></head>');
+    return new Promise<void>(resolve => {
+      const bodyStream = new PassThrough();
+      const transformer = getMetaTagTransformer(bodyStream);
+
+      let outputData = '';
+      bodyStream.on('data', chunk => {
+        outputData += chunk.toString();
+      });
+
+      bodyStream.on('end', () => {
+        expect(outputData).toContain('<meta name="sentry-trace" content="test-trace-id"></head>');
+        expect(outputData).not.toContain('</head></head>');
+        resolve();
+      });
+
+      transformer.write('<html><head></head><body>Test</body></html>');
+      transformer.end();
     });
-
-    transformer.pipe(outputStream);
-
-    bodyStream.write('<html><head></head><body>Test</body></html>');
-    bodyStream.end();
   });
 
   test('should not modify chunks without head closing tag', () => {
-    const outputStream = new PassThrough();
-    const bodyStream = new PassThrough();
-    const transformer = getMetaTagTransformer(bodyStream);
-
-    let outputData = '';
-    outputStream.on('data', chunk => {
-      outputData += chunk.toString();
+    return new Promise<void>(resolve => {
+      const bodyStream = new PassThrough();
+      const transformer = getMetaTagTransformer(bodyStream);
+
+      let outputData = '';
+      bodyStream.on('data', chunk => {
+        outputData += chunk.toString();
+      });
+
+      bodyStream.on('end', () => {
+        expect(outputData).toBe('<html><body>Test</body></html>');
+        resolve();
+      });
+
+      transformer.write('<html><body>Test</body></html>');
+      transformer.end();
     });
-
-    outputStream.on('end', () => {
-      expect(outputData).toBe('<html><body>Test</body></html>');
-      expect(getTraceMetaTags).toHaveBeenCalled();
-    });
-
-    transformer.pipe(outputStream);
-
-    bodyStream.write('<html><body>Test</body></html>');
-    bodyStream.end();
   });
 
   test('should handle buffer input', () => {
-    const outputStream = new PassThrough();
-    const bodyStream = new PassThrough();
-    const transformer = getMetaTagTransformer(bodyStream);
-
-    let outputData = '';
-    outputStream.on('data', chunk => {
-      outputData += chunk.toString();
-    });
-
-    outputStream.on('end', () => {
-      expect(outputData).toContain('<meta name="sentry-trace" content="test-trace-id"></head>');
+    return new Promise<void>(resolve => {
+      const bodyStream = new PassThrough();
+      const transformer = getMetaTagTransformer(bodyStream);
+
+      let outputData = '';
+      bodyStream.on('data', chunk => {
+        outputData += chunk.toString();
+      });
+
+      bodyStream.on('end', () => {
+        expect(outputData).toContain('<meta name="sentry-trace" content="test-trace-id"></head>');
+        resolve();
+      });
+
+      transformer.write(Buffer.from('<html><head></head><body>Test</body></html>'));
+      transformer.end();
     });
-
-    transformer.pipe(outputStream);
-
-    bodyStream.write(Buffer.from('<html><head></head><body>Test</body></html>'));
-    bodyStream.end();
   });
 });