test(e2e): Avoid race conditions when waiting for captured message (#4595)

Author: krystofwoldrich

samples/react-native/e2e/captureMessage.test.android.ts

@@ -3,7 +3,7 @@ import { Envelope, EventItem } from '@sentry/core';
 import { device } from 'detox';
 import {
   createSentryServer,
-  containingEvent,
+  containingEventWithAndroidMessage,
 } from './utils/mockedSentryServer';
 import { tap } from './utils/tap';
 import { getItemOfTypeFrom } from './utils/event';
@@ -17,7 +17,9 @@ describe('Capture message', () => {
   beforeAll(async () => {
     await device.launchApp();
 
-    const envelopePromise = sentryServer.waitForEnvelope(containingEvent);
+    const envelopePromise = sentryServer.waitForEnvelope(
+      containingEventWithAndroidMessage('Captured message'),
+    );
     await tap('Capture message');
     envelope = await envelopePromise;
   });

samples/react-native/e2e/captureMessage.test.ios.ts

@@ -3,7 +3,7 @@ import { Envelope, EventItem } from '@sentry/core';
 import { device } from 'detox';
 import {
   createSentryServer,
-  containingEvent,
+  containingEventWithMessage,
 } from './utils/mockedSentryServer';
 import { tap } from './utils/tap';
 import { getItemOfTypeFrom } from './utils/event';
@@ -17,7 +17,9 @@ describe('Capture message', () => {
   beforeAll(async () => {
     await device.launchApp();
 
-    const envelopePromise = sentryServer.waitForEnvelope(containingEvent);
+    const envelopePromise = sentryServer.waitForEnvelope(
+      containingEventWithMessage('Captured message'),
+    );
     await tap('Capture message');
     envelope = await envelopePromise;
   });

samples/react-native/e2e/envelopeHeader.test.android.ts

@@ -3,7 +3,7 @@ import { Envelope } from '@sentry/core';
 import { device } from 'detox';
 import {
   createSentryServer,
-  containingEvent,
+  containingEventWithAndroidMessage,
 } from './utils/mockedSentryServer';
 import { HEADER } from './utils/consts';
 import { tap } from './utils/tap';
@@ -17,7 +17,9 @@ describe('Capture message', () => {
   beforeAll(async () => {
     await device.launchApp();
 
-    const envelopePromise = sentryServer.waitForEnvelope(containingEvent);
+    const envelopePromise = sentryServer.waitForEnvelope(
+      containingEventWithAndroidMessage('Captured message'),
+    );
 
     await tap('Capture message');
     envelope = await envelopePromise;

samples/react-native/e2e/envelopeHeader.test.ios.ts

@@ -3,7 +3,7 @@ import { Envelope } from '@sentry/core';
 import { device } from 'detox';
 import {
   createSentryServer,
-  containingEvent,
+  containingEventWithMessage,
 } from './utils/mockedSentryServer';
 import { HEADER } from './utils/consts';
 import { tap } from './utils/tap';
@@ -17,7 +17,9 @@ describe('Capture message', () => {
   beforeAll(async () => {
     await device.launchApp();
 
-    const envelopePromise = sentryServer.waitForEnvelope(containingEvent);
+    const envelopePromise = sentryServer.waitForEnvelope(
+      containingEventWithMessage('Captured message'),
+    );
 
     await tap('Capture message');
     envelope = await envelopePromise;

samples/react-native/e2e/utils/mockedSentryServer.ts

@@ -94,6 +94,27 @@ export function containingEvent(envelope: Envelope) {
   return envelope[1].some(item => itemHeaderIsType(item[0], 'event'));
 }
 
+export function containingEventWithAndroidMessage(message: string) {
+  return (envelope: Envelope) =>
+    envelope[1].some(
+      item =>
+        itemHeaderIsType(item[0], 'event') &&
+        itemBodyIsEvent(item[1]) &&
+        item[1].message &&
+        (item[1].message as unknown as { message: string }).message === message,
+    );
+}
+
+export function containingEventWithMessage(message: string) {
+  return (envelope: Envelope) =>
+    envelope[1].some(
+      item =>
+        itemHeaderIsType(item[0], 'event') &&
+        itemBodyIsEvent(item[1]) &&
+        item[1].message === message,
+    );
+}
+
 export function containingTransactionWithName(name: string) {
   return (envelope: Envelope) =>
     envelope[1].some(