Skip to content

Commit ad7832b

Browse files
committed
fix backend accesses in tests
mark more removal TODOs
1 parent d2d60f9 commit ad7832b

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

packages/browser/src/backend.ts

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import { FetchTransport, makeNewFetchTransport, makeNewXHRTransport, XHRTranspor
88
/**
99
* Configuration options for the Sentry Browser SDK.
1010
* @see BrowserClient for more information.
11+
*
12+
* TODO(v7): move to client
1113
*/
1214
export interface BrowserOptions extends Options {
1315
/**

packages/browser/test/unit/index.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ describe('SentryBrowser initialization', () => {
246246
it('should set SDK data when Sentry.init() is called', () => {
247247
init({ dsn });
248248

249-
const sdkData = (getCurrentHub().getClient() as any)._backend._transport._api.metadata?.sdk;
249+
const sdkData = (getCurrentHub().getClient() as any).getTransport()._api.metadata?.sdk;
250250

251251
expect(sdkData.name).toBe('sentry.javascript.browser');
252252
expect(sdkData.packages[0].name).toBe('npm:@sentry/browser');
@@ -257,7 +257,7 @@ describe('SentryBrowser initialization', () => {
257257
it('should set SDK data when instantiating a client directly', () => {
258258
const client = new BrowserClient({ dsn });
259259

260-
const sdkData = (client as any)._backend._transport._api.metadata?.sdk;
260+
const sdkData = (client as any).getTransport()._api.metadata?.sdk;
261261

262262
expect(sdkData.name).toBe('sentry.javascript.browser');
263263
expect(sdkData.packages[0].name).toBe('npm:@sentry/browser');
@@ -285,7 +285,7 @@ describe('SentryBrowser initialization', () => {
285285
},
286286
});
287287

288-
const sdkData = (getCurrentHub().getClient() as any)._backend._transport._api.metadata?.sdk;
288+
const sdkData = (getCurrentHub().getClient() as any).getTransport()._api.metadata?.sdk;
289289

290290
expect(sdkData.name).toBe('sentry.javascript.angular');
291291
expect(sdkData.packages[0].name).toBe('npm:@sentry/angular');

packages/browser/test/unit/integrations/linkederrors.test.ts

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ describe('LinkedErrors', () => {
3434
one.cause = two;
3535

3636
const originalException = one;
37+
// TODO(v7): refactor to use client here!
3738
const backend = new BrowserBackend({});
3839
return backend.eventFromException(originalException).then(event => {
3940
const result = LinkedErrorsModule._handler('cause', 5, event, {
@@ -65,6 +66,7 @@ describe('LinkedErrors', () => {
6566

6667
const originalException = one;
6768
const backend = new BrowserBackend({});
69+
// TODO(v7): refactor to use client here!
6870
return backend.eventFromException(originalException).then(event => {
6971
const result = LinkedErrorsModule._handler('reason', 5, event, {
7072
originalException,
@@ -92,6 +94,7 @@ describe('LinkedErrors', () => {
9294

9395
const backend = new BrowserBackend({});
9496
const originalException = one;
97+
// TODO(v7): refactor to use client here!
9598
return backend.eventFromException(originalException).then(event => {
9699
const result = LinkedErrorsModule._handler('cause', 2, event, {
97100
originalException,

packages/node/test/index.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('SentryNode', () => {
7878
let s: jest.SpyInstance<void, Event[]>;
7979

8080
beforeEach(() => {
81-
s = jest.spyOn(NodeBackend.prototype, 'sendEvent').mockImplementation(async () => Promise.resolve({ code: 200 }));
81+
s = jest.spyOn(NodeClient.prototype, 'sendEvent').mockImplementation(async () => Promise.resolve({ code: 200 }));
8282
});
8383

8484
afterEach(() => {
@@ -360,7 +360,7 @@ describe('SentryNode initialization', () => {
360360
init({ dsn });
361361

362362
// eslint-disable-next-line @typescript-eslint/no-explicit-any
363-
const sdkData = (getCurrentHub().getClient() as any)._backend._transport._api.metadata?.sdk;
363+
const sdkData = (getCurrentHub().getClient() as any).getTransport()._api.metadata?.sdk;
364364

365365
expect(sdkData.name).toEqual('sentry.javascript.node');
366366
expect(sdkData.packages[0].name).toEqual('npm:@sentry/node');
@@ -401,7 +401,7 @@ describe('SentryNode initialization', () => {
401401
});
402402

403403
// eslint-disable-next-line @typescript-eslint/no-explicit-any
404-
const sdkData = (getCurrentHub().getClient() as any)._backend._transport._api.metadata?.sdk;
404+
const sdkData = (getCurrentHub().getClient() as any).getTransport()._api.metadata?.sdk;
405405

406406
expect(sdkData.name).toEqual('sentry.javascript.serverless');
407407
expect(sdkData.packages[0].name).toEqual('npm:@sentry/serverless');

packages/node/test/integrations/linkederrors.test.ts

+4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ describe('LinkedErrors', () => {
5252
);
5353
const one = new Error('originalException');
5454
const backend = new NodeBackend({});
55+
// TODO(v7): refactor to use client here!
5556
return backend.eventFromException(one).then(event =>
5657
linkedErrors
5758
._handler(event, {
@@ -72,6 +73,7 @@ describe('LinkedErrors', () => {
7273
two.cause = three;
7374

7475
const backend = new NodeBackend({});
76+
// TODO(v7): refactor to use client here!
7577
return backend.eventFromException(one).then(event =>
7678
linkedErrors
7779
._handler(event, {
@@ -105,6 +107,7 @@ describe('LinkedErrors', () => {
105107
two.reason = three;
106108

107109
const backend = new NodeBackend({});
110+
// TODO(v7): refactor to use client here!
108111
return backend.eventFromException(one).then(event =>
109112
linkedErrors
110113
._handler(event, {
@@ -138,6 +141,7 @@ describe('LinkedErrors', () => {
138141
two.cause = three;
139142

140143
const backend = new NodeBackend({});
144+
// TODO(v7): refactor to use client here!
141145
return backend.eventFromException(one).then(event =>
142146
linkedErrors
143147
._handler(event, {

0 commit comments

Comments
 (0)