Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@solidjs/router": "^0.13.4",
"@solidjs/start": "^1.0.2",
"@solidjs/testing-library": "^0.8.7",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/jest-dom": "^6.6.2",
"@testing-library/user-event": "^14.5.2",
"@vitest/ui": "^1.5.0",
"jsdom": "^24.0.0",
Expand Down
17 changes: 12 additions & 5 deletions jest/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,18 @@ module.exports = {
rootDir: process.cwd(),
collectCoverage: true,
transform: {
'^.+\\.ts$': 'ts-jest',
'^.+\\.tsx$': 'ts-jest',
'^.+\\.ts$': [
'ts-jest',
{
tsconfig: '<rootDir>/tsconfig.test.json',
},
],
'^.+\\.tsx$': [
'ts-jest',
{
tsconfig: '<rootDir>/tsconfig.test.json',
},
],
},
coverageDirectory: '<rootDir>/coverage',
moduleFileExtensions: ['js', 'ts', 'tsx'],
Expand All @@ -13,9 +23,6 @@ module.exports = {
'^axios$': require.resolve('axios'),
},
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.test.json',
},
__DEBUG_BUILD__: true,
},
testPathIgnorePatterns: ['<rootDir>/build/', '<rootDir>/node_modules/'],
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,16 @@
"@size-limit/file": "~11.1.0",
"@size-limit/webpack": "~11.1.0",
"@strictsoftware/typedoc-plugin-monorepo": "^0.3.1",
"@types/jest": "^27.4.1",
"@types/jsdom": "^21.1.6",
"@types/jest": "^29.5.14",
"@types/jsdom": "^21.1.7",
"@types/node": "^14.18.0",
"@vitest/coverage-v8": "^1.6.0",
"deepmerge": "^4.2.2",
"downlevel-dts": "~0.11.0",
"eslint": "7.32.0",
"jest": "^27.5.1",
"jest-environment-node": "^27.5.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-environment-node": "^29.7.0",
"jsdom": "^21.1.2",
"lerna": "7.1.1",
"madge": "7.0.0",
Expand All @@ -129,8 +130,8 @@
"rollup-plugin-license": "^3.3.1",
"size-limit": "~11.1.0",
"sucrase": "^3.35.0",
"ts-jest": "^27.1.4",
"ts-node": "10.9.1",
"ts-jest": "^29.2.5",
"ts-node": "10.9.2",
"typedoc": "^0.18.0",
"typescript": "4.9.5",
"vitest": "^1.6.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/test/errorhandler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ describe('SentryErrorHandler', () => {
// this simulates the afterSend hook being called
client.cb({ event_id: 'foobar' });

expect(showReportDialogSpy).toBeCalledTimes(1);
expect(showReportDialogSpy).toHaveBeenCalledTimes(1);
});

