Refactor more.

Author: onurtemizkan

packages/browser-integration-tests/suites/replay/bufferMode/test.ts

@@ -84,12 +84,12 @@ sentryTest(
     await reqErrorPromise;
     expect(callsToSentry).toEqual(2);
 
-    const [, req0] = await Promise.all([
+    const [req0] = await Promise.all([
+      reqPromise0,
       await page.evaluate(async () => {
         const replayIntegration = (window as unknown as Window & { Replay: Replay }).Replay;
         await replayIntegration.flush();
       }),
-      reqPromise0,
     ]);
 
     // 2 errors, 1 flush
@@ -227,12 +227,12 @@ sentryTest(
     await reqErrorPromise;
     expect(callsToSentry).toEqual(2);
 
-    const [, req0] = await Promise.all([
+    const [req0] = await Promise.all([
+      reqPromise0,
       page.evaluate(async () => {
         const replayIntegration = (window as unknown as Window & { Replay: Replay }).Replay;
         await replayIntegration.flush({ continueRecording: false });
       }),
-      reqPromise0,
     ]);
 
     // 2 errors, 1 flush
@@ -348,11 +348,10 @@ sentryTest(
 
     // Error sample rate is now at 1.0, this error should create a replay
     const reqErrorPromise1 = waitForErrorRequest(page);
-    const [, req0] = await Promise.all([
-      page.click('#error2'),
-
+    const [req0] = await Promise.all([
       // 1 unsampled error, 1 sampled error -> 1 flush
       reqPromise0,
+      page.click('#error2'),
     ]);
 
     const reqError1 = await reqErrorPromise1;

packages/browser-integration-tests/suites/replay/captureConsoleLog/test.ts

@@ -37,7 +37,7 @@ sentryTest('should capture console messages in replay', async ({ getLocalTestPat
   await page.click('[data-log]');
 
   // Sometimes this doesn't seem to trigger, so we trigger it twice to be sure...
-  const [, , req1] = await Promise.all([page.click('[data-log]'), forceFlushReplay(), reqPromise1]);
+  const [req1] = await Promise.all([reqPromise1, page.click('[data-log]'), forceFlushReplay()]);
 
   const { breadcrumbs } = getCustomRecordingEvents(req1);
 
@@ -86,7 +86,7 @@ sentryTest('should capture very large console logs', async ({ getLocalTestPath,
     5_000,
   );
 
-  const [, , req1] = await Promise.all([page.click('[data-log-large]'), forceFlushReplay(), reqPromise1]);
+  const [req1] = await Promise.all([reqPromise1, page.click('[data-log-large]'), forceFlushReplay()]);
 
   const { breadcrumbs } = getCustomRecordingEvents(req1);
 

packages/browser-integration-tests/suites/replay/errors/errorMode/test.ts

@@ -58,17 +58,17 @@ sentryTest(
 
     expect(callsToSentry).toEqual(0);
 
-    const [, req0] = await Promise.all([page.click('#error'), reqPromise0]);
+    const [req0] = await Promise.all([reqPromise0, page.click('#error')]);
 
     expect(callsToSentry).toEqual(2); // 1 error, 1 replay event
 
-    const [, req1] = await Promise.all([page.click('#go-background'), reqPromise1, reqErrorPromise]);
+    const [req1] = await Promise.all([reqPromise1, page.click('#go-background'), reqErrorPromise]);
 
     expect(callsToSentry).toEqual(3); // 1 error, 2 replay events
 
     await page.click('#log');
 
-    const [, req2] = await Promise.all([page.click('#go-background'), reqPromise2]);
+    const [req2] = await Promise.all([reqPromise2, page.click('#go-background')]);
 
     const event0 = getReplayEvent(req0);
     const content0 = getReplayRecordingContent(req0);

packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts

@@ -27,20 +27,19 @@ sentryTest(
 
     const url = await getLocalTestPath({ testDir: __dirname });
 
-    const [, res0] = await Promise.all([page.goto(url), reqPromise0]);
+    const [res0] = await Promise.all([reqPromise0, page.goto(url)]);
 
     const reqPromise1 = waitForReplayRequest(page);
 
-    const [, , res1] = await Promise.all([page.click('#button-add'), forceFlushReplay(), reqPromise1]);
+    const [res1] = await Promise.all([reqPromise1, page.click('#button-add'), forceFlushReplay()]);
 
     // replay should be stopped due to mutation limit
     let replay = await getReplaySnapshot(page);
     expect(replay.session).toBe(undefined);
     expect(replay._isEnabled).toBe(false);
 
-    await Promise.all([page.click('#button-modify'), await forceFlushReplay()]);
-
-    await Promise.all([page.click('#button-remove'), await forceFlushReplay()]);
+    await Promise.all([page.click('#button-modify'), forceFlushReplay()]);
+    await Promise.all([page.click('#button-remove'), forceFlushReplay()]);
 
     const replayData0 = getReplayRecordingContent(res0);
     expect(replayData0.fullSnapshots.length).toBe(1);

packages/browser-integration-tests/suites/replay/maxReplayDuration/test.ts

@@ -35,7 +35,9 @@ sentryTest('keeps track of max duration across reloads', async ({ getLocalTestPa
 
   await new Promise(resolve => setTimeout(resolve, MAX_REPLAY_DURATION / 2 + 100));
 
-  const [, , req0, req1] = await Promise.all([
+  const [req0, req1] = await Promise.all([
+    reqPromise0,
+    reqPromise1,
     page.click('#button1'),
     page.evaluate(
       `Object.defineProperty(document, 'visibilityState', {
@@ -47,8 +49,6 @@ sentryTest('keeps track of max duration across reloads', async ({ getLocalTestPa
 
   document.dispatchEvent(new Event('visibilitychange'));`,
     ),
-    reqPromise0,
-    reqPromise1,
   ]);
 
   const replayEvent0 = getReplayEvent(req0);

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

@@ -56,15 +56,15 @@ sentryTest(
 
     const url = await getLocalTestPath({ testDir: __dirname });
 
-    const [, req0] = await Promise.all([page.goto(url), reqPromise0]);
+    const [req0] = await Promise.all([reqPromise0, page.goto(url)]);
     const replayEvent0 = getReplayEvent(req0);
     const recording0 = getReplayRecordingContent(req0);
 
     expect(replayEvent0).toEqual(getExpectedReplayEvent({ segment_id: 0 }));
     expect(normalize(recording0.fullSnapshots)).toMatchSnapshot('seg-0-snap-full');
     expect(recording0.incrementalSnapshots.length).toEqual(0);
 
-    const [, req1] = await Promise.all([page.click('#go-background'), reqPromise1]);
+    const [req1] = await Promise.all([reqPromise1, page.click('#go-background')]);
 
     const replayEvent1 = getReplayEvent(req1);
     const recording1 = getReplayRecordingContent(req1);
@@ -95,7 +95,7 @@ sentryTest(
     // -----------------------------------------------------------------------------------------
     // Test page reload
 
-    const [, req2] = await Promise.all([page.reload(), reqPromise2]);
+    const [req2] = await Promise.all([reqPromise2, page.reload()]);
 
     const replayEvent2 = getReplayEvent(req2);
     const recording2 = getReplayRecordingContent(req2);
@@ -104,7 +104,7 @@ sentryTest(
     expect(normalize(recording2.fullSnapshots)).toMatchSnapshot('seg-2-snap-full');
     expect(recording2.incrementalSnapshots.length).toEqual(0);
 
-    const [, req3] = await Promise.all([page.click('#go-background'), reqPromise3]);
+    const [req3] = await Promise.all([reqPromise3, page.click('#go-background')]);
 
     const replayEvent3 = getReplayEvent(req3);
     const recording3 = getReplayRecordingContent(req3);
@@ -133,7 +133,7 @@ sentryTest(
     // -----------------------------------------------------------------------------------------
     // Test subsequent link navigation to another page
 
-    const [, req4] = await Promise.all([page.click('a'), reqPromise4]);
+    const [req4] = await Promise.all([reqPromise4, page.click('a')]);
 
     const replayEvent4 = getReplayEvent(req4);
     const recording4 = getReplayRecordingContent(req4);
@@ -156,7 +156,7 @@ sentryTest(
     expect(normalize(recording4.fullSnapshots)).toMatchSnapshot('seg-4-snap-full');
     expect(recording4.incrementalSnapshots.length).toEqual(0);
 
-    const [, req5] = await Promise.all([page.click('#go-background'), reqPromise5]);
+    const [req5] = await Promise.all([reqPromise5, page.click('#go-background')]);
 
     const replayEvent5 = getReplayEvent(req5);
     const recording5 = getReplayRecordingContent(req5);
@@ -201,7 +201,7 @@ sentryTest(
     // -----------------------------------------------------------------------------------------
     // Test subsequent navigation without a page reload (i.e. SPA navigation)
 
-    const [, req6] = await Promise.all([page.click('#spa-navigation'), reqPromise6]);
+    const [req6] = await Promise.all([reqPromise6, page.click('#spa-navigation')]);
 
     const replayEvent6 = getReplayEvent(req6);
     const recording6 = getReplayRecordingContent(req6);
@@ -224,7 +224,7 @@ sentryTest(
     expect(recording6.fullSnapshots.length).toEqual(0);
     expect(normalize(recording6.incrementalSnapshots)).toMatchSnapshot('seg-6-snap-incremental');
 
-    const [, req7] = await Promise.all([page.click('#go-background'), reqPromise7]);
+    const [req7] = await Promise.all([reqPromise7, page.click('#go-background')]);
 
     const replayEvent7 = getReplayEvent(req7);
     const recording7 = getReplayRecordingContent(req7);
@@ -271,7 +271,7 @@ sentryTest(
     //   // -----------------------------------------------------------------------------------------
     //   // And just to finish this off, let's go back to the index page
 
-    const [, req8] = await Promise.all([page.click('a'), reqPromise8]);
+    const [req8] = await Promise.all([reqPromise8, page.click('a')]);
 
     const replayEvent8 = getReplayEvent(req8);
     const recording8 = getReplayRecordingContent(req8);
@@ -284,7 +284,7 @@ sentryTest(
     expect(normalize(recording8.fullSnapshots)).toMatchSnapshot('seg-8-snap-full');
     expect(recording8.incrementalSnapshots.length).toEqual(0);
 
-    const [, req9] = await Promise.all([page.click('#go-background'), reqPromise9]);
+    const [req9] = await Promise.all([reqPromise9, page.click('#go-background')]);
 
     const replayEvent9 = getReplayEvent(req9);
     const recording9 = getReplayRecordingContent(req9);

packages/browser-integration-tests/suites/replay/requests/test.ts

@@ -31,13 +31,11 @@ sentryTest('replay recording should contain fetch request span', async ({ getLoc
 
   const url = await getLocalTestPath({ testDir: __dirname });
 
-  const [, req0] = await Promise.all([Promise.all([page.goto(url), page.click('#go-background')]), reqPromise0]);
+  const [req0] = await Promise.all([reqPromise0, page.goto(url), page.click('#go-background')]);
 
   const { performanceSpans: spans0 } = getReplayRecordingContent(req0);
 
-  const receivedResponse = page.waitForResponse('https://example.com');
-
-  await Promise.all([page.click('#fetch'), receivedResponse]);
+  await Promise.all([page.waitForResponse('https://example.com'), page.click('#fetch')]);
 
   const { performanceSpans: spans1 } = getReplayRecordingContent(await reqPromise1);
 
@@ -71,11 +69,11 @@ sentryTest('replay recording should contain XHR request span', async ({ getLocal
 
   const url = await getLocalTestPath({ testDir: __dirname });
 
-  const [, req0] = await Promise.all([Promise.all([page.goto(url), page.click('#go-background')]), reqPromise0]);
+  const [req0] = await Promise.all([reqPromise0, page.goto(url), page.click('#go-background')]);
 
   const { performanceSpans: spans0 } = getReplayRecordingContent(req0);
 
-  await Promise.all([page.click('#xhr'), page.waitForResponse('https://example.com')]);
+  await Promise.all([page.waitForResponse('https://example.com'), page.click('#xhr')]);
 
   const { performanceSpans: spans1 } = getReplayRecordingContent(await reqPromise1);