Switch to Promise.all

getsentry · Apr 22, 2024 · 532b1f7 · 532b1f7
1 parent 9a1daee
commit 532b1f7
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 56 deletions.
diff --git a/...rowser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts b/...rowser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts
@@ -11,16 +11,17 @@ sentryTest(
 
     await page.goto(url);
 
-    runScriptInSandbox(page, {
-      content: `
+    const [, eventData] = await Promise.all([
+      runScriptInSandbox(page, {
+        content: `
         throw {
           type: 'Error',
           otherKey: 'otherValue',
         };
       `,
-    });
-
-    const eventData = await getFirstSentryEnvelopeRequest<Event>(page);
+      }),
+      getFirstSentryEnvelopeRequest<Event>(page),
+    ]);
 
     expect(eventData.exception?.values).toHaveLength(1);
     expect(eventData.exception?.values?.[0]).toMatchObject({

diff --git a/...ages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts b/...ages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts
@@ -11,18 +11,19 @@ sentryTest(
 
     await page.goto(url);
 
-    runScriptInSandbox(page, {
-      content: `
-        try {
-          foo();
-        } catch (e) {
-          Sentry.captureException(e);
-          throw e;
-        }
-      `,
-    });
-
-    const events = await getMultipleSentryEnvelopeRequests<Event>(page, 1);
+    const [, events] = await Promise.all([
+      runScriptInSandbox(page, {
+        content: `
+          try {
+            foo();
+          } catch (e) {
+            Sentry.captureException(e);
+            throw e;
+          }
+        `,
+      }),
+      getMultipleSentryEnvelopeRequests<Event>(page, 1),
+    ]);
 
     expect(events[0].exception?.values).toHaveLength(1);
     expect(events[0].exception?.values?.[0]).toMatchObject({

diff --git a/...browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts b/...browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts
@@ -9,13 +9,14 @@ sentryTest('should catch syntax errors', async ({ getLocalTestPath, page }) => {
 
   await page.goto(url);
 
-  runScriptInSandbox(page, {
-    content: `
+  const [, eventData] = await Promise.all([
+    runScriptInSandbox(page, {
+      content: `
       foo{}; // SyntaxError
     `,
-  });
-
-  const eventData = await getFirstSentryEnvelopeRequest<Event>(page);
+    }),
+    getFirstSentryEnvelopeRequest<Event>(page),
+  ]);
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({

diff --git a/...browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts b/...browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts
@@ -9,13 +9,14 @@ sentryTest('should catch thrown errors', async ({ getLocalTestPath, page }) => {
 
   await page.goto(url);
 
-  runScriptInSandbox(page, {
-    content: `
+  const [, eventData] = await Promise.all([
+    runScriptInSandbox(page, {
+      content: `
       throw new Error('realError');
-    `,
-  });
-
-  const eventData = await getFirstSentryEnvelopeRequest<Event>(page);
+      `,
+    }),
+    getFirstSentryEnvelopeRequest<Event>(page),
+  ]);
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({

diff --git a/...rowser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts b/...rowser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts
@@ -9,15 +9,16 @@ sentryTest('should catch thrown objects', async ({ getLocalTestPath, page }) =>
 
   await page.goto(url);
 
-  runScriptInSandbox(page, {
-    content: `
-    throw {
-      error: 'stuff is broken',
-      somekey: 'ok'
-    };`,
-  });
-
-  const eventData = await getFirstSentryEnvelopeRequest<Event>(page);
+  const [, eventData] = await Promise.all([
+    runScriptInSandbox(page, {
+      content: `
+      throw {
+        error: 'stuff is broken',
+        somekey: 'ok'
+      };`,
+    }),
+    getFirstSentryEnvelopeRequest<Event>(page),
+  ]);
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({

diff --git a/...rowser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts b/...rowser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts
@@ -9,13 +9,14 @@ sentryTest('should catch thrown strings', async ({ getLocalTestPath, page }) =>
 
   await page.goto(url);
 
-  runScriptInSandbox(page, {
-    content: `
+  const [, eventData] = await Promise.all([
+    runScriptInSandbox(page, {
+      content: `
       throw 'stringError';
     `,
-  });
-
-  const eventData = await getFirstSentryEnvelopeRequest<Event>(page);
+    }),
+    getFirstSentryEnvelopeRequest<Event>(page),
+  ]);
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({

diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts
@@ -16,8 +16,9 @@ sentryTest('should capture an error within a sync startSpan callback', async ({
   const url = await getLocalTestPath({ testDir: __dirname });
   await page.goto(url);
 
-  runScriptInSandbox(page, {
-    content: `
+  const [, events] = await Promise.all([
+    runScriptInSandbox(page, {
+      content: `
       function run() {
         Sentry.startSpan({ name: 'parent_span' }, () => {
           throw new Error('Sync Error');
@@ -26,9 +27,9 @@ sentryTest('should capture an error within a sync startSpan callback', async ({
 
       setTimeout(run);
       `,
-  });
-
-  const events = await getMultipleSentryEnvelopeRequests<Event>(page, 2);
+    }),
+    getMultipleSentryEnvelopeRequests<Event>(page, 2),
+  ]);
 
   const txn = events.find(event => event.type === 'transaction');
   const err = events.find(event => !event.type);

diff --git a/...packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts b/...packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts
@@ -18,13 +18,14 @@ sentryTest(
 
     await page.goto(url);
 
-    runScriptInSandbox(page, {
-      content: `
-        throw new Error('Error during pageload');
-      `,
-    });
-
-    const [e1, e2] = await getMultipleSentryEnvelopeRequests<Event>(page, 2);
+    const [, [e1, e2]] = await Promise.all([
+      runScriptInSandbox(page, {
+        content: `
+          throw new Error('Error during pageload');
+        `,
+      }),
+      getMultipleSentryEnvelopeRequests<Event>(page, 2),
+    ]);
 
     const pageloadTxnEvent = e1.type === 'transaction' ? e1 : e2;
     const errorEvent = e1.type === 'transaction' ? e2 : e1;

diff --git a/dev-packages/browser-integration-tests/utils/helpers.ts b/dev-packages/browser-integration-tests/utils/helpers.ts
@@ -138,7 +138,7 @@ export const countEnvelopes = async (
 };
 
 /**
- * Run script at the given path inside the test environment.
+ * Run script inside the test environment.
  *
  * @param {Page} page
  * @param {{ path?: string; content?: string }} impl
@@ -151,7 +151,15 @@ async function runScriptInSandbox(
     content?: string;
   },
 ): Promise<void> {
-  await page.addScriptTag({ path: impl.path, content: impl.content });
+  try {
+    await page.addScriptTag({ path: impl.path, content: impl.content });
+  } catch (e) {
+    // no-op
+  }
+}
+
+/**
+ *
 }
 
 /**