fix integration tests

Lms24 · Lms24 · commit 3a3bf530dac0 · 2023-12-21T20:38:36.000+01:00
diff --git a/packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/subject.js b/packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/subject.js
diff --git a/packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/template.html b/packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/template.html
@@ -6,5 +6,18 @@
   </head>
   <body>
     <button id="button1" type="button">Button 1</button>
+
+    <script>
+      async function run() {
+        await Sentry.startSpan({ name: 'parent_span', op: 'test' }, async () => {
+          Promise.reject('Async Promise Rejection');
+        });
+      }
+
+      const button = document.getElementById('button1');
+      button.addEventListener('click', async () => {
+        await run();
+      });
+    </script>
   </body>
 </html>
diff --git a/packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts b/packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts
@@ -14,15 +14,17 @@ sentryTest(
     const url = await getLocalTestPath({ testDir: __dirname });
     const envelopePromise = getMultipleSentryEnvelopeRequests<Event>(page, 2);
 
-    const gotoPromise = page.goto(url);
-    const clickPromise = page.getByText('Button 1').click();
+    await page.goto(url);
 
-    const [_, events] = await Promise.all([gotoPromise, envelopePromise, clickPromise]);
+    const clickPromise = page.getByText('Button 1').click();
 
+    const [, events] = await Promise.all([clickPromise, envelopePromise]);
     const [txn, err] = events[0]?.type === 'transaction' ? [events[0], events[1]] : [events[1], events[0]];
 
     expect(txn).toMatchObject({ transaction: 'parent_span' });
 
-    expect(err?.exception?.values?.[0]?.value).toBe('[object Promise]');
+    expect(err?.exception?.values?.[0]?.value).toBe(
+      'Non-Error promise rejection captured with value: Async Promise Rejection',
+    );
   },
 );
diff --git a/packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/subject.js b/packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/subject.js
diff --git a/packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/template.html b/packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/template.html
@@ -6,5 +6,18 @@
   </head>
   <body>
     <button id="button1" type="button">Button 1</button>
+
+    <script>
+      async function run() {
+        await Sentry.startSpan({ name: 'parent_span', op: 'test' }, async () => {
+          throw new Error('Async Thrown Error');
+        });
+      }
+
+      const button = document.getElementById('button1');
+      button.addEventListener('click', async () => {
+        await run();
+      });
+    </script>
   </body>
 </html>
diff --git a/packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts b/packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts
@@ -8,25 +8,17 @@ sentryTest('should capture a thrown error within an async startSpan callback', a
   if (shouldSkipTracingTest()) {
     sentryTest.skip();
   }
-
-  page.on('pageerror', err => console.log('pageerror', err));
-  page.on('console', msg => console.log('console', msg.text()));
+  const envelopePromise = getMultipleSentryEnvelopeRequests<Event>(page, 2);
 
   const url = await getLocalTestPath({ testDir: __dirname });
-  const envelopePromise = getMultipleSentryEnvelopeRequests<Event>(page, 2);
+  await page.goto(url);
 
-  const gotoPromise = page.goto(url);
   const clickPromise = page.getByText('Button 1').click();
 
-  console.log('before wait');
-
-  const [_, events] = await Promise.all([gotoPromise, envelopePromise, clickPromise]);
-
-  console.log('after wait');
-
+  // awaiting both events simultaneously to avoid race conditions
+  const [, events] = await Promise.all([clickPromise, envelopePromise]);
   const [txn, err] = events[0]?.type === 'transaction' ? [events[0], events[1]] : [events[1], events[0]];
 
   expect(txn).toMatchObject({ transaction: 'parent_span' });
-
-  expect(err?.exception?.values?.[0]?.value).toBe('[object Promise]');
+  expect(err?.exception?.values?.[0]?.value).toBe('Async Thrown Error');
 });
diff --git a/packages/browser-integration-tests/suites/public-api/startSpan/init.js b/packages/browser-integration-tests/suites/public-api/startSpan/init.js
@@ -5,8 +5,13 @@ import * as _ from '@sentry/tracing';
 window.Sentry = Sentry;
 
 Sentry.init({
-  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  // dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  dsn: 'https://a5e7debbbe074daa916887a3adcd0df5@o447951.ingest.sentry.io/4503942526795776',
   tracesSampleRate: 1.0,
   normalizeDepth: 10,
   debug: true,
+  beforeSend(event) {
+    console.log('beforeSend', event);
+    return event;
+  },
 });
