Skip to content

Commit 6f847c0

Browse files
JonasBaJonasBa
committed
ref(types): remove enum usage
1 parent cf6524e commit 6f847c0

File tree

8 files changed

+48
-50
lines changed

8 files changed

+48
-50
lines changed

‎packages/browser/src/transports/base.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
Outcome,
1010
Response as SentryResponse,
1111
SentryRequestType,
12-
Status,
1312
Transport,
1413
TransportOptions,
1514
} from '@sentry/types';
@@ -169,7 +168,7 @@ export abstract class BaseTransport implements Transport {
169168
if (limited)
170169
logger.warn(`Too many ${requestType} requests, backing off until: ${this._disabledUntil(requestType)}`);
171170

172-
if (status === Status.Success) {
171+
if (status === 'success') {
173172
resolve({ status });
174173
return;
175174
}

‎packages/browser/test/unit/transports/fetch.test.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Outcome } from '@sentry/types';
22
import { SentryError } from '@sentry/utils';
33

4-
import { Event, Response, Status, Transports } from '../../../src';
4+
import { Event, Response, Transports } from '../../../src';
55

66
const testDsn = 'https://[email protected]/42';
77
const storeUrl = 'https://sentry.io/api/42/store/?sentry_key=123&sentry_version=7';
@@ -61,7 +61,7 @@ describe('FetchTransport', () => {
6161

6262
const res = await transport.sendEvent(eventPayload);
6363

64-
expect((res as Response).status).toBe(Status.Success);
64+
expect((res as Response).status).toBe('success');
6565
expect(fetch).toHaveBeenCalledWith(storeUrl, {
6666
body: JSON.stringify(eventPayload),
6767
method: 'POST',
@@ -149,7 +149,7 @@ describe('FetchTransport', () => {
149149

150150
const res = await transport.sendEvent(eventPayload);
151151

152-
expect((res as Response).status).toBe(Status.Success);
152+
expect((res as Response).status).toBe('success');
153153
expect(fetch).toHaveBeenCalledWith(storeUrl, {
154154
body: JSON.stringify(eventPayload),
155155
headers: {
@@ -176,7 +176,7 @@ describe('FetchTransport', () => {
176176

177177
const res = await transport.sendEvent(eventPayload);
178178

179-
expect((res as Response).status).toBe(Status.Success);
179+
expect((res as Response).status).toBe('success');
180180
expect(fetch).toHaveBeenCalledWith(storeUrl, {
181181
body: JSON.stringify(eventPayload),
182182
credentials: 'include',
@@ -232,7 +232,7 @@ describe('FetchTransport', () => {
232232
window.fetch.mockImplementation(() => Promise.resolve({ status: 200, headers: new Headers() }));
233233

234234
const eventRes = await transport.sendEvent(eventPayload);
235-
expect(eventRes.status).toBe(Status.Success);
235+
expect(eventRes.status).toBe('success');
236236
expect(fetch).toHaveBeenCalledTimes(2);
237237
});
238238

@@ -275,7 +275,7 @@ describe('FetchTransport', () => {
275275
window.fetch.mockImplementation(() => Promise.resolve({ status: 200, headers: new Headers() }));
276276

277277
const transactionRes = await transport.sendEvent(transactionPayload);
278-
expect(transactionRes.status).toBe(Status.Success);
278+
expect(transactionRes.status).toBe('success');
279279
expect(fetch).toHaveBeenCalledTimes(2);
280280

281281
try {
@@ -290,7 +290,7 @@ describe('FetchTransport', () => {
290290
}
291291

292292
const eventRes = await transport.sendEvent(eventPayload);
293-
expect(eventRes.status).toBe(Status.Success);
293+
expect(eventRes.status).toBe('success');
294294
expect(fetch).toHaveBeenCalledTimes(3);
295295
});
296296

@@ -357,11 +357,11 @@ describe('FetchTransport', () => {
357357
window.fetch.mockImplementation(() => Promise.resolve({ status: 200, headers: new Headers() }));
358358

359359
const eventRes = await transport.sendEvent(eventPayload);
360-
expect(eventRes.status).toBe(Status.Success);
360+
expect(eventRes.status).toBe('success');
361361
expect(fetch).toHaveBeenCalledTimes(2);
362362

363363
const transactionRes = await transport.sendEvent(transactionPayload);
364-
expect(transactionRes.status).toBe(Status.Success);
364+
expect(transactionRes.status).toBe('success');
365365
expect(fetch).toHaveBeenCalledTimes(3);
366366
});
367367

@@ -428,11 +428,11 @@ describe('FetchTransport', () => {
428428
window.fetch.mockImplementation(() => Promise.resolve({ status: 200, headers: new Headers() }));
429429

430430
const eventRes = await transport.sendEvent(eventPayload);
431-
expect(eventRes.status).toBe(Status.Success);
431+
expect(eventRes.status).toBe('success');
432432
expect(fetch).toHaveBeenCalledTimes(2);
433433

434434
const transactionRes = await transport.sendEvent(transactionPayload);
435-
expect(transactionRes.status).toBe(Status.Success);
435+
expect(transactionRes.status).toBe('success');
436436
expect(fetch).toHaveBeenCalledTimes(3);
437437
});
438438

@@ -460,7 +460,7 @@ describe('FetchTransport', () => {
460460
window.fetch.mockImplementation(() => Promise.resolve({ status: 200, headers }));
461461

462462
let eventRes = await transport.sendEvent(eventPayload);
463-
expect(eventRes.status).toBe(Status.Success);
463+
expect(eventRes.status).toBe('success');
464464
expect(fetch).toHaveBeenCalled();
465465

466466
try {
@@ -477,7 +477,7 @@ describe('FetchTransport', () => {
477477
window.fetch.mockImplementation(() => Promise.resolve({ status: 200, headers: new Headers() }));
478478

479479
eventRes = await transport.sendEvent(eventPayload);
480-
expect(eventRes.status).toBe(Status.Success);
480+
expect(eventRes.status).toBe('success');
481481
expect(fetch).toHaveBeenCalledTimes(2);
482482
});
483483

‎packages/browser/test/unit/transports/xhr.test.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Outcome } from '@sentry/types';
22
import { SentryError } from '@sentry/utils';
33
import { fakeServer, SinonFakeServer } from 'sinon';
44

5-
import { Event, Response, Status, Transports } from '../../../src';
5+
import { Event, Response, Transports } from '../../../src';
66

77
const testDsn = 'https://[email protected]/42';
88
const storeUrl = 'https://sentry.io/api/42/store/?sentry_key=123&sentry_version=7';
@@ -41,7 +41,7 @@ describe('XHRTransport', () => {
4141

4242
const res = await transport.sendEvent(eventPayload);
4343

44-
expect((res as Response).status).toBe(Status.Success);
44+
expect((res as Response).status).toBe('success');
4545
const request = server.requests[0];
4646
expect(server.requests.length).toBe(1);
4747
expect(request.method).toBe('POST');
@@ -107,7 +107,7 @@ describe('XHRTransport', () => {
107107
const res = await transport.sendEvent(eventPayload);
108108
const request = server.requests[0];
109109

110-
expect((res as Response).status).toBe(Status.Success);
110+
expect((res as Response).status).toBe('success');
111111
const requestHeaders: { [key: string]: string } = request.requestHeaders as { [key: string]: string };
112112
expect(requestHeaders['Accept']).toBe('application/json');
113113
});
@@ -157,7 +157,7 @@ describe('XHRTransport', () => {
157157
server.respondWith('POST', storeUrl, [200, {}, '']);
158158

159159
const eventRes = await transport.sendEvent(eventPayload);
160-
expect(eventRes.status).toBe(Status.Success);
160+
expect(eventRes.status).toBe('success');
161161
expect(server.requests.length).toBe(2);
162162
});
163163

@@ -197,7 +197,7 @@ describe('XHRTransport', () => {
197197
}
198198

199199
const transactionRes = await transport.sendEvent(transactionPayload);
200-
expect(transactionRes.status).toBe(Status.Success);
200+
expect(transactionRes.status).toBe('success');
201201
expect(server.requests.length).toBe(2);
202202

203203
try {
@@ -214,7 +214,7 @@ describe('XHRTransport', () => {
214214
server.respondWith('POST', storeUrl, [200, {}, '']);
215215

216216
const eventRes = await transport.sendEvent(eventPayload);
217-
expect(eventRes.status).toBe(Status.Success);
217+
expect(eventRes.status).toBe('success');
218218
expect(server.requests.length).toBe(3);
219219
});
220220

@@ -285,11 +285,11 @@ describe('XHRTransport', () => {
285285
server.respondWith('POST', envelopeUrl, [200, {}, '']);
286286

287287
const eventRes = await transport.sendEvent(eventPayload);
288-
expect(eventRes.status).toBe(Status.Success);
288+
expect(eventRes.status).toBe('success');
289289
expect(server.requests.length).toBe(2);
290290

291291
const transactionRes = await transport.sendEvent(transactionPayload);
292-
expect(transactionRes.status).toBe(Status.Success);
292+
expect(transactionRes.status).toBe('success');
293293
expect(server.requests.length).toBe(3);
294294
});
295295

@@ -356,11 +356,11 @@ describe('XHRTransport', () => {
356356
server.respondWith('POST', envelopeUrl, [200, {}, '']);
357357

358358
const eventRes = await transport.sendEvent(eventPayload);
359-
expect(eventRes.status).toBe(Status.Success);
359+
expect(eventRes.status).toBe('success');
360360
expect(server.requests.length).toBe(2);
361361

362362
const transactionRes = await transport.sendEvent(transactionPayload);
363-
expect(transactionRes.status).toBe(Status.Success);
363+
expect(transactionRes.status).toBe('success');
364364
expect(server.requests.length).toBe(3);
365365
});
366366

@@ -386,7 +386,7 @@ describe('XHRTransport', () => {
386386
.mockImplementationOnce(() => afterLimit);
387387

388388
let eventRes = await transport.sendEvent(eventPayload);
389-
expect(eventRes.status).toBe(Status.Success);
389+
expect(eventRes.status).toBe('success');
390390
expect(server.requests.length).toBe(1);
391391

392392
try {
@@ -403,7 +403,7 @@ describe('XHRTransport', () => {
403403
server.respondWith('POST', storeUrl, [200, {}, '']);
404404

405405
eventRes = await transport.sendEvent(eventPayload);
406-
expect(eventRes.status).toBe(Status.Success);
406+
expect(eventRes.status).toBe('success');
407407
expect(server.requests.length).toBe(2);
408408
});
409409

‎packages/core/src/transports/noop.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Event, Response, Status, Transport } from '@sentry/types';
1+
import { Event, Response, Transport } from '@sentry/types';
22
import { SyncPromise } from '@sentry/utils';
33

44
/** Noop transport */
@@ -9,7 +9,7 @@ export class NoopTransport implements Transport {
99
public sendEvent(_: Event): PromiseLike<Response> {
1010
return SyncPromise.resolve({
1111
reason: `NoopTransport: Event has been skipped because no Dsn is configured.`,
12-
status: Status.Skipped,
12+
status: 'skipped',
1313
});
1414
}
1515

‎packages/core/test/mocks/transport.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Event, Response, Status, Transport } from '@sentry/types';
1+
import { Event, Response, Transport } from '@sentry/types';
22
import { PromiseBuffer, SyncPromise } from '@sentry/utils';
33

44
async function sleep(delay: number): Promise<void> {
@@ -20,7 +20,7 @@ export class FakeTransport implements Transport {
2020
new SyncPromise(async res => {
2121
await sleep(this.delay);
2222
this.sentCount += 1;
23-
res({ status: Status.Success });
23+
res({ status: 'success' });
2424
}),
2525
);
2626
}

‎packages/hub/test/sessionflusher.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RequestSessionStatus, Status } from '@sentry/types';
1+
import { RequestSessionStatus } from '@sentry/types';
22

33
import { SessionFlusher } from '../src/sessionflusher';
44

@@ -12,7 +12,7 @@ describe('Session Flusher', () => {
1212

1313
beforeEach(() => {
1414
jest.useFakeTimers();
15-
sendSession = jest.fn(() => Promise.resolve({ status: Status.Success }));
15+
sendSession = jest.fn(() => Promise.resolve({ status: 'success' }));
1616
transport = {
1717
sendEvent: jest.fn(),
1818
sendSession,

‎packages/node/src/transports/base/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
SentryRequestType,
88
Session,
99
SessionAggregates,
10-
Status,
1110
Transport,
1211
TransportOptions,
1312
} from '@sentry/types';
@@ -236,7 +235,7 @@ export abstract class BaseTransport implements Transport {
236235
)}`,
237236
);
238237

239-
if (status === Status.Success) {
238+
if (status === 'success') {
240239
resolve({ status });
241240
} else {
242241
let rejectionMessage = `HTTP Error (${statusCode})`;

‎packages/node/test/transports/http.test.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Session } from '@sentry/hub';
2-
import { Event, SessionAggregates, SessionStatus, Status, TransportOptions } from '@sentry/types';
2+
import { Event, SessionAggregates, SessionStatus, TransportOptions } from '@sentry/types';
33
import { SentryError } from '@sentry/utils';
44
import * as http from 'http';
55
import * as HttpsProxyAgent from 'https-proxy-agent';
@@ -284,10 +284,10 @@ describe('HTTPTransport', () => {
284284
mockReturnCode = 200;
285285

286286
const eventRes = await transport.sendEvent(eventPayload);
287-
expect(eventRes.status).toEqual(Status.Success);
287+
expect(eventRes.status).toEqual('success');
288288

289289
const transactionRes = await transport.sendEvent(transactionPayload);
290-
expect(transactionRes.status).toEqual(Status.Success);
290+
expect(transactionRes.status).toEqual('success');
291291

292292
mock.mockRestore();
293293
});
@@ -331,10 +331,10 @@ describe('HTTPTransport', () => {
331331
mockReturnCode = 200;
332332

333333
const transactionRes = await transport.sendEvent(transactionPayload);
334-
expect(transactionRes.status).toEqual(Status.Success);
334+
expect(transactionRes.status).toEqual('success');
335335

336336
const sessionsRes = await transport.sendSession(sessionPayload);
337-
expect(sessionsRes.status).toEqual(Status.Success);
337+
expect(sessionsRes.status).toEqual('success');
338338

339339
try {
340340
await transport.sendEvent(eventPayload);
@@ -350,7 +350,7 @@ describe('HTTPTransport', () => {
350350
}
351351

352352
const eventRes = await transport.sendEvent(eventPayload);
353-
expect(eventRes.status).toEqual(Status.Success);
353+
expect(eventRes.status).toEqual('success');
354354

355355
mock.mockRestore();
356356
});
@@ -439,13 +439,13 @@ describe('HTTPTransport', () => {
439439
mockReturnCode = 200;
440440

441441
const eventRes = await transport.sendEvent(eventPayload);
442-
expect(eventRes.status).toEqual(Status.Success);
442+
expect(eventRes.status).toEqual('success');
443443

444444
const sessionsRes = await transport.sendSession(sessionPayload);
445-
expect(sessionsRes.status).toEqual(Status.Success);
445+
expect(sessionsRes.status).toEqual('success');
446446

447447
const transactionRes = await transport.sendEvent(transactionPayload);
448-
expect(transactionRes.status).toEqual(Status.Success);
448+
expect(transactionRes.status).toEqual('success');
449449

450450
mock.mockRestore();
451451
});
@@ -513,10 +513,10 @@ describe('HTTPTransport', () => {
513513
mockReturnCode = 200;
514514

515515
const eventRes = await transport.sendEvent(eventPayload);
516-
expect(eventRes.status).toEqual(Status.Success);
516+
expect(eventRes.status).toEqual('success');
517517

518518
const transactionRes = await transport.sendEvent(transactionPayload);
519-
expect(transactionRes.status).toEqual(Status.Success);
519+
expect(transactionRes.status).toEqual('success');
520520

521521
mock.mockRestore();
522522
});
@@ -569,10 +569,10 @@ describe('HTTPTransport', () => {
569569
mockReturnCode = 200;
570570

571571
const transactionRes = await transport.sendEvent(transactionPayload);
572-
expect(transactionRes.status).toEqual(Status.Success);
572+
expect(transactionRes.status).toEqual('success');
573573

574574
const eventRes = await transport.sendEvent(eventPayload);
575-
expect(eventRes.status).toEqual(Status.Success);
575+
expect(eventRes.status).toEqual('success');
576576

577577
mock.mockRestore();
578578
});
@@ -599,7 +599,7 @@ describe('HTTPTransport', () => {
599599
.mockReturnValueOnce(now + retryAfterSeconds * 1000);
600600

601601
let eventRes = await transport.sendEvent(eventPayload);
602-
expect(eventRes.status).toEqual(Status.Success);
602+
expect(eventRes.status).toEqual('success');
603603

604604
try {
605605
await transport.sendEvent(eventPayload);
@@ -618,7 +618,7 @@ describe('HTTPTransport', () => {
618618
mockHeaders = {};
619619

620620
eventRes = await transport.sendEvent(eventPayload);
621-
expect(eventRes.status).toEqual(Status.Success);
621+
expect(eventRes.status).toEqual('success');
622622

623623
mock.mockRestore();
624624
});

0 commit comments

Comments
 (0)