Skip to content

Commit 0e142ab

Browse files
author
Luca Forstner
committed
Extract getDefaultNodeClientOptions into helper module
1 parent 957452f commit 0e142ab

File tree

7 files changed

+21
-65
lines changed

7 files changed

+21
-65
lines changed

packages/node/test/client.test.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
import { Scope, SessionFlusher } from '@sentry/hub';
2-
import { NoopTransport } from '@sentry/core';
32

43
import { NodeClient } from '../src';
54
import { setupNodeTransport } from '../src/transports';
6-
import { NodeClientOptions } from '../src/types';
5+
import { getDefaultNodeClientOptions } from './helper/node-client-options';
76

87
const PUBLIC_DSN = 'https://username@domain/123';
98

10-
function getDefaultNodeClientOptions(options: Partial<NodeClientOptions> = {}): NodeClientOptions {
11-
return {
12-
integrations: [],
13-
transport: NoopTransport,
14-
stackParser: () => [],
15-
...options,
16-
};
17-
}
18-
199
describe('NodeClient', () => {
2010
let client: NodeClient;
2111

packages/node/test/handlers.test.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as sentryCore from '@sentry/core';
2-
import { Hub } from '@sentry/hub';
32
import * as sentryHub from '@sentry/hub';
3+
import { Hub } from '@sentry/hub';
44
import { Transaction } from '@sentry/tracing';
55
import { Runtime } from '@sentry/types';
66
import { SentryError } from '@sentry/utils';
@@ -19,16 +19,7 @@ import {
1919
} from '../src/handlers';
2020
import * as SDK from '../src/sdk';
2121
import { setupNodeTransport } from '../src/transports';
22-
import { NodeClientOptions } from '../src/types';
23-
24-
function getDefaultNodeClientOptions(options: Partial<NodeClientOptions> = {}): NodeClientOptions {
25-
return {
26-
integrations: [],
27-
transport: sentryCore.NoopTransport,
28-
stackParser: () => [],
29-
...options,
30-
};
31-
}
22+
import { getDefaultNodeClientOptions } from './helper/node-client-options';
3223

3324
describe('parseRequest', () => {
3425
let mockReq: { [key: string]: any };
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { NoopTransport } from '@sentry/core';
2+
3+
import { NodeClientOptions } from '../../src/types';
4+
5+
export function getDefaultNodeClientOptions(options: Partial<NodeClientOptions> = {}): NodeClientOptions {
6+
return {
7+
integrations: [],
8+
transport: NoopTransport,
9+
stackParser: () => [],
10+
...options,
11+
};
12+
}

packages/node/test/index.test.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { initAndBind, SDK_VERSION, NoopTransport } from '@sentry/core';
1+
import { initAndBind, SDK_VERSION } from '@sentry/core';
22
import { getMainCarrier } from '@sentry/hub';
33
import { Integration } from '@sentry/types';
44
import { createStackParser } from '@sentry/utils';
@@ -19,7 +19,7 @@ import {
1919
import { ContextLines, LinkedErrors } from '../src/integrations';
2020
import { nodeStackParser } from '../src/stack-parser';
2121
import { setupNodeTransport } from '../src/transports';
22-
import { NodeClientOptions } from '../src/types';
22+
import { getDefaultNodeClientOptions } from './helper/node-client-options';
2323

2424
const stackParser = createStackParser(nodeStackParser);
2525

@@ -31,15 +31,6 @@ jest.mock('@sentry/core', () => {
3131
};
3232
});
3333

34-
function getDefaultNodeClientOptions(options: Partial<NodeClientOptions> = {}): NodeClientOptions {
35-
return {
36-
integrations: [],
37-
transport: NoopTransport,
38-
stackParser: () => [],
39-
...options,
40-
};
41-
}
42-
4334
const dsn = 'https://[email protected]/4291';
4435

4536
// eslint-disable-next-line no-var

packages/node/test/integrations/http.test.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as sentryCore from '@sentry/core';
2-
import { Hub } from '@sentry/hub';
32
import * as hubModule from '@sentry/hub';
3+
import { Hub } from '@sentry/hub';
44
import { addExtensionMethods, Span, TRACEPARENT_REGEXP, Transaction } from '@sentry/tracing';
55
import { parseSemver } from '@sentry/utils';
66
import * as http from 'http';
@@ -12,19 +12,10 @@ import { Breadcrumb } from '../../src';
1212
import { NodeClient } from '../../src/client';
1313
import { Http as HttpIntegration } from '../../src/integrations/http';
1414
import { setupNodeTransport } from '../../src/transports';
15-
import { NodeClientOptions } from '../../src/types';
15+
import { getDefaultNodeClientOptions } from '../helper/node-client-options';
1616

1717
const NODE_VERSION = parseSemver(process.versions.node);
1818

19-
function getDefaultNodeClientOptions(options: Partial<NodeClientOptions> = {}): NodeClientOptions {
20-
return {
21-
integrations: [],
22-
transport: sentryCore.NoopTransport,
23-
stackParser: () => [],
24-
...options,
25-
};
26-
}
27-
2819
describe('tracing', () => {
2920
function createTransactionOnScope() {
3021
const options = getDefaultNodeClientOptions({

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
11
import { ExtendedError } from '@sentry/types';
22
import { createStackParser } from '@sentry/utils';
3-
import { NoopTransport } from '@sentry/core';
43

54
import { Event, NodeClient } from '../../src';
65
import { LinkedErrors } from '../../src/integrations/linkederrors';
76
import { nodeStackParser } from '../../src/stack-parser';
87
import { setupNodeTransport } from '../../src/transports';
9-
import { NodeClientOptions } from '../../src/types';
8+
import { getDefaultNodeClientOptions } from '../helper/node-client-options';
109

1110
const stackParser = createStackParser(nodeStackParser);
1211

1312
let linkedErrors: any;
1413

15-
function getDefaultNodeClientOptions(options: Partial<NodeClientOptions> = {}): NodeClientOptions {
16-
return {
17-
integrations: [],
18-
transport: NoopTransport,
19-
stackParser: () => [],
20-
...options,
21-
};
22-
}
23-
2414
describe('LinkedErrors', () => {
2515
beforeEach(() => {
2616
linkedErrors = new LinkedErrors();

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FakeTransport } from '@sentry/core/test/mocks/transport';
33
import { HTTPSTransport, HTTPTransport, setupNodeTransport } from '@sentry/node/src/transports';
44

55
import { makeNodeTransport } from '../../src/transports/new';
6-
import { NodeClientOptions } from '../../src/types';
6+
import { getDefaultNodeClientOptions } from '../helper/node-client-options';
77

88
jest.mock('../../src/transports/new', () => {
99
const original = jest.requireActual('../../src/transports/new');
@@ -16,15 +16,6 @@ jest.mock('../../src/transports/new', () => {
1616
};
1717
});
1818

19-
function getDefaultNodeClientOptions(options: Partial<NodeClientOptions> = {}): NodeClientOptions {
20-
return {
21-
integrations: [],
22-
transport: NoopTransport,
23-
stackParser: () => [],
24-
...options,
25-
};
26-
}
27-
2819
const DSN = 'https://username@domain/123';
2920

3021
describe('setupNodeTransport', () => {

0 commit comments

Comments
 (0)