ref: Test deprecated cleanup (#5358)

* round 1 cleanup

* add TODO for major change removal

* use main replay

---------

Co-authored-by: Antonis Lilis <[email protected]>

Author: lucas-zimerman

packages/core/test/client.test.ts

@@ -117,7 +117,7 @@ describe('Tests ReactNativeClient', () => {
       });
 
       await expect(client.eventFromMessage('test')).resolves.toBeDefined();
-      await expect(RN.LogBox.ignoreLogs).not.toBeCalled();
+      await expect(RN.LogBox.ignoreLogs).not.toHaveBeenCalled();
     });
 
     test('invalid dsn is thrown', () => {
@@ -168,7 +168,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureMessage('This message will never be sent because the client is disabled.');
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
     test('captureException does not call transport when enabled false', () => {
@@ -177,7 +177,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureException(new Error('This exception will never be sent because the client is disabled.'));
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
     test('captureEvent does not call transport when enabled false', () => {
@@ -188,7 +188,7 @@ describe('Tests ReactNativeClient', () => {
         message: 'This event will never be sent because the client is disabled.',
       });
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
     test('captureSession does not call transport when enabled false', () => {
@@ -197,16 +197,17 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureSession(getMockSession());
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
+    // TODO: Replacy by Sentry.captureFeedback
     test('captureUserFeedback does not call transport when enabled false', () => {
       const mockTransport = createMockTransport();
       const client = createDisabledClientWith(mockTransport);
 
       client.captureUserFeedback(getMockUserFeedback());
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
     function createDisabledClientWith(transport: Transport) {
@@ -298,7 +299,7 @@ describe('Tests ReactNativeClient', () => {
       });
       client.nativeCrash();
 
-      expect(RN.NativeModules.RNSentry.crash).toBeCalled();
+      expect(RN.NativeModules.RNSentry.crash).toHaveBeenCalled();
     });
   });
 
@@ -452,7 +453,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureEvent({ message: 'test event' });
 
-      expect(mockedSend).toBeCalled();
+      expect(mockedSend).toHaveBeenCalled();
       const actualEvent: Event | undefined = <Event>(
         mockedSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload]
       );
@@ -486,7 +487,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureEvent(circularEvent);
 
-      expect(mockedSend).toBeCalled();
+      expect(mockedSend).toHaveBeenCalled();
       const actualEvent: Event | undefined = <Event>(
         mockedSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload]
       );
@@ -534,7 +535,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureMessage('message_test_value');
 
-      expect(mockTransportSend).toBeCalledTimes(1);
+      expect(mockTransportSend).toHaveBeenCalledTimes(1);
       expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][1][envelopeItemHeader]).toEqual({
         type: 'client_report',
       });
@@ -607,7 +608,7 @@ describe('Tests ReactNativeClient', () => {
       mockDroppedEvent(client);
       client.captureMessage('message_test_value_2');
 
-      expect(mockTransportSend).toBeCalledTimes(2);
+      expect(mockTransportSend).toHaveBeenCalledTimes(2);
       expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems].length).toEqual(2);
       expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][1][envelopeItemHeader]).toEqual({
         type: 'client_report',
@@ -627,7 +628,7 @@ describe('Tests ReactNativeClient', () => {
     });
 
     function expectOnlyMessageEventInEnvelope(transportSend: jest.Mock) {
-      expect(transportSend).toBeCalledTimes(1);
+      expect(transportSend).toHaveBeenCalledTimes(1);
       expect(transportSend.mock.calls[0][firstArg][envelopeItems]).toHaveLength(1);
       expect(transportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemHeader]).toEqual(
         expect.objectContaining({ type: 'event' }),

packages/core/test/integrations/nativelinkederrors.test.ts

@@ -127,8 +127,8 @@ describe('NativeLinkedErrors', () => {
       },
     );
 
-    expect(NATIVE.fetchNativePackageName).toBeCalledTimes(1);
-    expect(NATIVE.fetchNativeStackFramesBy).not.toBeCalled();
+    expect(NATIVE.fetchNativePackageName).toHaveBeenCalledTimes(1);
+    expect(NATIVE.fetchNativeStackFramesBy).not.toHaveBeenCalled();
     expect(actualEvent).toEqual(
       expect.objectContaining(<Partial<Event>>{
         exception: {
@@ -266,9 +266,9 @@ describe('NativeLinkedErrors', () => {
       },
     );
 
-    expect(NATIVE.fetchNativePackageName).toBeCalledTimes(0); // not need for iOS
-    expect(NATIVE.fetchNativeStackFramesBy).toBeCalledTimes(1);
-    expect(NATIVE.fetchNativeStackFramesBy).toBeCalledWith([6446871344, 6442783348, 4350761216]);
+    expect(NATIVE.fetchNativePackageName).toHaveBeenCalledTimes(0); // not need for iOS
+    expect(NATIVE.fetchNativeStackFramesBy).toHaveBeenCalledTimes(1);
+    expect(NATIVE.fetchNativeStackFramesBy).toHaveBeenCalledWith([6446871344, 6442783348, 4350761216]);
     expect(actualEvent).toEqual(
       expect.objectContaining(<Partial<Event>>{
         debug_meta: {

packages/core/test/integrations/reactnativeinfo.test.ts

@@ -261,11 +261,11 @@ describe('React Native Info', () => {
 });
 
 function expectMocksToBeCalledOnce() {
-  expect(mockedIsHermesEnabled).toBeCalledTimes(1);
-  expect(mockedIsTurboModuleEnabled).toBeCalledTimes(1);
-  expect(mockedIsFabricEnabled).toBeCalledTimes(1);
-  expect(mockedGetExpoGoVersion).toBeCalledTimes(1);
-  expect(mockedGetExpoSdkVersion).toBeCalledTimes(1);
+  expect(mockedIsHermesEnabled).toHaveBeenCalledTimes(1);
+  expect(mockedIsTurboModuleEnabled).toHaveBeenCalledTimes(1);
+  expect(mockedIsFabricEnabled).toHaveBeenCalledTimes(1);
+  expect(mockedGetExpoGoVersion).toHaveBeenCalledTimes(1);
+  expect(mockedGetExpoSdkVersion).toHaveBeenCalledTimes(1);
 }
 
 function executeIntegrationFor(mockedEvent: Event, mockedHint: EventHint): Event | null | PromiseLike<Event | null> {

packages/core/test/integrations/sdkinfo.test.ts

@@ -39,7 +39,7 @@ describe('Sdk Info', () => {
 
     expect(processedEvent?.sdk?.packages).toEqual(expect.arrayContaining([mockCocoaPackage]));
     expect(processedEvent?.platform === 'javascript');
-    expect(mockedFetchNativeSdkInfo).toBeCalledTimes(1);
+    expect(mockedFetchNativeSdkInfo).toHaveBeenCalledTimes(1);
   });
 
   it('Adds native package and javascript platform to event on Android', async () => {
@@ -50,7 +50,7 @@ describe('Sdk Info', () => {
 
     expect(processedEvent?.sdk?.packages).toEqual(expect.not.arrayContaining([mockCocoaPackage]));
     expect(processedEvent?.platform === 'javascript');
-    expect(mockedFetchNativeSdkInfo).toBeCalledTimes(1);
+    expect(mockedFetchNativeSdkInfo).toHaveBeenCalledTimes(1);
   });
 
   it('Does not add any default non native packages', async () => {
@@ -60,7 +60,7 @@ describe('Sdk Info', () => {
 
     expect(processedEvent?.sdk?.packages).toEqual([]);
     expect(processedEvent?.platform === 'javascript');
-    expect(mockedFetchNativeSdkInfo).toBeCalledTimes(1);
+    expect(mockedFetchNativeSdkInfo).toHaveBeenCalledTimes(1);
   });
 
   it('Does not overwrite existing sdk name and version', async () => {

packages/core/test/profiling/integration.test.ts

@@ -365,7 +365,7 @@ describe('profiling integration', () => {
     transaction.end();
     jest.runAllTimers();
 
-    expect(mockWrapper.NATIVE.startProfiling).toBeCalledWith(false);
+    expect(mockWrapper.NATIVE.startProfiling).toHaveBeenCalledWith(false);
   });
 });
 

packages/core/test/replay/CustomMask.test.ts

@@ -74,8 +74,8 @@ describe('CustomMask', () => {
     expect(Mask).toBe(mockMaskComponent);
     expect(Unmask).toBe(mockUnmaskComponent);
 
-    expect(mockNativeComponentRegistryGet).toBeCalledTimes(2);
-    expect(mockNativeComponentRegistryGet).toBeCalledWith('RNSentryReplayMask', expect.any(Function));
-    expect(mockNativeComponentRegistryGet).toBeCalledWith('RNSentryReplayUnmask', expect.any(Function));
+    expect(mockNativeComponentRegistryGet).toHaveBeenCalledTimes(2);
+    expect(mockNativeComponentRegistryGet).toHaveBeenCalledWith('RNSentryReplayMask', expect.any(Function));
+    expect(mockNativeComponentRegistryGet).toHaveBeenCalledWith('RNSentryReplayUnmask', expect.any(Function));
   });
 });

packages/core/test/scopeSync.test.ts

@@ -30,7 +30,7 @@ describe('ScopeSync', () => {
 
         scope.addBreadcrumb({ message: 'test' });
 
-        expect(NATIVE.addBreadcrumb).toBeCalledTimes(1);
+        expect(NATIVE.addBreadcrumb).toHaveBeenCalledTimes(1);
       });
 
       it('adds default level if no level specified', () => {
@@ -61,7 +61,7 @@ describe('ScopeSync', () => {
           message: 'test',
         };
         scope.addBreadcrumb(breadcrumb);
-        expect(NATIVE.addBreadcrumb).toBeCalledWith(
+        expect(NATIVE.addBreadcrumb).toHaveBeenCalledWith(
           expect.objectContaining({
             timestamp: expect.any(Number),
           }),
@@ -73,7 +73,7 @@ describe('ScopeSync', () => {
           data: undefined,
         };
         scope.addBreadcrumb(breadcrumb);
-        expect(NATIVE.addBreadcrumb).toBeCalledWith(
+        expect(NATIVE.addBreadcrumb).toHaveBeenCalledWith(
           expect.objectContaining({
             data: undefined,
           }),
@@ -87,7 +87,7 @@ describe('ScopeSync', () => {
           },
         };
         scope.addBreadcrumb(breadcrumb);
-        expect(NATIVE.addBreadcrumb).toBeCalledWith(
+        expect(NATIVE.addBreadcrumb).toHaveBeenCalledWith(
           expect.objectContaining({
             data: { foo: '[NaN]' },
           }),
@@ -99,7 +99,7 @@ describe('ScopeSync', () => {
           data: 'foo' as unknown as object,
         };
         scope.addBreadcrumb(breadcrumb);
-        expect(NATIVE.addBreadcrumb).toBeCalledWith(
+        expect(NATIVE.addBreadcrumb).toHaveBeenCalledWith(
           expect.objectContaining({
             data: { value: 'foo' },
           }),
@@ -171,7 +171,7 @@ describe('ScopeSync', () => {
       expect(SentryCore.getIsolationScope().setTags).not.toBe(setTagsScopeSpy);
 
       SentryCore.setTags({ key: 'value', second: 'bar' });
-      expect(NATIVE.setTag).toBeCalledTimes(2);
+      expect(NATIVE.setTag).toHaveBeenCalledTimes(2);
       expect(NATIVE.setTag).toHaveBeenCalledWith('key', 'value');
       expect(NATIVE.setTag).toHaveBeenCalledWith('second', 'bar');
       expect(setTagsScopeSpy).toHaveBeenCalledExactlyOnceWith({ key: 'value', second: 'bar' });
@@ -189,7 +189,7 @@ describe('ScopeSync', () => {
       expect(SentryCore.getIsolationScope().setExtras).not.toBe(setExtrasScopeSpy);
 
       SentryCore.setExtras({ key: 'value', second: 'bar' });
-      expect(NATIVE.setExtra).toBeCalledTimes(2);
+      expect(NATIVE.setExtra).toHaveBeenCalledTimes(2);
       expect(NATIVE.setExtra).toHaveBeenCalledWith('key', 'value');
       expect(NATIVE.setExtra).toHaveBeenCalledWith('second', 'bar');
       expect(setExtrasScopeSpy).toHaveBeenCalledExactlyOnceWith({ key: 'value', second: 'bar' });