improve tests

Author: Lms24

packages/browser/test/unit/transports/setup.test.ts

@@ -1,12 +1,17 @@
 import { NoopTransport } from '@sentry/core';
 
-import { FetchTransport, setupBrowserTransport, XHRTransport } from '../../../src/transports';
+import {
+  FetchTransport,
+  makeNewFetchTransport,
+  makeNewXHRTransport,
+  setupBrowserTransport,
+  XHRTransport,
+} from '../../../src/transports';
 import { SimpleTransport } from '../mocks/simpletransport';
 
 const DSN = 'https://username@domain/123';
 
 let fetchSupported = true;
-let getNativeFetchImplCalled = false;
 
 jest.mock('@sentry/utils', () => {
   const original = jest.requireActual('@sentry/utils');
@@ -23,23 +28,32 @@ jest.mock('@sentry/utils', () => {
   };
 });
 
-jest.mock('@sentry/browser/src/transports/utils', () => {
-  const original = jest.requireActual('@sentry/browser/src/transports/utils');
+jest.mock('../../../src/transports/new-fetch', () => {
+  const original = jest.requireActual('../../../src/transports/new-fetch');
   return {
     ...original,
-    getNativeFetchImplementation() {
-      getNativeFetchImplCalled = true;
-      return {
-        fetch: () => {},
-      };
-    },
+    makeNewFetchTransport: jest.fn(() => ({
+      send: () => Promise.resolve({ status: 'success' }),
+      flush: () => Promise.resolve(true),
+    })),
+  };
+});
+
+jest.mock('../../../src/transports/new-xhr', () => {
+  const original = jest.requireActual('../../../src/transports/new-xhr');
+  return {
+    ...original,
+    makeNewXHRTransport: jest.fn(() => ({
+      send: () => Promise.resolve({ status: 'success' }),
+      flush: () => Promise.resolve(true),
+    })),
   };
 });
 
 describe('setupBrowserTransport', () => {
-  beforeEach(() => {
-    getNativeFetchImplCalled = false;
-  });
+  afterEach(() => jest.clearAllMocks());
+
+  afterAll(() => jest.resetAllMocks());
 
   it('returns NoopTransport if no dsn is passed', () => {
     const { transport, newTransport } = setupBrowserTransport({});
@@ -65,10 +79,8 @@ describe('setupBrowserTransport', () => {
     expect(transport).toBeDefined();
     expect(transport).toBeInstanceOf(FetchTransport);
     expect(newTransport).toBeDefined();
-    // This is a weird way of testing that `newTransport` is using fetch but it works.
-    // Given that the new transports are functions, we cannot test their instance.
-    // Totally open for suggestions how to test this better here
-    expect(getNativeFetchImplCalled).toBe(true);
+    expect(makeNewFetchTransport).toHaveBeenCalledTimes(1);
+    expect(makeNewXHRTransport).toHaveBeenCalledTimes(0);
   });
 
   it('returns xhrTransports if fetch is not supported', () => {
@@ -80,9 +92,7 @@ describe('setupBrowserTransport', () => {
     expect(transport).toBeDefined();
     expect(transport).toBeInstanceOf(XHRTransport);
     expect(newTransport).toBeDefined();
-    // This is a weird way of testing that `newTransport` is using fetch but it works.
-    // Given that the new transports are functions, we cannot test their instance.
-    // Totally open for suggestions how to test this better here
-    expect(getNativeFetchImplCalled).toBe(false);
+    expect(makeNewFetchTransport).toHaveBeenCalledTimes(0);
+    expect(makeNewXHRTransport).toHaveBeenCalledTimes(1);
   });
 });

packages/node/test/transports/setup.test.ts

@@ -2,9 +2,26 @@ import { NoopTransport } from '@sentry/core';
 import { FakeTransport } from '@sentry/core/test/mocks/transport';
 import { HTTPSTransport, HTTPTransport, setupNodeTransport } from '@sentry/node/src/transports';
 
+import { makeNodeTransport } from '../../src/transports/new';
+
+jest.mock('../../src/transports/new', () => {
+  const original = jest.requireActual('../../src/transports/new');
+  return {
+    ...original,
+    makeNodeTransport: jest.fn(() => ({
+      send: () => Promise.resolve({ status: 'success' }),
+      flush: () => Promise.resolve(true),
+    })),
+  };
+});
+
 const DSN = 'https://username@domain/123';
 
 describe('setupNodeTransport', () => {
+  afterEach(() => jest.clearAllMocks());
+
+  afterAll(() => jest.resetAllMocks());
+
   it('returns NoopTransport if no dsn is passed', () => {
     const { transport, newTransport } = setupNodeTransport({});
 
@@ -23,22 +40,27 @@ describe('setupNodeTransport', () => {
   });
 
   it('returns HTTPS transport as a default', () => {
+    // jest.spyOn(nodeTransportCreation, 'makeNodeTransport').mockImplementation(() => ({
+    //   send: (request: Envelope) => Promise.resolve({ status: 'success' }),
+    //   flush: (timeout: number) => Promise.resolve(true),
+    // }));
+
     const options = { dsn: DSN };
     const { transport, newTransport } = setupNodeTransport(options);
 
     expect(transport).toBeDefined();
     expect(transport).toBeInstanceOf(HTTPSTransport);
     expect(newTransport).toBeDefined();
+    expect(makeNodeTransport).toHaveBeenCalledTimes(1);
   });
 
   it('returns HTTP transport if specified in the dsn', () => {
-    // fetchSupported = false;
-
     const options = { dsn: 'http://username@domain/123' };
     const { transport, newTransport } = setupNodeTransport(options);
 
     expect(transport).toBeDefined();
     expect(transport).toBeInstanceOf(HTTPTransport);
     expect(newTransport).toBeDefined();
+    expect(makeNodeTransport).toHaveBeenCalledTimes(1);
   });
 });