diff --git a/packages/node-integration-tests/.eslintrc.js b/packages/node-integration-tests/.eslintrc.js index fdcde4fa0f14..5a3ecdd7617a 100644 --- a/packages/node-integration-tests/.eslintrc.js +++ b/packages/node-integration-tests/.eslintrc.js @@ -4,7 +4,20 @@ module.exports = { jest: true, }, extends: ['../../.eslintrc.js'], - parserOptions: { - sourceType: 'module', - }, + overrides: [ + { + files: ['utils/**/*.ts'], + parserOptions: { + project: ['tsconfig.json'], + sourceType: 'module', + }, + }, + { + files: ['suites/**/*.ts'], + parserOptions: { + project: ['tsconfig.test.json'], + sourceType: 'module', + }, + }, + ], }; diff --git a/packages/node-integration-tests/jest.config.js b/packages/node-integration-tests/jest.config.js index fd4e06a64fb3..9a2862dd9b8d 100644 --- a/packages/node-integration-tests/jest.config.js +++ b/packages/node-integration-tests/jest.config.js @@ -1,7 +1,7 @@ const baseConfig = require('../../jest/jest.config.js'); module.exports = { - globalSetup: '/setup-tests.ts', + globalSetup: '/utils/setup-tests.ts', ...baseConfig, testMatch: ['**/test.ts'], }; diff --git a/packages/node-integration-tests/suites/express/sentry-trace/server.ts b/packages/node-integration-tests/suites/express/sentry-trace/server.ts index 172c2edd3900..e93b50f18cd6 100644 --- a/packages/node-integration-tests/suites/express/sentry-trace/server.ts +++ b/packages/node-integration-tests/suites/express/sentry-trace/server.ts @@ -6,6 +6,8 @@ import http from 'http'; const app = express(); +export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string } }; + Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', diff --git a/packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/test.ts b/packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/test.ts index 5ee98789c299..47382b3fdb4b 100644 --- a/packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/test.ts +++ b/packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/test.ts @@ -1,14 +1,15 @@ import { TRACEPARENT_REGEXP } from '@sentry/utils'; +import * as path from 'path'; import { getAPIResponse, runServer } from '../../../../utils/index'; -import path = require('path'); +import { TestAPIResponse } from '../server'; test('Should assign `sentry-trace` header which sets parent trace id of an outgoing request.', async () => { const url = await runServer(__dirname, `${path.resolve(__dirname, '..')}/server.ts`); - const response = await getAPIResponse(new URL(`${url}/express`), { + const response = (await getAPIResponse(new URL(`${url}/express`), { 'sentry-trace': '12312012123120121231201212312012-1121201211212012-0', - }); + })) as TestAPIResponse; expect(response).toBeDefined(); expect(response).toMatchObject({ diff --git a/packages/node-integration-tests/suites/express/sentry-trace/trace-header-out/test.ts b/packages/node-integration-tests/suites/express/sentry-trace/trace-header-out/test.ts index ca7eb56fd61c..788a3f7086ab 100644 --- a/packages/node-integration-tests/suites/express/sentry-trace/trace-header-out/test.ts +++ b/packages/node-integration-tests/suites/express/sentry-trace/trace-header-out/test.ts @@ -1,12 +1,13 @@ import { TRACEPARENT_REGEXP } from '@sentry/utils'; +import * as path from 'path'; import { getAPIResponse, runServer } from '../../../../utils/index'; -import path = require('path'); +import { TestAPIResponse } from '../server'; test('should attach a `sentry-trace` header to an outgoing request.', async () => { const url = await runServer(__dirname, `${path.resolve(__dirname, '..')}/server.ts`); - const response = await getAPIResponse(new URL(`${url}/express`)); + const response = (await getAPIResponse(new URL(`${url}/express`))) as TestAPIResponse; expect(response).toBeDefined(); expect(response).toMatchObject({ diff --git a/packages/node-integration-tests/tsconfig.json b/packages/node-integration-tests/tsconfig.json index c98602a3af23..782d8f9c517f 100644 --- a/packages/node-integration-tests/tsconfig.json +++ b/packages/node-integration-tests/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["**/*.ts"], + "include": ["utils/**/*.ts"], "compilerOptions": { // package-specific options diff --git a/packages/node-integration-tests/tsconfig.test.json b/packages/node-integration-tests/tsconfig.test.json index b43ec254274b..5a37b90c4fe2 100644 --- a/packages/node-integration-tests/tsconfig.test.json +++ b/packages/node-integration-tests/tsconfig.test.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", - "include": ["**/*.ts"], + "include": ["suites/**/*.ts"], "compilerOptions": { // should include all types from `./tsconfig.json` plus types for all test frameworks used diff --git a/packages/node-integration-tests/utils/index.ts b/packages/node-integration-tests/utils/index.ts index fba8bb7d52de..872c9d72521d 100644 --- a/packages/node-integration-tests/utils/index.ts +++ b/packages/node-integration-tests/utils/index.ts @@ -103,8 +103,8 @@ export const getMultipleEnvelopeRequest = async (url: string, count: number): Pr * @param {Record} [headers] * @return {*} {Promise} */ -export const getAPIResponse = async (url: URL, headers?: Record): Promise => { - return await new Promise(resolve => { +export const getAPIResponse = async (url: URL, headers?: Record): Promise => { + return new Promise(resolve => { http.get( headers ? ({ diff --git a/packages/node-integration-tests/setup-tests.ts b/packages/node-integration-tests/utils/setup-tests.ts similarity index 100% rename from packages/node-integration-tests/setup-tests.ts rename to packages/node-integration-tests/utils/setup-tests.ts