fix captureReplay tests

Author: Lms24

packages/integration-tests/suites/replay/captureReplay/test.ts

@@ -1,9 +1,9 @@
-import type { Page, Request } from '@playwright/test';
 import { expect } from '@playwright/test';
 import { SDK_VERSION } from '@sentry/browser';
 
 import { sentryTest } from '../../../utils/fixtures';
 import { envelopeRequestParser } from '../../../utils/helpers';
+import { waitForReplayRequest } from '../../../utils/replay';
 
 sentryTest('captureReplay', async ({ getLocalTestPath, page }) => {
   // Replay bundles are es6 only
@@ -13,7 +13,6 @@ sentryTest('captureReplay', async ({ getLocalTestPath, page }) => {
 
   const reqPromise0 = waitForReplayRequest(page, 0);
   const reqPromise1 = waitForReplayRequest(page, 1);
-  const reqPromise2 = waitForReplayRequest(page, 2);
 
   await page.route('https://dsn.ingest.sentry.io/**/*', route => {
     return route.fulfill({
@@ -26,16 +25,10 @@ sentryTest('captureReplay', async ({ getLocalTestPath, page }) => {
   const url = await getLocalTestPath({ testDir: __dirname });
 
   await page.goto(url);
-  const req0 = await reqPromise0;
-  const replayEvent0 = envelopeRequestParser(req0);
+  const replayEvent0 = envelopeRequestParser(await reqPromise0);
 
   await page.click('button');
-  await reqPromise1;
-
-  await page.click('button');
-  const req2 = await reqPromise2;
-
-  const replayEvent2 = envelopeRequestParser(req2);
+  const replayEvent1 = envelopeRequestParser(await reqPromise1);
 
   expect(replayEvent0).toBeDefined();
   expect(replayEvent0).toEqual({
@@ -76,15 +69,15 @@ sentryTest('captureReplay', async ({ getLocalTestPath, page }) => {
     tags: { sessionSampleRate: 1, errorSampleRate: 0 },
   });
 
-  expect(replayEvent2).toBeDefined();
-  expect(replayEvent2).toEqual({
+  expect(replayEvent1).toBeDefined();
+  expect(replayEvent1).toEqual({
     type: 'replay_event',
     timestamp: expect.any(Number),
     error_ids: [],
     trace_ids: [],
     urls: [],
     replay_id: expect.stringMatching(/\w{32}/),
-    segment_id: 2,
+    segment_id: 1,
     replay_type: 'session',
     event_id: expect.stringMatching(/\w{32}/),
     environment: 'production',
@@ -114,23 +107,3 @@ sentryTest('captureReplay', async ({ getLocalTestPath, page }) => {
     tags: { sessionSampleRate: 1, errorSampleRate: 0 },
   });
 });
-
-function waitForReplayRequest(page: Page, segmentId?: number): Promise<Request> {
-  return page.waitForRequest(
-    req => {
-      const postData = req.postData();
-      if (!postData) {
-        return false;
-      }
-      console.log(postData);
-
-      const isReplayRequest = postData.includes('{"type":"replay_event"}');
-
-      if (isReplayRequest && segmentId !== undefined) {
-        return postData.includes(`{"segment_id":${segmentId}}`);
-      }
-      return isReplayRequest;
-    },
-    { timeout: 30_000 },
-  );
-}

packages/integration-tests/suites/replay/captureReplayViaBrowser/test.ts

@@ -1,9 +1,9 @@
 import { expect } from '@playwright/test';
 import { SDK_VERSION } from '@sentry/browser';
-import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
+import { envelopeRequestParser } from '../../../utils/helpers';
+import { waitForReplayRequest } from '../../../utils/replay';
 
 sentryTest('captureReplay', async ({ getLocalTestPath, page }) => {
   // For this test, we skip all bundle tests, as we're only interested in Replay being correctly
@@ -12,6 +12,9 @@ sentryTest('captureReplay', async ({ getLocalTestPath, page }) => {
     sentryTest.skip();
   }
 
+  const reqPromise0 = waitForReplayRequest(page, 0);
+  const reqPromise1 = waitForReplayRequest(page, 1);
+
   await page.route('https://dsn.ingest.sentry.io/**/*', route => {
     return route.fulfill({
       status: 200,
@@ -21,23 +24,61 @@ sentryTest('captureReplay', async ({ getLocalTestPath, page }) => {
   });
 
   const url = await getLocalTestPath({ testDir: __dirname });
+
   await page.goto(url);
-  await page.waitForRequest('https://dsn.ingest.sentry.io/**/*');
+  const replayEvent0 = envelopeRequestParser(await reqPromise0);
 
   await page.click('button');
-  await page.waitForRequest('https://dsn.ingest.sentry.io/**/*');
-
-  const replayEvent = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const replayEvent1 = envelopeRequestParser(await reqPromise1);
 
-  expect(replayEvent).toBeDefined();
-  expect(replayEvent).toEqual({
+  expect(replayEvent0).toBeDefined();
+  expect(replayEvent0).toEqual({
     type: 'replay_event',
     timestamp: expect.any(Number),
     error_ids: [],
     trace_ids: [],
     urls: [expect.stringContaining('/dist/index.html')],
     replay_id: expect.stringMatching(/\w{32}/),
-    segment_id: 2,
+    replay_start_timestamp: expect.any(Number),
+    segment_id: 0,
+    replay_type: 'session',
+    event_id: expect.stringMatching(/\w{32}/),
+    environment: 'production',
+    sdk: {
+      integrations: [
+        'InboundFilters',
+        'FunctionToString',
+        'TryCatch',
+        'Breadcrumbs',
+        'GlobalHandlers',
+        'LinkedErrors',
+        'Dedupe',
+        'HttpContext',
+        'Replay',
+      ],
+      version: SDK_VERSION,
+      name: 'sentry.javascript.browser',
+    },
+    sdkProcessingMetadata: {},
+    request: {
+      url: expect.stringContaining('/dist/index.html'),
+      headers: {
+        'User-Agent': expect.stringContaining(''),
+      },
+    },
+    platform: 'javascript',
+    tags: { sessionSampleRate: 1, errorSampleRate: 0 },
+  });
+
+  expect(replayEvent1).toBeDefined();
+  expect(replayEvent1).toEqual({
+    type: 'replay_event',
+    timestamp: expect.any(Number),
+    error_ids: [],
+    trace_ids: [],
+    urls: [],
+    replay_id: expect.stringMatching(/\w{32}/),
+    segment_id: 1,
     replay_type: 'session',
     event_id: expect.stringMatching(/\w{32}/),
     environment: 'production',