unflake tests???

Author: mydea

dev-packages/browser-integration-tests/suites/replay/multiple-pages/test.ts

@@ -78,7 +78,7 @@ sentryTest(
     const collectedPerformanceSpans = [...recording0.performanceSpans, ...recording1.performanceSpans];
     const collectedBreadcrumbs = [...recording0.breadcrumbs, ...recording1.breadcrumbs];
 
-    expect(collectedPerformanceSpans.length).toEqual(6);
+    expect(collectedPerformanceSpans.length).toBeGreaterThanOrEqual(6);
     expect(collectedPerformanceSpans).toEqual(
       expect.arrayContaining([
         expectedNavigationPerformanceSpan,
@@ -116,7 +116,7 @@ sentryTest(
     const collectedPerformanceSpansAfterReload = [...recording2.performanceSpans, ...recording3.performanceSpans];
     const collectedBreadcrumbsAdterReload = [...recording2.breadcrumbs, ...recording3.breadcrumbs];
 
-    expect(collectedPerformanceSpansAfterReload.length).toEqual(6);
+    expect(collectedPerformanceSpansAfterReload.length).toBeGreaterThanOrEqual(6);
     expect(collectedPerformanceSpansAfterReload).toEqual(
       expect.arrayContaining([
         expectedReloadPerformanceSpan,
@@ -304,7 +304,7 @@ sentryTest(
     ];
     const collectedBreadcrumbsAfterIndexNavigation = [...recording8.breadcrumbs, ...recording9.breadcrumbs];
 
-    expect(collectedPerformanceSpansAfterIndexNavigation.length).toEqual(6);
+    expect(collectedPerformanceSpansAfterIndexNavigation.length).toBeGreaterThanOrEqual(6);
     expect(collectedPerformanceSpansAfterIndexNavigation).toEqual(
       expect.arrayContaining([
         expectedNavigationPerformanceSpan,

dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts

@@ -26,20 +26,26 @@ sentryTest('should add resource spans to pageload transaction', async ({ getLoca
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
   const resourceSpans = eventData.spans?.filter(({ op }) => op?.startsWith('resource'));
 
-  // Webkit 16.0 (which is linked to Playwright 1.27.1) consistently creates 2 consectutive spans for `css`,
-  // so we need to check for 3 or 4 spans.
-  if (browser.browserType().name() === 'webkit') {
-    expect(resourceSpans?.length).toBeGreaterThanOrEqual(5);
-  } else {
-    expect(resourceSpans?.length).toBe(5);
+  const scriptSpans = resourceSpans?.filter(({ op }) => op === 'resource.script');
+  const linkSpans = resourceSpans?.filter(({ op }) => op === 'resource.link');
+  const imgSpans = resourceSpans?.filter(({ op }) => op === 'resource.img');
+
+  expect(imgSpans).toHaveLength(1);
+  expect(linkSpans).toHaveLength(1);
+
+  const hasCdnBundle = (process.env.PW_BUNDLE || '').startsWith('bundle');
+
+  const expectedScripts = ['/init.bundle.js', '/subject.bundle.js', 'https://example.com/path/to/script.js'];
+  if (hasCdnBundle) {
+    expectedScripts.unshift('/cdn.bundle.js');
   }
 
-  ['resource.img', 'resource.script', 'resource.link'].forEach(op =>
-    expect(resourceSpans).toContainEqual(
-      expect.objectContaining({
-        op: op,
-        parent_span_id: eventData.contexts?.trace?.span_id,
-      }),
-    ),
-  );
+  expect(scriptSpans?.map(({ description }) => description).sort()).toEqual(expectedScripts);
+
+  const spanId = eventData.contexts?.trace?.span_id;
+
+  expect(spanId).toBeDefined();
+  expect(imgSpans?.[0].parent_span_id).toBe(spanId);
+  expect(linkSpans?.[0].parent_span_id).toBe(spanId);
+  expect(scriptSpans?.map(({ parent_span_id }) => parent_span_id)).toEqual(expectedScripts.map(() => spanId));
 });