fix test

Author: mydea

packages/browser-utils/src/metrics/browserMetrics.ts

@@ -409,7 +409,10 @@ export function addPerformanceEntries(span: Span, options: AddPerformanceEntries
   _measurements = {};
 }
 
-/** Create measure related spans */
+/**
+ * Create measure related spans.
+ * Exported only for tests.
+ */
 export function _addMeasureSpans(
   span: Span,
   entry: PerformanceEntry,
@@ -543,8 +546,11 @@ function _addRequest(span: Span, entry: PerformanceNavigationTiming, timeOrigin:
   }
 }
 
-/** Create resource-related spans */
-function _addResourceSpans(
+/**
+ * Create resource-related spans.
+ * Exported only for tests.
+ */
+export function _addResourceSpans(
   span: Span,
   entry: PerformanceResourceTiming,
   resourceUrl: string,

packages/browser-utils/test/browser/browserMetrics.test.ts

@@ -9,7 +9,6 @@ import {
   spanToJSON,
 } from '@sentry/core';
 import type { Span } from '@sentry/core';
-import type { ResourceEntry } from '../../src/metrics/browserMetrics';
 import { _addMeasureSpans, _addResourceSpans } from '../../src/metrics/browserMetrics';
 import { WINDOW } from '../../src/types';
 import { TestClient, getDefaultClientOptions } from '../utils/TestClient';
@@ -31,6 +30,17 @@ const originalLocation = WINDOW.location;
 
 const resourceEntryName = 'https://example.com/assets/to/css';
 
+interface AdditionalPerformanceResourceTiming {
+  renderBlockingStatus?: 'non-blocking' | 'blocking' | '';
+  deliveryType?: 'cache' | 'navigational-prefetch' | '';
+}
+
+function mockPerformanceResourceTiming(
+  data: Partial<PerformanceResourceTiming> & AdditionalPerformanceResourceTiming,
+): PerformanceResourceTiming & AdditionalPerformanceResourceTiming {
+  return data as PerformanceResourceTiming & AdditionalPerformanceResourceTiming;
+}
+
 describe('_addMeasureSpans', () => {
   const span = new SentrySpan({ op: 'pageload', name: '/', sampled: true });
 
@@ -54,13 +64,12 @@ describe('_addMeasureSpans', () => {
       spans.push(span);
     });
 
-    const entry: Omit<PerformanceMeasure, 'toJSON'> = {
+    const entry = {
       entryType: 'measure',
       name: 'measure-1',
       duration: 10,
       startTime: 12,
-      detail: undefined,
-    };
+    } as PerformanceEntry;
 
     const timeOrigin = 100;
     const startTime = 23;
@@ -116,13 +125,13 @@ describe('_addResourceSpans', () => {
       spans.push(span);
     });
 
-    const entry: ResourceEntry = {
+    const entry = mockPerformanceResourceTiming({
       initiatorType: 'xmlhttprequest',
       transferSize: 256,
       encodedBodySize: 256,
       decodedBodySize: 256,
       renderBlockingStatus: 'non-blocking',
-    };
+    });
     _addResourceSpans(span, entry, resourceEntryName, 123, 456, 100);
 
     expect(spans).toHaveLength(0);
@@ -135,13 +144,13 @@ describe('_addResourceSpans', () => {
       spans.push(span);
     });
 
-    const entry: ResourceEntry = {
+    const entry = mockPerformanceResourceTiming({
       initiatorType: 'fetch',
       transferSize: 256,
       encodedBodySize: 256,
       decodedBodySize: 256,
       renderBlockingStatus: 'non-blocking',
-    };
+    });
     _addResourceSpans(span, entry, 'https://example.com/assets/to/me', 123, 456, 100);
 
     expect(spans).toHaveLength(0);
@@ -154,13 +163,13 @@ describe('_addResourceSpans', () => {
       spans.push(span);
     });
 
-    const entry: ResourceEntry = {
+    const entry = mockPerformanceResourceTiming({
       initiatorType: 'css',
       transferSize: 256,
       encodedBodySize: 456,
       decodedBodySize: 593,
       renderBlockingStatus: 'non-blocking',
-    };
+    });
 
     const timeOrigin = 100;
     const startTime = 23;
@@ -222,9 +231,9 @@ describe('_addResourceSpans', () => {
     ];
     for (let i = 0; i < table.length; i++) {
       const { initiatorType, op } = table[i]!;
-      const entry: ResourceEntry = {
+      const entry = mockPerformanceResourceTiming({
         initiatorType,
-      };
+      });
       _addResourceSpans(span, entry, 'https://example.com/assets/to/me', 123, 234, 465);
 
       expect(spans).toHaveLength(i + 1);
@@ -239,13 +248,13 @@ describe('_addResourceSpans', () => {
       spans.push(span);
     });
 
-    const entry: ResourceEntry = {
+    const entry = mockPerformanceResourceTiming({
       initiatorType: 'css',
       transferSize: 0,
       encodedBodySize: 0,
       decodedBodySize: 0,
       renderBlockingStatus: 'non-blocking',
-    };
+    });
 
     _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);
 
@@ -274,12 +283,12 @@ describe('_addResourceSpans', () => {
       spans.push(span);
     });
 
-    const entry: ResourceEntry = {
+    const entry = mockPerformanceResourceTiming({
       initiatorType: 'css',
       transferSize: 2147483647,
       encodedBodySize: 2147483647,
       decodedBodySize: 2147483647,
-    };
+    });
 
     _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);
 
@@ -316,7 +325,7 @@ describe('_addResourceSpans', () => {
       transferSize: null,
       encodedBodySize: null,
       decodedBodySize: null,
-    } as unknown as ResourceEntry;
+    } as unknown as PerformanceResourceTiming;
 
     _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);
 
@@ -341,7 +350,7 @@ describe('_addResourceSpans', () => {
 
   // resource delivery types: https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming/deliveryType
   // i.e. better but not yet widely supported way to check for browser cache hit
-  it.each(['cache', 'navigational-prefetch', ''])(
+  it.each(['cache', 'navigational-prefetch', ''] as const)(
     'attaches delivery type ("%s") to resource spans if available',
     deliveryType => {
       const spans: Span[] = [];
@@ -350,13 +359,13 @@ describe('_addResourceSpans', () => {
         spans.push(span);
       });
 
-      const entry: ResourceEntry = {
+      const entry = mockPerformanceResourceTiming({
         initiatorType: 'css',
         transferSize: 0,
         encodedBodySize: 0,
         decodedBodySize: 0,
         deliveryType,
-      };
+      });
 
       _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);