Skip to content

Commit 363a63f

Browse files
billyvgbillyvg
committed
lint + fix test
1 parent 333bf00 commit 363a63f

File tree

2 files changed

+92
-86
lines changed
  • dev-packages/browser-integration-tests/suites/replay/sessionExpiry
  • packages/replay-internal/test/integration

2 files changed

+92
-86
lines changed

‎dev-packages/browser-integration-tests/suites/replay/sessionExpiry/test.ts

Lines changed: 90 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect } from '@playwright/test';
2+
import type { replayIntegration as actualReplayIntegration } from '@sentry-internal/replay';
23
import { sentryTest } from '../../../utils/fixtures';
34
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
45
import {
@@ -13,116 +14,122 @@ import {
1314
// Session should expire after 2s - keep in sync with init.js
1415
const SESSION_TIMEOUT = 2000;
1516

16-
sentryTest('handles an expired session that re-samples to session', async ({ browserName, forceFlushReplay, getLocalTestUrl, page }) => {
17-
if (shouldSkipReplayTest() || browserName !== 'chromium') {
18-
sentryTest.skip();
19-
}
17+
sentryTest(
18+
'handles an expired session that re-samples to session',
19+
async ({ browserName, forceFlushReplay, getLocalTestUrl, page }) => {
20+
if (shouldSkipReplayTest() || browserName !== 'chromium') {
21+
sentryTest.skip();
22+
}
2023

21-
const reqPromise0 = waitForReplayRequest(page, 0);
22-
const reqPromise1 = waitForReplayRequest(page, 1);
24+
const reqPromise0 = waitForReplayRequest(page, 0);
25+
const reqPromise1 = waitForReplayRequest(page, 1);
2326

24-
const url = await getLocalTestUrl({ testDir: __dirname });
27+
const url = await getLocalTestUrl({ testDir: __dirname });
2528

26-
await page.goto(url);
27-
const req0 = await reqPromise0;
29+
await page.goto(url);
30+
const req0 = await reqPromise0;
2831

29-
const replayEvent0 = getReplayEvent(req0);
30-
expect(replayEvent0).toEqual(getExpectedReplayEvent({}));
32+
const replayEvent0 = getReplayEvent(req0);
33+
expect(replayEvent0).toEqual(getExpectedReplayEvent({}));
3134

32-
const fullSnapshots0 = getFullRecordingSnapshots(req0);
33-
expect(fullSnapshots0.length).toEqual(1);
34-
const stringifiedSnapshot = normalize(fullSnapshots0[0]);
35-
expect(stringifiedSnapshot).toMatchSnapshot('snapshot-0.json');
35+
const fullSnapshots0 = getFullRecordingSnapshots(req0);
36+
expect(fullSnapshots0.length).toEqual(1);
37+
const stringifiedSnapshot = normalize(fullSnapshots0[0]);
38+
expect(stringifiedSnapshot).toMatchSnapshot('snapshot-0.json');
3639

37-
// We wait for another segment 0
38-
const reqPromise2 = waitForReplayRequest(page, 0);
40+
// We wait for another segment 0
41+
const reqPromise2 = waitForReplayRequest(page, 0);
3942

40-
await page.locator('#button1').click();
41-
await forceFlushReplay();
42-
const req1 = await reqPromise1;
43+
await page.locator('#button1').click();
44+
await forceFlushReplay();
45+
const req1 = await reqPromise1;
4346

44-
const replayEvent1 = getReplayEvent(req1);
45-
expect(replayEvent1).toEqual(getExpectedReplayEvent({ segment_id: 1, urls: [] }));
47+
const replayEvent1 = getReplayEvent(req1);
48+
expect(replayEvent1).toEqual(getExpectedReplayEvent({ segment_id: 1, urls: [] }));
4649

47-
const replay = await getReplaySnapshot(page);
48-
const oldSessionId = replay.session?.id;
50+
const replay = await getReplaySnapshot(page);
51+
const oldSessionId = replay.session?.id;
4952

50-
await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
53+
await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
5154

52-
await page.locator('#button2').click();
53-
await forceFlushReplay();
54-
const req2 = await reqPromise2;
55+
await page.locator('#button2').click();
56+
await forceFlushReplay();
57+
const req2 = await reqPromise2;
5558

56-
const replay2 = await getReplaySnapshot(page);
59+
const replay2 = await getReplaySnapshot(page);
5760

58-
expect(replay2.session?.id).not.toEqual(oldSessionId);
61+
expect(replay2.session?.id).not.toEqual(oldSessionId);
5962

60-
const replayEvent2 = getReplayEvent(req2);
61-
expect(replayEvent2).toEqual(getExpectedReplayEvent({}));
63+
const replayEvent2 = getReplayEvent(req2);
64+
expect(replayEvent2).toEqual(getExpectedReplayEvent({}));
6265

63-
const fullSnapshots2 = getFullRecordingSnapshots(req2);
64-
expect(fullSnapshots2.length).toEqual(1);
65-
const stringifiedSnapshot2 = normalize(fullSnapshots2[0]);
66-
expect(stringifiedSnapshot2).toMatchSnapshot('snapshot-2.json');
67-
});
66+
const fullSnapshots2 = getFullRecordingSnapshots(req2);
67+
expect(fullSnapshots2.length).toEqual(1);
68+
const stringifiedSnapshot2 = normalize(fullSnapshots2[0]);
69+
expect(stringifiedSnapshot2).toMatchSnapshot('snapshot-2.json');
70+
},
71+
);
6872

69-
sentryTest('handles an expired session that re-samples to buffer', async ({ browserName, forceFlushReplay, getLocalTestUrl, page }) => {
70-
if (shouldSkipReplayTest() || browserName !== 'chromium') {
71-
sentryTest.skip();
72-
}
73+
sentryTest(
74+
'handles an expired session that re-samples to buffer',
75+
async ({ browserName, forceFlushReplay, getLocalTestUrl, page }) => {
76+
if (shouldSkipReplayTest() || browserName !== 'chromium') {
77+
sentryTest.skip();
78+
}
7379

74-
const reqPromise0 = waitForReplayRequest(page, 0);
75-
const reqPromise1 = waitForReplayRequest(page, 1);
80+
const reqPromise0 = waitForReplayRequest(page, 0);
81+
const reqPromise1 = waitForReplayRequest(page, 1);
7682

77-
const url = await getLocalTestUrl({ testDir: __dirname });
83+
const url = await getLocalTestUrl({ testDir: __dirname });
7884

79-
await page.goto(url);
80-
const req0 = await reqPromise0;
85+
await page.goto(url);
86+
const req0 = await reqPromise0;
8187

82-
const replayEvent0 = getReplayEvent(req0);
83-
expect(replayEvent0).toEqual(getExpectedReplayEvent({}));
88+
const replayEvent0 = getReplayEvent(req0);
89+
expect(replayEvent0).toEqual(getExpectedReplayEvent({}));
8490

85-
const fullSnapshots0 = getFullRecordingSnapshots(req0);
86-
expect(fullSnapshots0.length).toEqual(1);
87-
const stringifiedSnapshot = normalize(fullSnapshots0[0]);
88-
expect(stringifiedSnapshot).toMatchSnapshot('snapshot-0.json');
91+
const fullSnapshots0 = getFullRecordingSnapshots(req0);
92+
expect(fullSnapshots0.length).toEqual(1);
93+
const stringifiedSnapshot = normalize(fullSnapshots0[0]);
94+
expect(stringifiedSnapshot).toMatchSnapshot('snapshot-0.json');
8995

90-
await page.locator('#button1').click();
91-
await forceFlushReplay();
92-
const req1 = await reqPromise1;
96+
await page.locator('#button1').click();
97+
await forceFlushReplay();
98+
const req1 = await reqPromise1;
9399

94-
const replayEvent1 = getReplayEvent(req1);
95-
expect(replayEvent1).toEqual(getExpectedReplayEvent({ segment_id: 1, urls: [] }));
100+
const replayEvent1 = getReplayEvent(req1);
101+
expect(replayEvent1).toEqual(getExpectedReplayEvent({ segment_id: 1, urls: [] }));
96102

97-
const replay = await getReplaySnapshot(page);
98-
const oldSessionId = replay.session?.id;
103+
const replay = await getReplaySnapshot(page);
104+
const oldSessionId = replay.session?.id;
99105

100-
await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
101-
await page.evaluate(() => {
102-
// @ts-expect-error - Replay is not typed
103-
window.Replay._replay?._options?.errorSampleRate = 1;
104-
// @ts-expect-error - Replay is not typed
105-
window.Replay._replay?._options?.sessionSampleRate = 0;
106-
});
106+
await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
107+
await page.evaluate(() => {
108+
const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
109+
.Replay;
110+
replayIntegration['_replay'].getOptions().errorSampleRate = 1.0;
111+
replayIntegration['_replay'].getOptions().sessionSampleRate = 1.0;
112+
});
107113

108-
let wasReplayFlushed = false;
109-
page.on('request', request => {
110-
if (request.url().includes('/api/1337/envelope/')) {
111-
wasReplayFlushed = true
112-
}
113-
})
114-
await page.locator('#button2').click();
115-
await forceFlushReplay();
114+
let wasReplayFlushed = false;
115+
page.on('request', request => {
116+
if (request.url().includes('/api/1337/envelope/')) {
117+
wasReplayFlushed = true;
118+
}
119+
});
120+
await page.locator('#button2').click();
121+
await forceFlushReplay();
116122

117-
// This timeout is not ideal, but not sure of a better way to ensure replay is not flushed
118-
await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
123+
// This timeout is not ideal, but not sure of a better way to ensure replay is not flushed
124+
await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
119125

120-
expect(wasReplayFlushed).toBe(false);
126+
expect(wasReplayFlushed).toBe(false);
121127

122-
const currentSessionId = await page.evaluate(() => {
123-
// @ts-expect-error - Replay is not typed
124-
return window.Replay._replay.session?.id;
125-
});
128+
const currentSessionId = await page.evaluate(() => {
129+
// @ts-expect-error - Replay is not typed
130+
return window.Replay._replay.session?.id;
131+
});
126132

127-
expect(currentSessionId).not.toEqual(oldSessionId);
128-
});
133+
expect(currentSessionId).not.toEqual(oldSessionId);
134+
},
135+
);

‎packages/replay-internal/test/integration/session.test.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ describe('Integration | session', () => {
207207
await vi.advanceTimersByTimeAsync(DEFAULT_FLUSH_MIN_DELAY);
208208
await new Promise(process.nextTick);
209209

210-
211210
// The click actually does not trigger a flush because it never gets added to event buffer because
212211
// the session is expired. We stop recording and re-sample the session expires.
213212
expect(replay).not.toHaveLastSentReplay();
@@ -225,7 +224,7 @@ describe('Integration | session', () => {
225224
expect(replay).toHaveLastSentReplay({
226225
recordingPayloadHeader: { segment_id: 0 },
227226
recordingData: JSON.stringify([
228-
{ data: { isCheckout: true }, timestamp: newTimestamp-DEFAULT_FLUSH_MIN_DELAY, type: 2 },
227+
{ data: { isCheckout: true }, timestamp: newTimestamp - DEFAULT_FLUSH_MIN_DELAY, type: 2 },
229228
optionsEvent,
230229
{
231230
type: 5,
@@ -250,7 +249,7 @@ describe('Integration | session', () => {
250249
// `_context` should be reset when a new session is created
251250
expect(replay.getContext()).toEqual({
252251
initialUrl: 'http://dummy/',
253-
initialTimestamp: newTimestamp-DEFAULT_FLUSH_MIN_DELAY,
252+
initialTimestamp: newTimestamp - DEFAULT_FLUSH_MIN_DELAY,
254253
urls: [],
255254
errorIds: new Set(),
256255
traceIds: new Set(),

0 commit comments

Comments
 (0)