revert test changes

Author: billyvg

packages/replay/test/integration/coreHandlers/handleAfterSendEvent.test.ts

@@ -1,7 +1,7 @@
 import { getCurrentHub } from '@sentry/core';
 import type { ErrorEvent, Event } from '@sentry/types';
 
-import { UNABLE_TO_SEND_REPLAY, DEFAULT_FLUSH_MIN_DELAY } from '../../../src/constants';
+import { UNABLE_TO_SEND_REPLAY } from '../../../src/constants';
 import { handleAfterSendEvent } from '../../../src/coreHandlers/handleAfterSendEvent';
 import type { ReplayContainer } from '../../../src/replay';
 import { Error } from '../../fixtures/error';
@@ -146,18 +146,11 @@ describe('Integration | coreHandlers | handleAfterSendEvent', () => {
 
     expect(Array.from(replay.getContext().errorIds)).toEqual(['err1']);
 
-    jest.runAllTimers()
-    await new Promise(process.nextTick);
-
-    // Flush from the error
-    expect(mockSend).toHaveBeenCalledTimes(1);
-
-    jest.advanceTimersByTime(DEFAULT_FLUSH_MIN_DELAY);
+    jest.runAllTimers();
     await new Promise(process.nextTick);
 
-    // Flush for converting to session-based replay (startRecording call)
+    // Send twice, one for the error & one right after for the session conversion
     expect(mockSend).toHaveBeenCalledTimes(2);
-
     // This is removed now, because it has been converted to a "session" session
     expect(Array.from(replay.getContext().errorIds)).toEqual([]);
     expect(replay.isEnabled()).toBe(true);

packages/replay/test/integration/errorSampleRate.test.ts

@@ -99,9 +99,6 @@ describe('Integration | errorSampleRate', () => {
       ]),
     });
 
-    jest.advanceTimersByTime(DEFAULT_FLUSH_MIN_DELAY);
-    await new Promise(process.nextTick);
-
     // This is from when we stop recording and start a session recording
     expect(replay).toHaveLastSentReplay({
       recordingPayloadHeader: { segment_id: 1 },
@@ -119,6 +116,20 @@ describe('Integration | errorSampleRate', () => {
       ]),
     });
 
+    jest.advanceTimersByTime(DEFAULT_FLUSH_MIN_DELAY);
+
+    // New checkout when we call `startRecording` again after uploading segment
+    // after an error occurs
+    expect(replay).toHaveLastSentReplay({
+      recordingData: JSON.stringify([
+        {
+          data: { isCheckout: true },
+          timestamp: BASE_TIMESTAMP + DEFAULT_FLUSH_MIN_DELAY + 40,
+          type: 2,
+        },
+      ]),
+    });
+
     // Check that click will get captured
     domHandler({
       name: 'click',
@@ -128,15 +139,14 @@ describe('Integration | errorSampleRate', () => {
     await new Promise(process.nextTick);
 
     expect(replay).toHaveLastSentReplay({
-      recordingPayloadHeader: { segment_id: 2 },
       recordingData: JSON.stringify([
         {
           type: 5,
-          timestamp: BASE_TIMESTAMP + DEFAULT_FLUSH_MIN_DELAY + DEFAULT_FLUSH_MIN_DELAY + 80,
+          timestamp: BASE_TIMESTAMP + 10000 + 60,
           data: {
             tag: 'breadcrumb',
             payload: {
-              timestamp: (BASE_TIMESTAMP + DEFAULT_FLUSH_MIN_DELAY + DEFAULT_FLUSH_MIN_DELAY + 80) / 1000,
+              timestamp: (BASE_TIMESTAMP + 10000 + 60) / 1000,
               type: 'default',
               category: 'ui.click',
               message: '<unknown>',
@@ -631,10 +641,6 @@ describe('Integration | errorSampleRate', () => {
 
     expect(replay).toHaveLastSentReplay();
 
-    // Flush from calling `stopRecording`
-    jest.runAllTimers()
-    await new Promise(process.nextTick);
-
     // Now wait after session expires - should stop recording
     mockRecord.takeFullSnapshot.mockClear();
     (getCurrentHub().getClient()!.getTransport()!.send as unknown as jest.SpyInstance<any>).mockClear();
@@ -740,16 +746,16 @@ it('sends a replay after loading the session multiple times', async () => {
   captureException(new Error('testing'));
 
   await new Promise(process.nextTick);
-  await advanceTimers(DEFAULT_FLUSH_MIN_DELAY);
+  jest.advanceTimersByTime(DEFAULT_FLUSH_MIN_DELAY);
+  await new Promise(process.nextTick);
 
-  expect(replay).toHaveLastSentReplay({
+  expect(replay).toHaveSentReplay({
     recordingData: JSON.stringify([{ data: { isCheckout: true }, timestamp: BASE_TIMESTAMP, type: 2 }, TEST_EVENT]),
   });
 
-  await advanceTimers(DEFAULT_FLUSH_MIN_DELAY);
   // Latest checkout when we call `startRecording` again after uploading segment
   // after an error occurs (e.g. when we switch to session replay recording)
   expect(replay).toHaveLastSentReplay({
-    recordingData: JSON.stringify([{ data: { isCheckout: true }, timestamp: BASE_TIMESTAMP + 10040, type: 2 }]),
+    recordingData: JSON.stringify([{ data: { isCheckout: true }, timestamp: BASE_TIMESTAMP + 5040, type: 2 }]),
   });
 });