Skip to content

Commit fe7f49f

Browse files
timfishtimfish
committed
Fix node v8/v10
1 parent 735812e commit fe7f49f

File tree

12 files changed

+43
-24
lines changed

12 files changed

+43
-24
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { EventEnvelope, EventItem } from '@sentry/types';
22
import { createEnvelope, serializeEnvelope } from '@sentry/utils';
3+
import { TextEncoder } from 'util';
34

45
import { FetchTransportOptions, makeFetchTransport } from '../../../src/transports/fetch';
56
import { FetchImpl } from '../../../src/transports/utils';
@@ -39,7 +40,7 @@ describe('NewFetchTransport', () => {
3940
expect(mockFetch).toHaveBeenCalledTimes(1);
4041

4142
expect(mockFetch).toHaveBeenLastCalledWith(DEFAULT_FETCH_TRANSPORT_OPTIONS.url, {
42-
body: serializeEnvelope(ERROR_ENVELOPE),
43+
body: serializeEnvelope(ERROR_ENVELOPE, new TextEncoder()),
4344
method: 'POST',
4445
referrerPolicy: 'origin',
4546
});
@@ -89,7 +90,7 @@ describe('NewFetchTransport', () => {
8990

9091
await transport.send(ERROR_ENVELOPE);
9192
expect(mockFetch).toHaveBeenLastCalledWith(DEFAULT_FETCH_TRANSPORT_OPTIONS.url, {
92-
body: serializeEnvelope(ERROR_ENVELOPE),
93+
body: serializeEnvelope(ERROR_ENVELOPE, new TextEncoder()),
9394
method: 'POST',
9495
...REQUEST_OPTIONS,
9596
});

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { EventEnvelope, EventItem } from '@sentry/types';
22
import { createEnvelope, serializeEnvelope } from '@sentry/utils';
3+
import { TextEncoder } from 'util';
34

45
import { makeXHRTransport, XHRTransportOptions } from '../../../src/transports/xhr';
56

@@ -63,7 +64,7 @@ describe('NewXHRTransport', () => {
6364
expect(xhrMock.open).toHaveBeenCalledTimes(1);
6465
expect(xhrMock.open).toHaveBeenCalledWith('POST', DEFAULT_XHR_TRANSPORT_OPTIONS.url);
6566
expect(xhrMock.send).toHaveBeenCalledTimes(1);
66-
expect(xhrMock.send).toHaveBeenCalledWith(serializeEnvelope(ERROR_ENVELOPE));
67+
expect(xhrMock.send).toHaveBeenCalledWith(serializeEnvelope(ERROR_ENVELOPE, new TextEncoder()));
6768
});
6869

6970
it('sets rate limit response headers', async () => {

‎packages/core/test/lib/transports/base.test.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { EventEnvelope, EventItem, TransportMakeRequestResponse } from '@sentry/types';
22
import { createEnvelope, PromiseBuffer, resolvedSyncPromise, serializeEnvelope } from '@sentry/utils';
3+
import { TextEncoder } from 'util';
34

45
import { createTransport } from '../../../src/transports/base';
56

@@ -14,6 +15,7 @@ const TRANSACTION_ENVELOPE = createEnvelope<EventEnvelope>(
1415

1516
const transportOptions = {
1617
recordDroppedEvent: () => undefined, // noop
18+
textEncoder: new TextEncoder(),
1719
};
1820

1921
describe('createTransport', () => {
@@ -36,7 +38,7 @@ describe('createTransport', () => {
3638
it('constructs a request to send to Sentry', async () => {
3739
expect.assertions(1);
3840
const transport = createTransport(transportOptions, req => {
39-
expect(req.body).toEqual(serializeEnvelope(ERROR_ENVELOPE));
41+
expect(req.body).toEqual(serializeEnvelope(ERROR_ENVELOPE, new TextEncoder()));
4042
return resolvedSyncPromise({});
4143
});
4244
await transport.send(ERROR_ENVELOPE);
@@ -46,7 +48,7 @@ describe('createTransport', () => {
4648
expect.assertions(2);
4749

4850
const transport = createTransport(transportOptions, req => {
49-
expect(req.body).toEqual(serializeEnvelope(ERROR_ENVELOPE));
51+
expect(req.body).toEqual(serializeEnvelope(ERROR_ENVELOPE, new TextEncoder()));
5052
throw new Error();
5153
});
5254

@@ -82,7 +84,10 @@ describe('createTransport', () => {
8284

8385
const mockRecordDroppedEventCallback = jest.fn();
8486

85-
const transport = createTransport({ recordDroppedEvent: mockRecordDroppedEventCallback }, mockRequestExecutor);
87+
const transport = createTransport(
88+
{ recordDroppedEvent: mockRecordDroppedEventCallback, textEncoder: new TextEncoder() },
89+
mockRequestExecutor,
90+
);
8691

8792
return [transport, setTransportResponse, mockRequestExecutor, mockRecordDroppedEventCallback] as const;
8893
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Session } from '@sentry/hub';
22
import { ClientOptions, Event, Integration, Outcome, Severity, SeverityLevel } from '@sentry/types';
33
import { resolvedSyncPromise } from '@sentry/utils';
4+
import { TextEncoder } from 'util';
45

56
import { BaseClient } from '../../src/baseclient';
67
import { initAndBind } from '../../src/sdk';
@@ -10,9 +11,13 @@ export function getDefaultTestClientOptions(options: Partial<TestClientOptions>
1011
return {
1112
integrations: [],
1213
sendClientReports: true,
14+
transportOptions: { textEncoder: new TextEncoder() },
1315
transport: () =>
1416
createTransport(
15-
{ recordDroppedEvent: () => undefined }, // noop
17+
{
18+
recordDroppedEvent: () => undefined,
19+
textEncoder: new TextEncoder(),
20+
}, // noop
1621
_ => resolvedSyncPromise({}),
1722
),
1823
stackParser: () => [],

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { SyncPromise } from '@sentry/utils';
2+
import { TextEncoder } from 'util';
23

34
import { createTransport } from '../../src/transports/base';
45

@@ -10,7 +11,7 @@ export function makeFakeTransport(delay: number = 2000) {
1011
let sendCalled = 0;
1112
let sentCount = 0;
1213
const makeTransport = () =>
13-
createTransport({ recordDroppedEvent: () => undefined }, () => {
14+
createTransport({ recordDroppedEvent: () => undefined, textEncoder: new TextEncoder() }, () => {
1415
sendCalled += 1;
1516
return new SyncPromise(async res => {
1617
await sleep(delay);

‎packages/node/test/manual/express-scope-separation/start.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const http = require('http');
22
const express = require('express');
33
const app = express();
44
const Sentry = require('../../../build/cjs');
5+
const { TextEncoder } = require('util');
56

67
// don't log the test errors we're going to throw, so at a quick glance it doesn't look like the test itself has failed
78
global.console.error = () => null;
@@ -16,7 +17,7 @@ function assertTags(actual, expected) {
1617
let remaining = 3;
1718

1819
function makeDummyTransport() {
19-
return Sentry.createTransport({ recordDroppedEvent: () => undefined }, req => {
20+
return Sentry.createTransport({ recordDroppedEvent: () => undefined, textEncoder: new TextEncoder() }, req => {
2021
--remaining;
2122

2223
if (!remaining) {

‎packages/node/test/manual/webpack-domain/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Sentry = require('../../../build/cjs');
2-
2+
const { TextEncoder } = require('util');
33
let remaining = 2;
44

55
function makeDummyTransport() {
6-
return Sentry.createTransport({ recordDroppedEvent: () => undefined }, req => {
6+
return Sentry.createTransport({ recordDroppedEvent: () => undefined, textEncoder: new TextEncoder() }, req => {
77
--remaining;
88

99
if (!remaining) {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ const SERIALIZED_EVENT_ENVELOPE = serializeEnvelope(EVENT_ENVELOPE, new TextEnco
7272
const defaultOptions = {
7373
url: TEST_SERVER_URL,
7474
recordDroppedEvent: () => undefined,
75+
textEncoder: new TextEncoder(),
7576
};
7677

7778
describe('makeNewHttpTransport()', () => {
@@ -248,7 +249,7 @@ describe('makeNewHttpTransport()', () => {
248249
const registeredRequestExecutor = (createTransport as jest.Mock).mock.calls[0][1];
249250

250251
const executorResult = registeredRequestExecutor({
251-
body: serializeEnvelope(EVENT_ENVELOPE),
252+
body: serializeEnvelope(EVENT_ENVELOPE, new TextEncoder()),
252253
category: 'error',
253254
});
254255

@@ -271,7 +272,7 @@ describe('makeNewHttpTransport()', () => {
271272
const registeredRequestExecutor = (createTransport as jest.Mock).mock.calls[0][1];
272273

273274
const executorResult = registeredRequestExecutor({
274-
body: serializeEnvelope(EVENT_ENVELOPE),
275+
body: serializeEnvelope(EVENT_ENVELOPE, new TextEncoder()),
275276
category: 'error',
276277
});
277278

@@ -298,7 +299,7 @@ describe('makeNewHttpTransport()', () => {
298299
const registeredRequestExecutor = (createTransport as jest.Mock).mock.calls[0][1];
299300

300301
const executorResult = registeredRequestExecutor({
301-
body: serializeEnvelope(EVENT_ENVELOPE),
302+
body: serializeEnvelope(EVENT_ENVELOPE, new TextEncoder()),
302303
category: 'error',
303304
});
304305

@@ -325,7 +326,7 @@ describe('makeNewHttpTransport()', () => {
325326
const registeredRequestExecutor = (createTransport as jest.Mock).mock.calls[0][1];
326327

327328
const executorResult = registeredRequestExecutor({
328-
body: serializeEnvelope(EVENT_ENVELOPE),
329+
body: serializeEnvelope(EVENT_ENVELOPE, new TextEncoder()),
329330
category: 'error',
330331
});
331332

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ const defaultOptions = {
8484
httpModule: unsafeHttpsModule,
8585
url: TEST_SERVER_URL,
8686
recordDroppedEvent: () => undefined, // noop
87+
textEncoder: new TextEncoder(),
8788
};
8889

8990
describe('makeNewHttpsTransport()', () => {
@@ -301,7 +302,7 @@ describe('makeNewHttpsTransport()', () => {
301302
const registeredRequestExecutor = (createTransport as jest.Mock).mock.calls[0][1];
302303

303304
const executorResult = registeredRequestExecutor({
304-
body: serializeEnvelope(EVENT_ENVELOPE),
305+
body: serializeEnvelope(EVENT_ENVELOPE, new TextEncoder()),
305306
category: 'error',
306307
});
307308

@@ -324,7 +325,7 @@ describe('makeNewHttpsTransport()', () => {
324325
const registeredRequestExecutor = (createTransport as jest.Mock).mock.calls[0][1];
325326

326327
const executorResult = registeredRequestExecutor({
327-
body: serializeEnvelope(EVENT_ENVELOPE),
328+
body: serializeEnvelope(EVENT_ENVELOPE, new TextEncoder()),
328329
category: 'error',
329330
});
330331

@@ -351,7 +352,7 @@ describe('makeNewHttpsTransport()', () => {
351352
const registeredRequestExecutor = (createTransport as jest.Mock).mock.calls[0][1];
352353

353354
const executorResult = registeredRequestExecutor({
354-
body: serializeEnvelope(EVENT_ENVELOPE),
355+
body: serializeEnvelope(EVENT_ENVELOPE, new TextEncoder()),
355356
category: 'error',
356357
});
357358

@@ -378,7 +379,7 @@ describe('makeNewHttpsTransport()', () => {
378379
const registeredRequestExecutor = (createTransport as jest.Mock).mock.calls[0][1];
379380

380381
const executorResult = registeredRequestExecutor({
381-
body: serializeEnvelope(EVENT_ENVELOPE),
382+
body: serializeEnvelope(EVENT_ENVELOPE, new TextEncoder()),
382383
category: 'error',
383384
});
384385

‎packages/utils/test/clientreport.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { ClientReport } from '@sentry/types';
2+
import { TextEncoder } from 'util';
23

34
import { createClientReportEnvelope } from '../src/clientreport';
45
import { serializeEnvelope } from '../src/envelope';
@@ -43,7 +44,7 @@ describe('createClientReportEnvelope', () => {
4344
it('serializes an envelope', () => {
4445
const env = createClientReportEnvelope(DEFAULT_DISCARDED_EVENTS, MOCK_DSN, 123456);
4546

46-
const [headers, items] = parseEnvelope(serializeEnvelope(env));
47+
const [headers, items] = parseEnvelope(serializeEnvelope(env, new TextEncoder()));
4748

4849
expect(headers).toEqual({ dsn: 'https://[email protected]/1' });
4950
expect(items).toEqual([

‎packages/utils/test/envelope.test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { EventEnvelope } from '@sentry/types';
2+
import { TextEncoder } from 'util';
23

34
import { addItemToEnvelope, createEnvelope, forEachEnvelopeItem, serializeEnvelope } from '../src/envelope';
45
import { parseEnvelope } from './testutils';
@@ -20,15 +21,15 @@ describe('envelope', () => {
2021
describe('serializeEnvelope()', () => {
2122
it('serializes an envelope', () => {
2223
const env = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, []);
23-
const [headers] = parseEnvelope(serializeEnvelope(env));
24+
const [headers] = parseEnvelope(serializeEnvelope(env, new TextEncoder()));
2425
expect(headers).toEqual({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' });
2526
});
2627
});
2728

2829
describe('addItemToEnvelope()', () => {
2930
it('adds an item to an envelope', () => {
3031
const env = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, []);
31-
let [envHeaders, items] = parseEnvelope(serializeEnvelope(env));
32+
let [envHeaders, items] = parseEnvelope(serializeEnvelope(env, new TextEncoder()));
3233
expect(items).toHaveLength(0);
3334
expect(envHeaders).toEqual({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' });
3435

@@ -37,7 +38,7 @@ describe('envelope', () => {
3738
{ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' },
3839
]);
3940

40-
[envHeaders, items] = parseEnvelope(serializeEnvelope(newEnv));
41+
[envHeaders, items] = parseEnvelope(serializeEnvelope(newEnv, new TextEncoder()));
4142
expect(envHeaders).toEqual({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' });
4243
expect(items).toHaveLength(1);
4344
expect(items[0]).toEqual([{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }]);
@@ -66,7 +67,7 @@ describe('envelope', () => {
6667
iteration = iteration + 1;
6768
});
6869

69-
const [parsedHeaders, parsedItems] = parseEnvelope(serializeEnvelope(env));
70+
const [parsedHeaders, parsedItems] = parseEnvelope(serializeEnvelope(env, new TextEncoder()));
7071
expect(parsedHeaders).toEqual({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' });
7172
expect(parsedItems).toHaveLength(3);
7273
expect(items[0]).toEqual([{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }]);

‎packages/utils/test/testutils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { BaseEnvelopeHeaders, BaseEnvelopeItemHeaders, Envelope } from '@sentry/types';
2+
import { TextDecoder, TextEncoder } from 'util';
23

34
export const testOnlyIfNodeVersionAtLeast = (minVersion: number): jest.It => {
45
const currentNodeVersion = process.env.NODE_VERSION;

0 commit comments

Comments
 (0)