fix tests

Author: billyvg

packages/replay/src/replay.ts

@@ -171,9 +171,10 @@ export class ReplayContainer {
 
     this.addListeners();
 
-    this.startRecording();
-
+    // Need to set as enabled before we start recording, as `record()` can trigger a flush with a new checkout
     this._isEnabled = true;
+
+    this.startRecording();
   }
 
   /**
@@ -538,7 +539,9 @@ export class ReplayContainer {
       // it can prevent loading on the UI. This will cause an increase in short
       // replays (e.g. opening and closing a tab quickly), but these can be
       // filtered on the UI.
-      this.flushImmediate();
+      if (!this._waitForError) {
+        void this.flushImmediate();
+      }
 
       return true;
     });

packages/replay/test/unit/index-errorSampleRate.test.ts

@@ -7,7 +7,7 @@ import { ReplayContainer } from './../../src/replay';
 import { PerformanceEntryResource } from './../fixtures/performanceEntry/resource';
 import { BASE_TIMESTAMP, RecordMock } from './../index';
 import { resetSdkMock } from './../mocks';
-import { DomHandler, MockTransportSend } from './../types';
+import { DomHandler } from './../types';
 import { useFakeTimers } from './../utils/use-fake-timers';
 
 useFakeTimers();
@@ -20,11 +20,10 @@ async function advanceTimers(time: number) {
 describe('Replay (errorSampleRate)', () => {
   let replay: ReplayContainer;
   let mockRecord: RecordMock;
-  let mockTransportSend: MockTransportSend;
   let domHandler: DomHandler;
 
   beforeEach(async () => {
-    ({ mockRecord, mockTransportSend, domHandler, replay } = await resetSdkMock({
+    ({ mockRecord, domHandler, replay } = await resetSdkMock({
       replayOptions: {
         stickySession: true,
       },
@@ -60,6 +59,7 @@ describe('Replay (errorSampleRate)', () => {
     await new Promise(process.nextTick);
 
     expect(replay).toHaveSentReplay({
+      recordingPayloadHeader: { segment_id: 0 },
       replayEventPayload: expect.objectContaining({
         tags: expect.objectContaining({
           errorSampleRate: 1,
@@ -87,6 +87,19 @@ describe('Replay (errorSampleRate)', () => {
       ]),
     });
 
+    // This is from when we stop recording and start a session recording
+    expect(replay).toHaveLastSentReplay({
+      recordingPayloadHeader: { segment_id: 1 },
+      replayEventPayload: expect.objectContaining({
+        tags: expect.objectContaining({
+          errorSampleRate: 1,
+          replayType: 'error',
+          sessionSampleRate: 0,
+        }),
+      }),
+      events: JSON.stringify([{ data: { isCheckout: true }, timestamp: BASE_TIMESTAMP + 5020, type: 2 }]),
+    });
+
     jest.runAllTimers();
     await new Promise(process.nextTick);
 
@@ -112,11 +125,11 @@ describe('Replay (errorSampleRate)', () => {
       events: JSON.stringify([
         {
           type: 5,
-          timestamp: BASE_TIMESTAMP + 15000 + 40,
+          timestamp: BASE_TIMESTAMP + 10000 + 40,
           data: {
             tag: 'breadcrumb',
             payload: {
-              timestamp: (BASE_TIMESTAMP + 15000 + 40) / 1000,
+              timestamp: (BASE_TIMESTAMP + 10000 + 40) / 1000,
               type: 'default',
               category: 'ui.click',
               message: '<unknown>',
@@ -288,7 +301,7 @@ describe('Replay (errorSampleRate)', () => {
     jest.runAllTimers();
     await new Promise(process.nextTick);
 
-    expect(replay).toHaveLastSentReplay({
+    expect(replay).toHaveSentReplay({
       events: JSON.stringify([{ data: { isCheckout: true }, timestamp: BASE_TIMESTAMP, type: 2 }, TEST_EVENT]),
       replayEventPayload: expect.objectContaining({
         replay_start_timestamp: BASE_TIMESTAMP / 1000,
@@ -319,7 +332,7 @@ describe('Replay (errorSampleRate)', () => {
       REPLAY_SESSION_KEY,
       `{"segmentId":0,"id":"fd09adfc4117477abc8de643e5a5798a","sampled":"error","started":${BASE_TIMESTAMP},"lastActivity":${BASE_TIMESTAMP}}`,
     );
-    ({ mockRecord, mockTransportSend, replay } = await resetSdkMock({
+    ({ mockRecord, replay } = await resetSdkMock({
       replayOptions: {
         stickySession: true,
       },
@@ -338,28 +351,14 @@ describe('Replay (errorSampleRate)', () => {
     jest.runAllTimers();
     await new Promise(process.nextTick);
 
-    expect(replay).toHaveLastSentReplay({
+    expect(replay).toHaveSentReplay({
       events: JSON.stringify([{ data: { isCheckout: true }, timestamp: BASE_TIMESTAMP, type: 2 }, TEST_EVENT]),
     });
 
-    mockTransportSend.mockClear();
-    expect(replay).not.toHaveLastSentReplay();
-
-    jest.runAllTimers();
-    await new Promise(process.nextTick);
-    jest.runAllTimers();
-    await new Promise(process.nextTick);
-
-    // New checkout when we call `startRecording` again after uploading segment
-    // after an error occurs
+    // 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({
-      events: JSON.stringify([
-        {
-          data: { isCheckout: true },
-          timestamp: BASE_TIMESTAMP + 10000 + 20,
-          type: 2,
-        },
-      ]),
+      events: JSON.stringify([{ data: { isCheckout: true }, timestamp: BASE_TIMESTAMP + 5020, type: 2 }]),
     });
   });
 
@@ -396,7 +395,8 @@ describe('Replay (errorSampleRate)', () => {
     expect(replay.session?.started).toBe(BASE_TIMESTAMP + ELAPSED + 20);
 
     // Does not capture mouse click
-    expect(replay).toHaveLastSentReplay({
+    expect(replay).toHaveSentReplay({
+      recordingPayloadHeader: { segment_id: 0 },
       replayEventPayload: expect.objectContaining({
         // Make sure the old performance event is thrown out
         replay_start_timestamp: (BASE_TIMESTAMP + ELAPSED + 20) / 1000,