it('by just calling `showReportDialog` if hooks are not available', () => {
Expand All @@ -543,7 +543,7 @@ describe('SentryErrorHandler', () => {
const errorHandler = createErrorHandler({ showDialog: true });
errorHandler.handleError(new Error('test'));

expect(showReportDialogSpy).toBeCalledTimes(1);
expect(showReportDialogSpy).toHaveBeenCalledTimes(1);
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ describe('sentryMiddleware', () => {
});

// @ts-expect-error, a partial ctx object is fine here
await expect(async () => middleware(ctx, next)).rejects.toThrowError();
await expect(async () => middleware(ctx, next)).rejects.toThrow();

expect(captureExceptionSpy).toHaveBeenCalledWith(error, {
mechanism: { handled: false, type: 'astro', data: { function: 'astroMiddleware' } },
Expand Down
92 changes: 46 additions & 46 deletions packages/aws-serverless/test/sdk.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,18 @@ const fakeCallback: Callback = (err, result) => {
};

function expectScopeSettings() {
expect(mockScope.addEventProcessor).toBeCalledTimes(1);
expect(mockScope.addEventProcessor).toHaveBeenCalledTimes(1);
// Test than an event processor to add `transaction` is registered for the scope
const eventProcessor = mockScope.addEventProcessor.mock.calls[0][0];
const event: Event = {};
eventProcessor(event);
expect(event).toEqual({ transaction: 'functionName' });

expect(mockScope.setTag).toBeCalledWith('server_name', expect.anything());
expect(mockScope.setTag).toHaveBeenCalledWith('server_name', expect.anything());

expect(mockScope.setTag).toBeCalledWith('url', 'awslambda:///functionName');
expect(mockScope.setTag).toHaveBeenCalledWith('url', 'awslambda:///functionName');

expect(mockScope.setContext).toBeCalledWith(
expect(mockScope.setContext).toHaveBeenCalledWith(
'aws.lambda',
expect.objectContaining({
aws_request_id: 'awsRequestId',
Expand All @@ -103,7 +103,7 @@ function expectScopeSettings() {
}),
);

expect(mockScope.setContext).toBeCalledWith(
expect(mockScope.setContext).toHaveBeenCalledWith(
'aws.cloudwatch.logs',
expect.objectContaining({
log_group: 'logGroupName',
Expand All @@ -129,7 +129,7 @@ describe('AWSLambda', () => {
const wrappedHandler = wrapHandler(handler, { flushTimeout: 1337 });

await wrappedHandler(fakeEvent, fakeContext, fakeCallback);
expect(mockFlush).toBeCalledWith(1337);
expect(mockFlush).toHaveBeenCalledWith(1337);
});

test('captureTimeoutWarning enabled (default)', async () => {
Expand All @@ -141,9 +141,9 @@ describe('AWSLambda', () => {
const wrappedHandler = wrapHandler(handler);
await wrappedHandler(fakeEvent, fakeContext, fakeCallback);

expect(mockWithScope).toBeCalledTimes(1);
expect(mockCaptureMessage).toBeCalled();
expect(mockScope.setTag).toBeCalledWith('timeout', '1s');
expect(mockWithScope).toHaveBeenCalledTimes(1);
expect(mockCaptureMessage).toHaveBeenCalled();
expect(mockScope.setTag).toHaveBeenCalledWith('timeout', '1s');
});

test('captureTimeoutWarning disabled', async () => {
Expand All @@ -157,9 +157,9 @@ describe('AWSLambda', () => {
});
await wrappedHandler(fakeEvent, fakeContext, fakeCallback);

expect(mockWithScope).toBeCalledTimes(0);
expect(mockCaptureMessage).not.toBeCalled();
expect(mockScope.setTag).not.toBeCalledWith('timeout', '1s');
expect(mockWithScope).toHaveBeenCalledTimes(0);
expect(mockCaptureMessage).not.toHaveBeenCalled();
expect(mockScope.setTag).not.toHaveBeenCalledWith('timeout', '1s');
});

test('captureTimeoutWarning with configured timeoutWarningLimit', async () => {
Expand Down Expand Up @@ -188,15 +188,15 @@ describe('AWSLambda', () => {
fakeCallback,
);

expect(mockCaptureMessage).toBeCalled();
expect(mockScope.setTag).toBeCalledWith('timeout', '1m40s');
expect(mockCaptureMessage).toHaveBeenCalled();
expect(mockScope.setTag).toHaveBeenCalledWith('timeout', '1m40s');
});

test('captureAllSettledReasons disabled (default)', async () => {
const handler = () => Promise.resolve([{ status: 'rejected', reason: new Error() }]);
const wrappedHandler = wrapHandler(handler, { flushTimeout: 1337 });
await wrappedHandler(fakeEvent, fakeContext, fakeCallback);
expect(mockCaptureException).toBeCalledTimes(0);
expect(mockCaptureException).toHaveBeenCalledTimes(0);
});

test('captureAllSettledReasons enable', async () => {
Expand All @@ -212,7 +212,7 @@ describe('AWSLambda', () => {
await wrappedHandler(fakeEvent, fakeContext, fakeCallback);
expect(mockCaptureException).toHaveBeenNthCalledWith(1, error, expect.any(Function));
expect(mockCaptureException).toHaveBeenNthCalledWith(2, error2, expect.any(Function));
expect(mockCaptureException).toBeCalledTimes(2);
expect(mockCaptureException).toHaveBeenCalledTimes(2);
});

// "wrapHandler() ... successful execution" tests the default of startTrace enabled
Expand All @@ -223,10 +223,10 @@ describe('AWSLambda', () => {
const wrappedHandler = wrapHandler(handler, { startTrace: false });
await wrappedHandler(fakeEvent, fakeContext, fakeCallback);

expect(mockScope.addEventProcessor).toBeCalledTimes(0);
expect(mockScope.addEventProcessor).toHaveBeenCalledTimes(0);

expect(mockScope.setTag).toBeCalledTimes(0);
expect(mockStartSpanManual).toBeCalledTimes(0);
expect(mockScope.setTag).toHaveBeenCalledTimes(0);
expect(mockStartSpanManual).toHaveBeenCalledTimes(0);
});
});

Expand All @@ -250,11 +250,11 @@ describe('AWSLambda', () => {
};

expect(rv).toStrictEqual(42);
expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
expect(mockStartSpanManual).toHaveBeenCalledWith(fakeTransactionContext, expect.any(Function));
expectScopeSettings();

expect(mockSpanEnd).toBeCalled();
expect(mockFlush).toBeCalledWith(2000);
expect(mockSpanEnd).toHaveBeenCalled();
expect(mockFlush).toHaveBeenCalledWith(2000);
});

test('unsuccessful execution', async () => {
Expand All @@ -278,12 +278,12 @@ describe('AWSLambda', () => {
},
};

expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
expect(mockStartSpanManual).toHaveBeenCalledWith(fakeTransactionContext, expect.any(Function));
expectScopeSettings();
expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
expect(mockCaptureException).toHaveBeenCalledWith(error, expect.any(Function));

expect(mockSpanEnd).toBeCalled();
expect(mockFlush).toBeCalledWith(2000);
expect(mockSpanEnd).toHaveBeenCalled();
expect(mockFlush).toHaveBeenCalledWith(2000);
}
});

Expand Down Expand Up @@ -320,12 +320,12 @@ describe('AWSLambda', () => {
},
};

expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
expect(mockStartSpanManual).toHaveBeenCalledWith(fakeTransactionContext, expect.any(Function));
expectScopeSettings();
expect(mockCaptureException).toBeCalledWith(e, expect.any(Function));
expect(mockCaptureException).toHaveBeenCalledWith(e, expect.any(Function));

expect(mockSpanEnd).toBeCalled();
expect(mockFlush).toBeCalled();
expect(mockSpanEnd).toHaveBeenCalled();
expect(mockFlush).toHaveBeenCalled();
}
});
});
Expand All @@ -350,11 +350,11 @@ describe('AWSLambda', () => {
};

expect(rv).toStrictEqual(42);
expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
expect(mockStartSpanManual).toHaveBeenCalledWith(fakeTransactionContext, expect.any(Function));
expectScopeSettings();

expect(mockSpanEnd).toBeCalled();
expect(mockFlush).toBeCalled();
expect(mockSpanEnd).toHaveBeenCalled();
expect(mockFlush).toHaveBeenCalled();
});

test('event and context are correctly passed to the original handler', async () => {
Expand Down Expand Up @@ -389,12 +389,12 @@ describe('AWSLambda', () => {
},
};

expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
expect(mockStartSpanManual).toHaveBeenCalledWith(fakeTransactionContext, expect.any(Function));
expectScopeSettings();
expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
expect(mockCaptureException).toHaveBeenCalledWith(error, expect.any(Function));

expect(mockSpanEnd).toBeCalled();
expect(mockFlush).toBeCalled();
expect(mockSpanEnd).toHaveBeenCalled();
expect(mockFlush).toHaveBeenCalled();
}
});

Expand Down Expand Up @@ -432,11 +432,11 @@ describe('AWSLambda', () => {
};

expect(rv).toStrictEqual(42);
expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
expect(mockStartSpanManual).toHaveBeenCalledWith(fakeTransactionContext, expect.any(Function));
expectScopeSettings();

expect(mockSpanEnd).toBeCalled();
expect(mockFlush).toBeCalled();
expect(mockSpanEnd).toHaveBeenCalled();
expect(mockFlush).toHaveBeenCalled();
});

test('event and context are correctly passed to the original handler', async () => {
Expand Down Expand Up @@ -471,12 +471,12 @@ describe('AWSLambda', () => {
},
};

expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
expect(mockStartSpanManual).toHaveBeenCalledWith(fakeTransactionContext, expect.any(Function));
expectScopeSettings();
expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
expect(mockCaptureException).toHaveBeenCalledWith(error, expect.any(Function));

expect(mockSpanEnd).toBeCalled();
expect(mockFlush).toBeCalled();
expect(mockSpanEnd).toHaveBeenCalled();
expect(mockFlush).toHaveBeenCalled();
}
});
});
Expand All @@ -493,7 +493,7 @@ describe('AWSLambda', () => {
try {
await wrappedHandler(fakeEvent, fakeContext, fakeCallback);
} catch (e) {
expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
expect(mockCaptureException).toHaveBeenCalledWith(error, expect.any(Function));

const scopeFunction = mockCaptureException.mock.calls[0][1];
const event: Event = { exception: { values: [{}] } };
Expand All @@ -513,7 +513,7 @@ describe('AWSLambda', () => {
test('calls Sentry.init with correct sdk info metadata', () => {
init({});

expect(mockInit).toBeCalledWith(
expect(mockInit).toHaveBeenCalledWith(
expect.objectContaining({
_metadata: {
sdk: {
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ describe('SentryBrowser initialization', () => {
const sdkData = getClient()?.getOptions()._metadata?.sdk || {};

expect(sdkData.packages?.[0]?.name).toBe('cdn:@sentry/browser');
expect(utils.getSDKSource).toBeCalledTimes(1);
expect(utils.getSDKSource).toHaveBeenCalledTimes(1);
spy.mockRestore();
});

Expand Down
8 changes: 4 additions & 4 deletions packages/browser/test/sdk.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ describe('init', () => {

init(options);

expect(consoleErrorSpy).toBeCalledTimes(1);
expect(consoleErrorSpy).toHaveBeenCalledTimes(1);
expect(consoleErrorSpy).toHaveBeenCalledWith(
'[Sentry] You cannot run Sentry this way in a browser extension, check: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
);
Expand All @@ -191,7 +191,7 @@ describe('init', () => {

init(options);

expect(consoleErrorSpy).toBeCalledTimes(1);
expect(consoleErrorSpy).toHaveBeenCalledTimes(1);
expect(consoleErrorSpy).toHaveBeenCalledWith(
'[Sentry] You cannot run Sentry this way in a browser extension, check: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
);
Expand All @@ -215,7 +215,7 @@ describe('init', () => {

init(options);

expect(consoleErrorSpy).toBeCalledTimes(0);
expect(consoleErrorSpy).toHaveBeenCalledTimes(0);

consoleErrorSpy.mockRestore();
WINDOW.location = originalLocation;
Expand All @@ -227,7 +227,7 @@ describe('init', () => {

init(options);

expect(consoleErrorSpy).toBeCalledTimes(0);
expect(consoleErrorSpy).toHaveBeenCalledTimes(0);

consoleErrorSpy.mockRestore();
});
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/test/integrations/fetch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ describe('WinterCGFetch instrumentation', () => {
};
fetchInstrumentationHandlerCallback(startHandlerData);

expect(addBreadcrumbSpy).toBeCalledWith(
expect(addBreadcrumbSpy).toHaveBeenCalledWith(
{
category: 'fetch',
data: {
Expand Down
Loading
Loading