Change event waiting pattern.

Author: onurtemizkan

dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/init.js

@@ -4,4 +4,5 @@ window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
+  debug: true,
 });

dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts

@@ -11,17 +11,18 @@ sentryTest(
 
     await page.goto(url);
 
-    const [, eventData] = await Promise.all([
-      runScriptInSandbox(page, {
-        content: `
+    const errorEventPromise = getFirstSentryEnvelopeRequest<Event>(page);
+
+    runScriptInSandbox(page, {
+      content: `
         throw {
           type: 'Error',
           otherKey: 'otherValue',
         };
       `,
-      }),
-      getFirstSentryEnvelopeRequest<Event>(page),
-    ]);
+    });
+
+    const eventData = await errorEventPromise;
 
     expect(eventData.exception?.values).toHaveLength(1);
     expect(eventData.exception?.values?.[0]).toMatchObject({

dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts

@@ -11,19 +11,20 @@ sentryTest(
 
     await page.goto(url);
 
-    const [, events] = await Promise.all([
-      runScriptInSandbox(page, {
-        content: `
+    const errorEventsPromise = getMultipleSentryEnvelopeRequests<Event>(page, 1);
+
+    runScriptInSandbox(page, {
+      content: `
           try {
             foo();
           } catch (e) {
             Sentry.captureException(e);
             throw e;
           }
         `,
-      }),
-      getMultipleSentryEnvelopeRequests<Event>(page, 1),
-    ]);
+    });
+
+    const events = await errorEventsPromise;
 
     expect(events[0].exception?.values).toHaveLength(1);
     expect(events[0].exception?.values?.[0]).toMatchObject({

dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts

@@ -9,14 +9,15 @@ sentryTest('should catch syntax errors', async ({ getLocalTestPath, page }) => {
 
   await page.goto(url);
 
-  const [, eventData] = await Promise.all([
-    runScriptInSandbox(page, {
-      content: `
+  const errorEventPromise = getFirstSentryEnvelopeRequest<Event>(page);
+
+  runScriptInSandbox(page, {
+    content: `
       foo{}; // SyntaxError
     `,
-    }),
-    getFirstSentryEnvelopeRequest<Event>(page),
-  ]);
+  });
+
+  const eventData = await errorEventPromise;
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({

dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts

@@ -9,14 +9,15 @@ sentryTest('should catch thrown errors', async ({ getLocalTestPath, page }) => {
 
   await page.goto(url);
 
-  const [, eventData] = await Promise.all([
-    runScriptInSandbox(page, {
-      content: `
+  const errorEventPromise = getFirstSentryEnvelopeRequest<Event>(page);
+
+  runScriptInSandbox(page, {
+    content: `
       throw new Error('realError');
       `,
-    }),
-    getFirstSentryEnvelopeRequest<Event>(page),
-  ]);
+  });
+
+  const eventData = await errorEventPromise;
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({

dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts

@@ -9,16 +9,17 @@ sentryTest('should catch thrown objects', async ({ getLocalTestPath, page }) =>
 
   await page.goto(url);
 
-  const [, eventData] = await Promise.all([
-    runScriptInSandbox(page, {
-      content: `
+  const errorEventPromise = getFirstSentryEnvelopeRequest<Event>(page);
+
+  await runScriptInSandbox(page, {
+    content: `
       throw {
         error: 'stuff is broken',
         somekey: 'ok'
       };`,
-    }),
-    getFirstSentryEnvelopeRequest<Event>(page),
-  ]);
+  });
+
+  const eventData = await errorEventPromise;
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({

dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts

@@ -9,14 +9,15 @@ sentryTest('should catch thrown strings', async ({ getLocalTestPath, page }) =>
 
   await page.goto(url);
 
-  const [, eventData] = await Promise.all([
-    runScriptInSandbox(page, {
-      content: `
+  const errorEventPromise = getFirstSentryEnvelopeRequest<Event>(page);
+
+  runScriptInSandbox(page, {
+    content: `
       throw 'stringError';
     `,
-    }),
-    getFirstSentryEnvelopeRequest<Event>(page),
-  ]);
+  });
+
+  const eventData = await errorEventPromise;
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({

dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts

@@ -14,11 +14,13 @@ sentryTest('should capture an error within a sync startSpan callback', async ({
   }
 
   const url = await getLocalTestPath({ testDir: __dirname });
+
   await page.goto(url);
 
-  const [, events] = await Promise.all([
-    runScriptInSandbox(page, {
-      content: `
+  const errorEventsPromise = getMultipleSentryEnvelopeRequests<Event>(page, 2);
+
+  runScriptInSandbox(page, {
+    content: `
       function run() {
         Sentry.startSpan({ name: 'parent_span' }, () => {
           throw new Error('Sync Error');
@@ -27,9 +29,9 @@ sentryTest('should capture an error within a sync startSpan callback', async ({
 
       setTimeout(run);
       `,
-    }),
-    getMultipleSentryEnvelopeRequests<Event>(page, 2),
-  ]);
+  });
+
+  const events = await errorEventsPromise;
 
   const txn = events.find(event => event.type === 'transaction');
   const err = events.find(event => !event.type);

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts

@@ -18,14 +18,15 @@ sentryTest(
 
     await page.goto(url);
 
-    const [, [e1, e2]] = await Promise.all([
-      runScriptInSandbox(page, {
-        content: `
+    const errorEventsPromise = getMultipleSentryEnvelopeRequests<Event>(page, 2);
+
+    runScriptInSandbox(page, {
+      content: `
           throw new Error('Error during pageload');
         `,
-      }),
-      getMultipleSentryEnvelopeRequests<Event>(page, 2),
-    ]);
+    });
+
+    const [e1, e2] = await errorEventsPromise;
 
     const pageloadTxnEvent = e1.type === 'transaction' ? e1 : e2;
     const errorEvent = e1.type === 'transaction' ? e2 : e1;

dev-packages/browser-integration-tests/utils/helpers.ts

@@ -158,10 +158,6 @@ async function runScriptInSandbox(
   }
 }
 
-/**
- *
-}
-
 /**
  * Get Sentry events at the given URL, or the current page.
  *
@@ -346,12 +342,4 @@ async function getFirstSentryEnvelopeRequest<T>(
   return (await getMultipleSentryEnvelopeRequests<T>(page, 1, { url }, requestParser))[0];
 }
 
-/**
- * Trigger an error in the page context.
- * This function is useful to test error handling in the page.
- *
- * @param {Page} page
- * @param {unknown} error
- */
-
 export { runScriptInSandbox, getMultipleSentryEnvelopeRequests, getFirstSentryEnvelopeRequest, getSentryEvents };