test(browser): Switch from jest to vitest#13092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 1 commit into from
Aug 1, 2024
Merged

test(browser): Switch from jest to vitest #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions packages/browser/jest.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/browser/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,9 +70,8 @@
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:unit:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
17 changes: 11 additions & 6 deletions ...es/browser/test/unit/eventbuilder.test.ts → packages/browser/test/eventbuilder.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { defaultStackParser } from '../../src';
import { eventFromUnknownInput } from '../../src/eventbuilder';
/**
* @vitest-environment jsdom
*/

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
import { afterEach, describe, expect, it, vi } from 'vitest';

import { defaultStackParser } from '../src';
import { eventFromUnknownInput } from '../src/eventbuilder';

vi.mock('@sentry/core', async requireActual => {
return {
...original,
...((await requireActual()) as any),
getClient() {
return {
getOptions(): any {
Expand All@@ -21,7 +26,7 @@ class MyTestClass {
}

afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe('eventFromUnknownInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...est/unit/helper/browser-client-options.ts → ...ser/test/helper/browser-client-options.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { createTransport } from '@sentry/core';
import { resolvedSyncPromise } from '@sentry/utils';

import type { BrowserClientOptions } from '../../../src/client';
import type { BrowserClientOptions } from '../../src/client';

export function getDefaultBrowserClientOptions(options: Partial<BrowserClientOptions> = {}): BrowserClientOptions {
return {
Expand Down
6 changes: 4 additions & 2 deletions ...r/test/unit/index.bundle.feedback.test.ts → ...rowser/test/index.bundle.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { feedbackAsyncIntegration } from '../../src';
import { feedbackAsyncIntegration } from '../src';

import * as FeedbackBundle from '../../src/index.bundle.feedback';
import * as FeedbackBundle from '../src/index.bundle.feedback';

describe('index.bundle.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ser/test/unit/index.bundle.replay.test.ts → .../browser/test/index.bundle.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '../../src';
import { replayIntegration } from '../src';

import * as ReplayBundle from '../../src/index.bundle.replay';
import * as ReplayBundle from '../src/index.bundle.replay';

describe('index.bundle.replay', () => {
it('has correct exports', () => {
Expand Down
4 changes: 3 additions & 1 deletion ...es/browser/test/unit/index.bundle.test.ts → packages/browser/test/index.bundle.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';

import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';

import * as Bundle from '../../src/index.bundle';
import * as Bundle from '../src/index.bundle';

describe('index.bundle', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ex.bundle.tracing.replay.feedback.test.ts → ...ex.bundle.tracing.replay.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src';
import { describe, expect, it } from 'vitest';

import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';

import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';

describe('index.bundle.tracing.replay.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions .../unit/index.bundle.tracing.replay.test.ts → .../test/index.bundle.tracing.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration, replayIntegration } from '../../src';
import { browserTracingIntegration, replayIntegration } from '../src';

import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';

describe('index.bundle.tracing.replay', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...er/test/unit/index.bundle.tracing.test.ts → ...browser/test/index.bundle.tracing.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration } from '../../src';
import { browserTracingIntegration } from '../src';

import * as TracingBundle from '../../src/index.bundle.tracing';
import * as TracingBundle from '../src/index.bundle.tracing';

describe('index.bundle.tracing', () => {
it('has correct exports', () => {
Expand Down
123 changes: 66 additions & 57 deletions packages/browser/test/unit/index.test.ts → packages/browser/test/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
/**
* @vitest-environment jsdom
*/

import type { Mock } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
getGlobalScope,
Expand All@@ -8,7 +15,7 @@ import {
} from '@sentry/core';
import * as utils from '@sentry/utils';

import { setCurrentClient } from '../../src';
import { setCurrentClient } from '../src';
import {
BrowserClient,
Scope,
Expand All@@ -22,7 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
} from '../../src';
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';

Expand All@@ -31,16 +38,15 @@ const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
// eslint-disable-next-line no-var
declare var global: any;

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
vi.mock('@sentry/core', async requireActual => {
return {
...original,
getReportDialogEndpoint: jest.fn(),
...((await requireActual()) as any),
getReportDialogEndpoint: vi.fn(),
};
});

describe('SentryBrowser', () => {
const beforeSend = jest.fn(event => event);
const beforeSend = vi.fn(event => event);

beforeEach(() => {
getGlobalScope().clear();
Expand DownExpand Up@@ -84,7 +90,7 @@ describe('SentryBrowser', () => {

describe('showReportDialog', () => {
beforeEach(() => {
(getReportDialogEndpoint as jest.Mock).mockReset();
(getReportDialogEndpoint as Mock).mockReset();
});

describe('user', () => {
Expand DownExpand Up@@ -145,14 +151,14 @@ describe('SentryBrowser', () => {
});

describe('onClose', () => {
const dummyErrorHandler = jest.fn();
const dummyErrorHandler = vi.fn();
beforeEach(() => {
// this prevents jest-environment-jsdom from failing the test
// this prevents vi-environment-jsdom from failing the test
// when an error in `onClose` is thrown
// it does not prevent errors thrown directly inside the test,
// so we don't have to worry about tests passing that should
// otherwise fail
// see: https://github.com/jestjs/jest/blob/main/packages/jest-environment-jsdom/src/index.ts#L95-L115
// see: https://github.com/vijs/vi/blob/main/packages/vi-environment-jsdom/src/index.ts#L95-L115
WINDOW.addEventListener('error', dummyErrorHandler);
});

Expand All@@ -166,7 +172,7 @@ describe('SentryBrowser', () => {
};

it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand All@@ -179,7 +185,7 @@ describe('SentryBrowser', () => {
});

it('should call `onClose` only once even if it throws', async () => {
const onClose = jest.fn(() => {
const onClose = vi.fn(() => {
throw new Error();
});

Expand All@@ -194,7 +200,7 @@ describe('SentryBrowser', () => {
});

it('should not call `onClose` for other MessageEvents', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand DownExpand Up@@ -236,49 +242,52 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});

it('should capture an event', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});

it('should set `platform` on events', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});
it('should capture a message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should set `platform` on events', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should not dedupe an event on bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand All@@ -295,7 +304,7 @@ describe('SentryBrowser', () => {
});

it('should use inboundfilter rules of bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand DownExpand Up@@ -374,7 +383,7 @@ describe('SentryBrowser initialization', () => {
});

it('uses SDK source from global for package name', () => {
const spy = jest.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
const spy = vi.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
init({ dsn });

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
Expand Down
6 changes: 4 additions & 2 deletions ...est/unit/integrations/breadcrumbs.test.ts → ...ser/test/integrations/breadcrumbs.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it, vi } from 'vitest';

import * as SentryCore from '@sentry/core';

import { BrowserClient, breadcrumbsIntegration, flush } from '../../../src';
import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';

describe('Breadcrumbs', () => {
Expand All@@ -14,7 +16,7 @@ describe('Breadcrumbs', () => {
SentryCore.setCurrentClient(client);
client.init();

const addBreadcrumbSpy = jest.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});
const addBreadcrumbSpy = vi.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});

client.captureMessage('test');
await flush(2000);
Expand Down
4 changes: 3 additions & 1 deletion ...st/unit/integrations/contextlines.test.ts → ...er/test/integrations/contextlines.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it } from 'vitest';

import type { StackFrame } from '@sentry/types';

import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';

const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
describe('ContextLines', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

test(browser): Switch from jest to vitest#13092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 1 commit into from
Aug 1, 2024
Merged

test(browser): Switch from jest to vitest #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions packages/browser/jest.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/browser/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,9 +70,8 @@
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:unit:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
17 changes: 11 additions & 6 deletions ...es/browser/test/unit/eventbuilder.test.ts → packages/browser/test/eventbuilder.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { defaultStackParser } from '../../src';
import { eventFromUnknownInput } from '../../src/eventbuilder';
/**
* @vitest-environment jsdom
*/

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
import { afterEach, describe, expect, it, vi } from 'vitest';

import { defaultStackParser } from '../src';
import { eventFromUnknownInput } from '../src/eventbuilder';

vi.mock('@sentry/core', async requireActual => {
return {
...original,
...((await requireActual()) as any),
getClient() {
return {
getOptions(): any {
Expand All@@ -21,7 +26,7 @@ class MyTestClass {
}

afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe('eventFromUnknownInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...est/unit/helper/browser-client-options.ts → ...ser/test/helper/browser-client-options.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { createTransport } from '@sentry/core';
import { resolvedSyncPromise } from '@sentry/utils';

import type { BrowserClientOptions } from '../../../src/client';
import type { BrowserClientOptions } from '../../src/client';

export function getDefaultBrowserClientOptions(options: Partial<BrowserClientOptions> = {}): BrowserClientOptions {
return {
Expand Down
6 changes: 4 additions & 2 deletions ...r/test/unit/index.bundle.feedback.test.ts → ...rowser/test/index.bundle.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { feedbackAsyncIntegration } from '../../src';
import { feedbackAsyncIntegration } from '../src';

import * as FeedbackBundle from '../../src/index.bundle.feedback';
import * as FeedbackBundle from '../src/index.bundle.feedback';

describe('index.bundle.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ser/test/unit/index.bundle.replay.test.ts → .../browser/test/index.bundle.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '../../src';
import { replayIntegration } from '../src';

import * as ReplayBundle from '../../src/index.bundle.replay';
import * as ReplayBundle from '../src/index.bundle.replay';

describe('index.bundle.replay', () => {
it('has correct exports', () => {
Expand Down
4 changes: 3 additions & 1 deletion ...es/browser/test/unit/index.bundle.test.ts → packages/browser/test/index.bundle.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';

import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';

import * as Bundle from '../../src/index.bundle';
import * as Bundle from '../src/index.bundle';

describe('index.bundle', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ex.bundle.tracing.replay.feedback.test.ts → ...ex.bundle.tracing.replay.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src';
import { describe, expect, it } from 'vitest';

import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';

import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';

describe('index.bundle.tracing.replay.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions .../unit/index.bundle.tracing.replay.test.ts → .../test/index.bundle.tracing.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration, replayIntegration } from '../../src';
import { browserTracingIntegration, replayIntegration } from '../src';

import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';

describe('index.bundle.tracing.replay', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...er/test/unit/index.bundle.tracing.test.ts → ...browser/test/index.bundle.tracing.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration } from '../../src';
import { browserTracingIntegration } from '../src';

import * as TracingBundle from '../../src/index.bundle.tracing';
import * as TracingBundle from '../src/index.bundle.tracing';

describe('index.bundle.tracing', () => {
it('has correct exports', () => {
Expand Down
123 changes: 66 additions & 57 deletions packages/browser/test/unit/index.test.ts → packages/browser/test/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
/**
* @vitest-environment jsdom
*/

import type { Mock } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
getGlobalScope,
Expand All@@ -8,7 +15,7 @@ import {
} from '@sentry/core';
import * as utils from '@sentry/utils';

import { setCurrentClient } from '../../src';
import { setCurrentClient } from '../src';
import {
BrowserClient,
Scope,
Expand All@@ -22,7 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
} from '../../src';
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';

Expand All@@ -31,16 +38,15 @@ const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
// eslint-disable-next-line no-var
declare var global: any;

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
vi.mock('@sentry/core', async requireActual => {
return {
...original,
getReportDialogEndpoint: jest.fn(),
...((await requireActual()) as any),
getReportDialogEndpoint: vi.fn(),
};
});

describe('SentryBrowser', () => {
const beforeSend = jest.fn(event => event);
const beforeSend = vi.fn(event => event);

beforeEach(() => {
getGlobalScope().clear();
Expand DownExpand Up@@ -84,7 +90,7 @@ describe('SentryBrowser', () => {

describe('showReportDialog', () => {
beforeEach(() => {
(getReportDialogEndpoint as jest.Mock).mockReset();
(getReportDialogEndpoint as Mock).mockReset();
});

describe('user', () => {
Expand DownExpand Up@@ -145,14 +151,14 @@ describe('SentryBrowser', () => {
});

describe('onClose', () => {
const dummyErrorHandler = jest.fn();
const dummyErrorHandler = vi.fn();
beforeEach(() => {
// this prevents jest-environment-jsdom from failing the test
// this prevents vi-environment-jsdom from failing the test
// when an error in `onClose` is thrown
// it does not prevent errors thrown directly inside the test,
// so we don't have to worry about tests passing that should
// otherwise fail
// see: https://github.com/jestjs/jest/blob/main/packages/jest-environment-jsdom/src/index.ts#L95-L115
// see: https://github.com/vijs/vi/blob/main/packages/vi-environment-jsdom/src/index.ts#L95-L115
WINDOW.addEventListener('error', dummyErrorHandler);
});

Expand All@@ -166,7 +172,7 @@ describe('SentryBrowser', () => {
};

it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand All@@ -179,7 +185,7 @@ describe('SentryBrowser', () => {
});

it('should call `onClose` only once even if it throws', async () => {
const onClose = jest.fn(() => {
const onClose = vi.fn(() => {
throw new Error();
});

Expand All@@ -194,7 +200,7 @@ describe('SentryBrowser', () => {
});

it('should not call `onClose` for other MessageEvents', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand DownExpand Up@@ -236,49 +242,52 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});

it('should capture an event', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});

it('should set `platform` on events', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});
it('should capture a message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should set `platform` on events', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should not dedupe an event on bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand All@@ -295,7 +304,7 @@ describe('SentryBrowser', () => {
});

it('should use inboundfilter rules of bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand DownExpand Up@@ -374,7 +383,7 @@ describe('SentryBrowser initialization', () => {
});

it('uses SDK source from global for package name', () => {
const spy = jest.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
const spy = vi.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
init({ dsn });

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
Expand Down
6 changes: 4 additions & 2 deletions ...est/unit/integrations/breadcrumbs.test.ts → ...ser/test/integrations/breadcrumbs.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it, vi } from 'vitest';

import * as SentryCore from '@sentry/core';

import { BrowserClient, breadcrumbsIntegration, flush } from '../../../src';
import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';

describe('Breadcrumbs', () => {
Expand All@@ -14,7 +16,7 @@ describe('Breadcrumbs', () => {
SentryCore.setCurrentClient(client);
client.init();

const addBreadcrumbSpy = jest.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});
const addBreadcrumbSpy = vi.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});

client.captureMessage('test');
await flush(2000);
Expand Down
4 changes: 3 additions & 1 deletion ...st/unit/integrations/contextlines.test.ts → ...er/test/integrations/contextlines.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it } from 'vitest';

import type { StackFrame } from '@sentry/types';

import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';

const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
describe('ContextLines', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test(browser): Switch from jest to vitest#13092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 1 commit into from
Aug 1, 2024
Merged

test(browser): Switch from jest to vitest #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions packages/browser/jest.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/browser/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,9 +70,8 @@
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:unit:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
17 changes: 11 additions & 6 deletions ...es/browser/test/unit/eventbuilder.test.ts → packages/browser/test/eventbuilder.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { defaultStackParser } from '../../src';
import { eventFromUnknownInput } from '../../src/eventbuilder';
/**
* @vitest-environment jsdom
*/

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
import { afterEach, describe, expect, it, vi } from 'vitest';

import { defaultStackParser } from '../src';
import { eventFromUnknownInput } from '../src/eventbuilder';

vi.mock('@sentry/core', async requireActual => {
return {
...original,
...((await requireActual()) as any),
getClient() {
return {
getOptions(): any {
Expand All@@ -21,7 +26,7 @@ class MyTestClass {
}

afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe('eventFromUnknownInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...est/unit/helper/browser-client-options.ts → ...ser/test/helper/browser-client-options.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { createTransport } from '@sentry/core';
import { resolvedSyncPromise } from '@sentry/utils';

import type { BrowserClientOptions } from '../../../src/client';
import type { BrowserClientOptions } from '../../src/client';

export function getDefaultBrowserClientOptions(options: Partial<BrowserClientOptions> = {}): BrowserClientOptions {
return {
Expand Down
6 changes: 4 additions & 2 deletions ...r/test/unit/index.bundle.feedback.test.ts → ...rowser/test/index.bundle.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { feedbackAsyncIntegration } from '../../src';
import { feedbackAsyncIntegration } from '../src';

import * as FeedbackBundle from '../../src/index.bundle.feedback';
import * as FeedbackBundle from '../src/index.bundle.feedback';

describe('index.bundle.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ser/test/unit/index.bundle.replay.test.ts → .../browser/test/index.bundle.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '../../src';
import { replayIntegration } from '../src';

import * as ReplayBundle from '../../src/index.bundle.replay';
import * as ReplayBundle from '../src/index.bundle.replay';

describe('index.bundle.replay', () => {
it('has correct exports', () => {
Expand Down
4 changes: 3 additions & 1 deletion ...es/browser/test/unit/index.bundle.test.ts → packages/browser/test/index.bundle.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';

import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';

import * as Bundle from '../../src/index.bundle';
import * as Bundle from '../src/index.bundle';

describe('index.bundle', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ex.bundle.tracing.replay.feedback.test.ts → ...ex.bundle.tracing.replay.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src';
import { describe, expect, it } from 'vitest';

import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';

import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';

describe('index.bundle.tracing.replay.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions .../unit/index.bundle.tracing.replay.test.ts → .../test/index.bundle.tracing.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration, replayIntegration } from '../../src';
import { browserTracingIntegration, replayIntegration } from '../src';

import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';

describe('index.bundle.tracing.replay', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...er/test/unit/index.bundle.tracing.test.ts → ...browser/test/index.bundle.tracing.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration } from '../../src';
import { browserTracingIntegration } from '../src';

import * as TracingBundle from '../../src/index.bundle.tracing';
import * as TracingBundle from '../src/index.bundle.tracing';

describe('index.bundle.tracing', () => {
it('has correct exports', () => {
Expand Down
123 changes: 66 additions & 57 deletions packages/browser/test/unit/index.test.ts → packages/browser/test/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
/**
* @vitest-environment jsdom
*/

import type { Mock } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
getGlobalScope,
Expand All@@ -8,7 +15,7 @@ import {
} from '@sentry/core';
import * as utils from '@sentry/utils';

import { setCurrentClient } from '../../src';
import { setCurrentClient } from '../src';
import {
BrowserClient,
Scope,
Expand All@@ -22,7 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
} from '../../src';
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';

Expand All@@ -31,16 +38,15 @@ const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
// eslint-disable-next-line no-var
declare var global: any;

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
vi.mock('@sentry/core', async requireActual => {
return {
...original,
getReportDialogEndpoint: jest.fn(),
...((await requireActual()) as any),
getReportDialogEndpoint: vi.fn(),
};
});

describe('SentryBrowser', () => {
const beforeSend = jest.fn(event => event);
const beforeSend = vi.fn(event => event);

beforeEach(() => {
getGlobalScope().clear();
Expand DownExpand Up@@ -84,7 +90,7 @@ describe('SentryBrowser', () => {

describe('showReportDialog', () => {
beforeEach(() => {
(getReportDialogEndpoint as jest.Mock).mockReset();
(getReportDialogEndpoint as Mock).mockReset();
});

describe('user', () => {
Expand DownExpand Up@@ -145,14 +151,14 @@ describe('SentryBrowser', () => {
});

describe('onClose', () => {
const dummyErrorHandler = jest.fn();
const dummyErrorHandler = vi.fn();
beforeEach(() => {
// this prevents jest-environment-jsdom from failing the test
// this prevents vi-environment-jsdom from failing the test
// when an error in `onClose` is thrown
// it does not prevent errors thrown directly inside the test,
// so we don't have to worry about tests passing that should
// otherwise fail
// see: https://github.com/jestjs/jest/blob/main/packages/jest-environment-jsdom/src/index.ts#L95-L115
// see: https://github.com/vijs/vi/blob/main/packages/vi-environment-jsdom/src/index.ts#L95-L115
WINDOW.addEventListener('error', dummyErrorHandler);
});

Expand All@@ -166,7 +172,7 @@ describe('SentryBrowser', () => {
};

it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand All@@ -179,7 +185,7 @@ describe('SentryBrowser', () => {
});

it('should call `onClose` only once even if it throws', async () => {
const onClose = jest.fn(() => {
const onClose = vi.fn(() => {
throw new Error();
});

Expand All@@ -194,7 +200,7 @@ describe('SentryBrowser', () => {
});

it('should not call `onClose` for other MessageEvents', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand DownExpand Up@@ -236,49 +242,52 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});

it('should capture an event', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});

it('should set `platform` on events', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});
it('should capture a message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should set `platform` on events', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should not dedupe an event on bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand All@@ -295,7 +304,7 @@ describe('SentryBrowser', () => {
});

it('should use inboundfilter rules of bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand DownExpand Up@@ -374,7 +383,7 @@ describe('SentryBrowser initialization', () => {
});

it('uses SDK source from global for package name', () => {
const spy = jest.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
const spy = vi.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
init({ dsn });

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
Expand Down
6 changes: 4 additions & 2 deletions ...est/unit/integrations/breadcrumbs.test.ts → ...ser/test/integrations/breadcrumbs.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it, vi } from 'vitest';

import * as SentryCore from '@sentry/core';

import { BrowserClient, breadcrumbsIntegration, flush } from '../../../src';
import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';

describe('Breadcrumbs', () => {
Expand All@@ -14,7 +16,7 @@ describe('Breadcrumbs', () => {
SentryCore.setCurrentClient(client);
client.init();

const addBreadcrumbSpy = jest.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});
const addBreadcrumbSpy = vi.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});

client.captureMessage('test');
await flush(2000);
Expand Down
4 changes: 3 additions & 1 deletion ...st/unit/integrations/contextlines.test.ts → ...er/test/integrations/contextlines.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it } from 'vitest';

import type { StackFrame } from '@sentry/types';

import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';

const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
describe('ContextLines', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test(browser): Switch from jest to vitest#13092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 1 commit into from
Aug 1, 2024
Merged

test(browser): Switch from jest to vitest #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions packages/browser/jest.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/browser/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,9 +70,8 @@
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:unit:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
17 changes: 11 additions & 6 deletions ...es/browser/test/unit/eventbuilder.test.ts → packages/browser/test/eventbuilder.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { defaultStackParser } from '../../src';
import { eventFromUnknownInput } from '../../src/eventbuilder';
/**
* @vitest-environment jsdom
*/

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
import { afterEach, describe, expect, it, vi } from 'vitest';

import { defaultStackParser } from '../src';
import { eventFromUnknownInput } from '../src/eventbuilder';

vi.mock('@sentry/core', async requireActual => {
return {
...original,
...((await requireActual()) as any),
getClient() {
return {
getOptions(): any {
Expand All@@ -21,7 +26,7 @@ class MyTestClass {
}

afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe('eventFromUnknownInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...est/unit/helper/browser-client-options.ts → ...ser/test/helper/browser-client-options.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { createTransport } from '@sentry/core';
import { resolvedSyncPromise } from '@sentry/utils';

import type { BrowserClientOptions } from '../../../src/client';
import type { BrowserClientOptions } from '../../src/client';

export function getDefaultBrowserClientOptions(options: Partial<BrowserClientOptions> = {}): BrowserClientOptions {
return {
Expand Down
6 changes: 4 additions & 2 deletions ...r/test/unit/index.bundle.feedback.test.ts → ...rowser/test/index.bundle.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { feedbackAsyncIntegration } from '../../src';
import { feedbackAsyncIntegration } from '../src';

import * as FeedbackBundle from '../../src/index.bundle.feedback';
import * as FeedbackBundle from '../src/index.bundle.feedback';

describe('index.bundle.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ser/test/unit/index.bundle.replay.test.ts → .../browser/test/index.bundle.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '../../src';
import { replayIntegration } from '../src';

import * as ReplayBundle from '../../src/index.bundle.replay';
import * as ReplayBundle from '../src/index.bundle.replay';

describe('index.bundle.replay', () => {
it('has correct exports', () => {
Expand Down
4 changes: 3 additions & 1 deletion ...es/browser/test/unit/index.bundle.test.ts → packages/browser/test/index.bundle.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';

import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';

import * as Bundle from '../../src/index.bundle';
import * as Bundle from '../src/index.bundle';

describe('index.bundle', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ex.bundle.tracing.replay.feedback.test.ts → ...ex.bundle.tracing.replay.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src';
import { describe, expect, it } from 'vitest';

import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';

import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';

describe('index.bundle.tracing.replay.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions .../unit/index.bundle.tracing.replay.test.ts → .../test/index.bundle.tracing.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration, replayIntegration } from '../../src';
import { browserTracingIntegration, replayIntegration } from '../src';

import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';

describe('index.bundle.tracing.replay', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...er/test/unit/index.bundle.tracing.test.ts → ...browser/test/index.bundle.tracing.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration } from '../../src';
import { browserTracingIntegration } from '../src';

import * as TracingBundle from '../../src/index.bundle.tracing';
import * as TracingBundle from '../src/index.bundle.tracing';

describe('index.bundle.tracing', () => {
it('has correct exports', () => {
Expand Down
123 changes: 66 additions & 57 deletions packages/browser/test/unit/index.test.ts → packages/browser/test/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
/**
* @vitest-environment jsdom
*/

import type { Mock } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
getGlobalScope,
Expand All@@ -8,7 +15,7 @@ import {
} from '@sentry/core';
import * as utils from '@sentry/utils';

import { setCurrentClient } from '../../src';
import { setCurrentClient } from '../src';
import {
BrowserClient,
Scope,
Expand All@@ -22,7 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
} from '../../src';
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';

Expand All@@ -31,16 +38,15 @@ const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
// eslint-disable-next-line no-var
declare var global: any;

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
vi.mock('@sentry/core', async requireActual => {
return {
...original,
getReportDialogEndpoint: jest.fn(),
...((await requireActual()) as any),
getReportDialogEndpoint: vi.fn(),
};
});

describe('SentryBrowser', () => {
const beforeSend = jest.fn(event => event);
const beforeSend = vi.fn(event => event);

beforeEach(() => {
getGlobalScope().clear();
Expand DownExpand Up@@ -84,7 +90,7 @@ describe('SentryBrowser', () => {

describe('showReportDialog', () => {
beforeEach(() => {
(getReportDialogEndpoint as jest.Mock).mockReset();
(getReportDialogEndpoint as Mock).mockReset();
});

describe('user', () => {
Expand DownExpand Up@@ -145,14 +151,14 @@ describe('SentryBrowser', () => {
});

describe('onClose', () => {
const dummyErrorHandler = jest.fn();
const dummyErrorHandler = vi.fn();
beforeEach(() => {
// this prevents jest-environment-jsdom from failing the test
// this prevents vi-environment-jsdom from failing the test
// when an error in `onClose` is thrown
// it does not prevent errors thrown directly inside the test,
// so we don't have to worry about tests passing that should
// otherwise fail
// see: https://github.com/jestjs/jest/blob/main/packages/jest-environment-jsdom/src/index.ts#L95-L115
// see: https://github.com/vijs/vi/blob/main/packages/vi-environment-jsdom/src/index.ts#L95-L115
WINDOW.addEventListener('error', dummyErrorHandler);
});

Expand All@@ -166,7 +172,7 @@ describe('SentryBrowser', () => {
};

it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand All@@ -179,7 +185,7 @@ describe('SentryBrowser', () => {
});

it('should call `onClose` only once even if it throws', async () => {
const onClose = jest.fn(() => {
const onClose = vi.fn(() => {
throw new Error();
});

Expand All@@ -194,7 +200,7 @@ describe('SentryBrowser', () => {
});

it('should not call `onClose` for other MessageEvents', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand DownExpand Up@@ -236,49 +242,52 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});

it('should capture an event', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});

it('should set `platform` on events', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});
it('should capture a message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should set `platform` on events', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should not dedupe an event on bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand All@@ -295,7 +304,7 @@ describe('SentryBrowser', () => {
});

it('should use inboundfilter rules of bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand DownExpand Up@@ -374,7 +383,7 @@ describe('SentryBrowser initialization', () => {
});

it('uses SDK source from global for package name', () => {
const spy = jest.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
const spy = vi.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
init({ dsn });

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
Expand Down
6 changes: 4 additions & 2 deletions ...est/unit/integrations/breadcrumbs.test.ts → ...ser/test/integrations/breadcrumbs.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it, vi } from 'vitest';

import * as SentryCore from '@sentry/core';

import { BrowserClient, breadcrumbsIntegration, flush } from '../../../src';
import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';

describe('Breadcrumbs', () => {
Expand All@@ -14,7 +16,7 @@ describe('Breadcrumbs', () => {
SentryCore.setCurrentClient(client);
client.init();

const addBreadcrumbSpy = jest.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});
const addBreadcrumbSpy = vi.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});

client.captureMessage('test');
await flush(2000);
Expand Down
4 changes: 3 additions & 1 deletion ...st/unit/integrations/contextlines.test.ts → ...er/test/integrations/contextlines.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it } from 'vitest';

import type { StackFrame } from '@sentry/types';

import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';

const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
describe('ContextLines', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

test(browser): Switch from jest to vitest#13092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 1 commit into from
Aug 1, 2024
Merged

test(browser): Switch from jest to vitest #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions packages/browser/jest.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/browser/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,9 +70,8 @@
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:unit:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
17 changes: 11 additions & 6 deletions ...es/browser/test/unit/eventbuilder.test.ts → packages/browser/test/eventbuilder.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { defaultStackParser } from '../../src';
import { eventFromUnknownInput } from '../../src/eventbuilder';
/**
* @vitest-environment jsdom
*/

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
import { afterEach, describe, expect, it, vi } from 'vitest';

import { defaultStackParser } from '../src';
import { eventFromUnknownInput } from '../src/eventbuilder';

vi.mock('@sentry/core', async requireActual => {
return {
...original,
...((await requireActual()) as any),
getClient() {
return {
getOptions(): any {
Expand All@@ -21,7 +26,7 @@ class MyTestClass {
}

afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe('eventFromUnknownInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...est/unit/helper/browser-client-options.ts → ...ser/test/helper/browser-client-options.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { createTransport } from '@sentry/core';
import { resolvedSyncPromise } from '@sentry/utils';

import type { BrowserClientOptions } from '../../../src/client';
import type { BrowserClientOptions } from '../../src/client';

export function getDefaultBrowserClientOptions(options: Partial<BrowserClientOptions> = {}): BrowserClientOptions {
return {
Expand Down
6 changes: 4 additions & 2 deletions ...r/test/unit/index.bundle.feedback.test.ts → ...rowser/test/index.bundle.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { feedbackAsyncIntegration } from '../../src';
import { feedbackAsyncIntegration } from '../src';

import * as FeedbackBundle from '../../src/index.bundle.feedback';
import * as FeedbackBundle from '../src/index.bundle.feedback';

describe('index.bundle.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ser/test/unit/index.bundle.replay.test.ts → .../browser/test/index.bundle.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '../../src';
import { replayIntegration } from '../src';

import * as ReplayBundle from '../../src/index.bundle.replay';
import * as ReplayBundle from '../src/index.bundle.replay';

describe('index.bundle.replay', () => {
it('has correct exports', () => {
Expand Down
4 changes: 3 additions & 1 deletion ...es/browser/test/unit/index.bundle.test.ts → packages/browser/test/index.bundle.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';

import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';

import * as Bundle from '../../src/index.bundle';
import * as Bundle from '../src/index.bundle';

describe('index.bundle', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ex.bundle.tracing.replay.feedback.test.ts → ...ex.bundle.tracing.replay.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src';
import { describe, expect, it } from 'vitest';

import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';

import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';

describe('index.bundle.tracing.replay.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions .../unit/index.bundle.tracing.replay.test.ts → .../test/index.bundle.tracing.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration, replayIntegration } from '../../src';
import { browserTracingIntegration, replayIntegration } from '../src';

import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';

describe('index.bundle.tracing.replay', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...er/test/unit/index.bundle.tracing.test.ts → ...browser/test/index.bundle.tracing.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration } from '../../src';
import { browserTracingIntegration } from '../src';

import * as TracingBundle from '../../src/index.bundle.tracing';
import * as TracingBundle from '../src/index.bundle.tracing';

describe('index.bundle.tracing', () => {
it('has correct exports', () => {
Expand Down
123 changes: 66 additions & 57 deletions packages/browser/test/unit/index.test.ts → packages/browser/test/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
/**
* @vitest-environment jsdom
*/

import type { Mock } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
getGlobalScope,
Expand All@@ -8,7 +15,7 @@ import {
} from '@sentry/core';
import * as utils from '@sentry/utils';

import { setCurrentClient } from '../../src';
import { setCurrentClient } from '../src';
import {
BrowserClient,
Scope,
Expand All@@ -22,7 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
} from '../../src';
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';

Expand All@@ -31,16 +38,15 @@ const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
// eslint-disable-next-line no-var
declare var global: any;

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
vi.mock('@sentry/core', async requireActual => {
return {
...original,
getReportDialogEndpoint: jest.fn(),
...((await requireActual()) as any),
getReportDialogEndpoint: vi.fn(),
};
});

describe('SentryBrowser', () => {
const beforeSend = jest.fn(event => event);
const beforeSend = vi.fn(event => event);

beforeEach(() => {
getGlobalScope().clear();
Expand DownExpand Up@@ -84,7 +90,7 @@ describe('SentryBrowser', () => {

describe('showReportDialog', () => {
beforeEach(() => {
(getReportDialogEndpoint as jest.Mock).mockReset();
(getReportDialogEndpoint as Mock).mockReset();
});

describe('user', () => {
Expand DownExpand Up@@ -145,14 +151,14 @@ describe('SentryBrowser', () => {
});

describe('onClose', () => {
const dummyErrorHandler = jest.fn();
const dummyErrorHandler = vi.fn();
beforeEach(() => {
// this prevents jest-environment-jsdom from failing the test
// this prevents vi-environment-jsdom from failing the test
// when an error in `onClose` is thrown
// it does not prevent errors thrown directly inside the test,
// so we don't have to worry about tests passing that should
// otherwise fail
// see: https://github.com/jestjs/jest/blob/main/packages/jest-environment-jsdom/src/index.ts#L95-L115
// see: https://github.com/vijs/vi/blob/main/packages/vi-environment-jsdom/src/index.ts#L95-L115
WINDOW.addEventListener('error', dummyErrorHandler);
});

Expand All@@ -166,7 +172,7 @@ describe('SentryBrowser', () => {
};

it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand All@@ -179,7 +185,7 @@ describe('SentryBrowser', () => {
});

it('should call `onClose` only once even if it throws', async () => {
const onClose = jest.fn(() => {
const onClose = vi.fn(() => {
throw new Error();
});

Expand All@@ -194,7 +200,7 @@ describe('SentryBrowser', () => {
});

it('should not call `onClose` for other MessageEvents', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand DownExpand Up@@ -236,49 +242,52 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});

it('should capture an event', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});

it('should set `platform` on events', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});
it('should capture a message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should set `platform` on events', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should not dedupe an event on bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand All@@ -295,7 +304,7 @@ describe('SentryBrowser', () => {
});

it('should use inboundfilter rules of bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand DownExpand Up@@ -374,7 +383,7 @@ describe('SentryBrowser initialization', () => {
});

it('uses SDK source from global for package name', () => {
const spy = jest.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
const spy = vi.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
init({ dsn });

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
Expand Down
6 changes: 4 additions & 2 deletions ...est/unit/integrations/breadcrumbs.test.ts → ...ser/test/integrations/breadcrumbs.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it, vi } from 'vitest';

import * as SentryCore from '@sentry/core';

import { BrowserClient, breadcrumbsIntegration, flush } from '../../../src';
import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';

describe('Breadcrumbs', () => {
Expand All@@ -14,7 +16,7 @@ describe('Breadcrumbs', () => {
SentryCore.setCurrentClient(client);
client.init();

const addBreadcrumbSpy = jest.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});
const addBreadcrumbSpy = vi.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});

client.captureMessage('test');
await flush(2000);
Expand Down
4 changes: 3 additions & 1 deletion ...st/unit/integrations/contextlines.test.ts → ...er/test/integrations/contextlines.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it } from 'vitest';

import type { StackFrame } from '@sentry/types';

import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';

const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
describe('ContextLines', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test(browser): Switch from jest to vitest#13092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 1 commit into from
Aug 1, 2024
Merged

test(browser): Switch from jest to vitest #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions packages/browser/jest.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/browser/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,9 +70,8 @@
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:unit:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
17 changes: 11 additions & 6 deletions ...es/browser/test/unit/eventbuilder.test.ts → packages/browser/test/eventbuilder.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { defaultStackParser } from '../../src';
import { eventFromUnknownInput } from '../../src/eventbuilder';
/**
* @vitest-environment jsdom
*/

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
import { afterEach, describe, expect, it, vi } from 'vitest';

import { defaultStackParser } from '../src';
import { eventFromUnknownInput } from '../src/eventbuilder';

vi.mock('@sentry/core', async requireActual => {
return {
...original,
...((await requireActual()) as any),
getClient() {
return {
getOptions(): any {
Expand All@@ -21,7 +26,7 @@ class MyTestClass {
}

afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe('eventFromUnknownInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...est/unit/helper/browser-client-options.ts → ...ser/test/helper/browser-client-options.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { createTransport } from '@sentry/core';
import { resolvedSyncPromise } from '@sentry/utils';

import type { BrowserClientOptions } from '../../../src/client';
import type { BrowserClientOptions } from '../../src/client';

export function getDefaultBrowserClientOptions(options: Partial<BrowserClientOptions> = {}): BrowserClientOptions {
return {
Expand Down
6 changes: 4 additions & 2 deletions ...r/test/unit/index.bundle.feedback.test.ts → ...rowser/test/index.bundle.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { feedbackAsyncIntegration } from '../../src';
import { feedbackAsyncIntegration } from '../src';

import * as FeedbackBundle from '../../src/index.bundle.feedback';
import * as FeedbackBundle from '../src/index.bundle.feedback';

describe('index.bundle.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ser/test/unit/index.bundle.replay.test.ts → .../browser/test/index.bundle.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '../../src';
import { replayIntegration } from '../src';

import * as ReplayBundle from '../../src/index.bundle.replay';
import * as ReplayBundle from '../src/index.bundle.replay';

describe('index.bundle.replay', () => {
it('has correct exports', () => {
Expand Down
4 changes: 3 additions & 1 deletion ...es/browser/test/unit/index.bundle.test.ts → packages/browser/test/index.bundle.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';

import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';

import * as Bundle from '../../src/index.bundle';
import * as Bundle from '../src/index.bundle';

describe('index.bundle', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ex.bundle.tracing.replay.feedback.test.ts → ...ex.bundle.tracing.replay.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src';
import { describe, expect, it } from 'vitest';

import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';

import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';

describe('index.bundle.tracing.replay.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions .../unit/index.bundle.tracing.replay.test.ts → .../test/index.bundle.tracing.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration, replayIntegration } from '../../src';
import { browserTracingIntegration, replayIntegration } from '../src';

import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';

describe('index.bundle.tracing.replay', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...er/test/unit/index.bundle.tracing.test.ts → ...browser/test/index.bundle.tracing.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration } from '../../src';
import { browserTracingIntegration } from '../src';

import * as TracingBundle from '../../src/index.bundle.tracing';
import * as TracingBundle from '../src/index.bundle.tracing';

describe('index.bundle.tracing', () => {
it('has correct exports', () => {
Expand Down
123 changes: 66 additions & 57 deletions packages/browser/test/unit/index.test.ts → packages/browser/test/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
/**
* @vitest-environment jsdom
*/

import type { Mock } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
getGlobalScope,
Expand All@@ -8,7 +15,7 @@ import {
} from '@sentry/core';
import * as utils from '@sentry/utils';

import { setCurrentClient } from '../../src';
import { setCurrentClient } from '../src';
import {
BrowserClient,
Scope,
Expand All@@ -22,7 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
} from '../../src';
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';

Expand All@@ -31,16 +38,15 @@ const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
// eslint-disable-next-line no-var
declare var global: any;

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
vi.mock('@sentry/core', async requireActual => {
return {
...original,
getReportDialogEndpoint: jest.fn(),
...((await requireActual()) as any),
getReportDialogEndpoint: vi.fn(),
};
});

describe('SentryBrowser', () => {
const beforeSend = jest.fn(event => event);
const beforeSend = vi.fn(event => event);

beforeEach(() => {
getGlobalScope().clear();
Expand DownExpand Up@@ -84,7 +90,7 @@ describe('SentryBrowser', () => {

describe('showReportDialog', () => {
beforeEach(() => {
(getReportDialogEndpoint as jest.Mock).mockReset();
(getReportDialogEndpoint as Mock).mockReset();
});

describe('user', () => {
Expand DownExpand Up@@ -145,14 +151,14 @@ describe('SentryBrowser', () => {
});

describe('onClose', () => {
const dummyErrorHandler = jest.fn();
const dummyErrorHandler = vi.fn();
beforeEach(() => {
// this prevents jest-environment-jsdom from failing the test
// this prevents vi-environment-jsdom from failing the test
// when an error in `onClose` is thrown
// it does not prevent errors thrown directly inside the test,
// so we don't have to worry about tests passing that should
// otherwise fail
// see: https://github.com/jestjs/jest/blob/main/packages/jest-environment-jsdom/src/index.ts#L95-L115
// see: https://github.com/vijs/vi/blob/main/packages/vi-environment-jsdom/src/index.ts#L95-L115
WINDOW.addEventListener('error', dummyErrorHandler);
});

Expand All@@ -166,7 +172,7 @@ describe('SentryBrowser', () => {
};

it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand All@@ -179,7 +185,7 @@ describe('SentryBrowser', () => {
});

it('should call `onClose` only once even if it throws', async () => {
const onClose = jest.fn(() => {
const onClose = vi.fn(() => {
throw new Error();
});

Expand All@@ -194,7 +200,7 @@ describe('SentryBrowser', () => {
});

it('should not call `onClose` for other MessageEvents', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand DownExpand Up@@ -236,49 +242,52 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});

it('should capture an event', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});

it('should set `platform` on events', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});
it('should capture a message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should set `platform` on events', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should not dedupe an event on bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand All@@ -295,7 +304,7 @@ describe('SentryBrowser', () => {
});

it('should use inboundfilter rules of bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand DownExpand Up@@ -374,7 +383,7 @@ describe('SentryBrowser initialization', () => {
});

it('uses SDK source from global for package name', () => {
const spy = jest.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
const spy = vi.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
init({ dsn });

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
Expand Down
6 changes: 4 additions & 2 deletions ...est/unit/integrations/breadcrumbs.test.ts → ...ser/test/integrations/breadcrumbs.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it, vi } from 'vitest';

import * as SentryCore from '@sentry/core';

import { BrowserClient, breadcrumbsIntegration, flush } from '../../../src';
import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';

describe('Breadcrumbs', () => {
Expand All@@ -14,7 +16,7 @@ describe('Breadcrumbs', () => {
SentryCore.setCurrentClient(client);
client.init();

const addBreadcrumbSpy = jest.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});
const addBreadcrumbSpy = vi.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});

client.captureMessage('test');
await flush(2000);
Expand Down
4 changes: 3 additions & 1 deletion ...st/unit/integrations/contextlines.test.ts → ...er/test/integrations/contextlines.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it } from 'vitest';

import type { StackFrame } from '@sentry/types';

import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';

const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
describe('ContextLines', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test(browser): Switch from jest to vitest#13092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 1 commit into from
Aug 1, 2024
Merged

test(browser): Switch from jest to vitest #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions packages/browser/jest.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/browser/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,9 +70,8 @@
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:unit:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
17 changes: 11 additions & 6 deletions ...es/browser/test/unit/eventbuilder.test.ts → packages/browser/test/eventbuilder.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { defaultStackParser } from '../../src';
import { eventFromUnknownInput } from '../../src/eventbuilder';
/**
* @vitest-environment jsdom
*/

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
import { afterEach, describe, expect, it, vi } from 'vitest';

import { defaultStackParser } from '../src';
import { eventFromUnknownInput } from '../src/eventbuilder';

vi.mock('@sentry/core', async requireActual => {
return {
...original,
...((await requireActual()) as any),
getClient() {
return {
getOptions(): any {
Expand All@@ -21,7 +26,7 @@ class MyTestClass {
}

afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe('eventFromUnknownInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...est/unit/helper/browser-client-options.ts → ...ser/test/helper/browser-client-options.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { createTransport } from '@sentry/core';
import { resolvedSyncPromise } from '@sentry/utils';

import type { BrowserClientOptions } from '../../../src/client';
import type { BrowserClientOptions } from '../../src/client';

export function getDefaultBrowserClientOptions(options: Partial<BrowserClientOptions> = {}): BrowserClientOptions {
return {
Expand Down
6 changes: 4 additions & 2 deletions ...r/test/unit/index.bundle.feedback.test.ts → ...rowser/test/index.bundle.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { feedbackAsyncIntegration } from '../../src';
import { feedbackAsyncIntegration } from '../src';

import * as FeedbackBundle from '../../src/index.bundle.feedback';
import * as FeedbackBundle from '../src/index.bundle.feedback';

describe('index.bundle.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ser/test/unit/index.bundle.replay.test.ts → .../browser/test/index.bundle.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '../../src';
import { replayIntegration } from '../src';

import * as ReplayBundle from '../../src/index.bundle.replay';
import * as ReplayBundle from '../src/index.bundle.replay';

describe('index.bundle.replay', () => {
it('has correct exports', () => {
Expand Down
4 changes: 3 additions & 1 deletion ...es/browser/test/unit/index.bundle.test.ts → packages/browser/test/index.bundle.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';

import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';

import * as Bundle from '../../src/index.bundle';
import * as Bundle from '../src/index.bundle';

describe('index.bundle', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ex.bundle.tracing.replay.feedback.test.ts → ...ex.bundle.tracing.replay.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src';
import { describe, expect, it } from 'vitest';

import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';

import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';

describe('index.bundle.tracing.replay.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions .../unit/index.bundle.tracing.replay.test.ts → .../test/index.bundle.tracing.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration, replayIntegration } from '../../src';
import { browserTracingIntegration, replayIntegration } from '../src';

import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';

describe('index.bundle.tracing.replay', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...er/test/unit/index.bundle.tracing.test.ts → ...browser/test/index.bundle.tracing.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration } from '../../src';
import { browserTracingIntegration } from '../src';

import * as TracingBundle from '../../src/index.bundle.tracing';
import * as TracingBundle from '../src/index.bundle.tracing';

describe('index.bundle.tracing', () => {
it('has correct exports', () => {
Expand Down
123 changes: 66 additions & 57 deletions packages/browser/test/unit/index.test.ts → packages/browser/test/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
/**
* @vitest-environment jsdom
*/

import type { Mock } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
getGlobalScope,
Expand All@@ -8,7 +15,7 @@ import {
} from '@sentry/core';
import * as utils from '@sentry/utils';

import { setCurrentClient } from '../../src';
import { setCurrentClient } from '../src';
import {
BrowserClient,
Scope,
Expand All@@ -22,7 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
} from '../../src';
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';

Expand All@@ -31,16 +38,15 @@ const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
// eslint-disable-next-line no-var
declare var global: any;

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
vi.mock('@sentry/core', async requireActual => {
return {
...original,
getReportDialogEndpoint: jest.fn(),
...((await requireActual()) as any),
getReportDialogEndpoint: vi.fn(),
};
});

describe('SentryBrowser', () => {
const beforeSend = jest.fn(event => event);
const beforeSend = vi.fn(event => event);

beforeEach(() => {
getGlobalScope().clear();
Expand DownExpand Up@@ -84,7 +90,7 @@ describe('SentryBrowser', () => {

describe('showReportDialog', () => {
beforeEach(() => {
(getReportDialogEndpoint as jest.Mock).mockReset();
(getReportDialogEndpoint as Mock).mockReset();
});

describe('user', () => {
Expand DownExpand Up@@ -145,14 +151,14 @@ describe('SentryBrowser', () => {
});

describe('onClose', () => {
const dummyErrorHandler = jest.fn();
const dummyErrorHandler = vi.fn();
beforeEach(() => {
// this prevents jest-environment-jsdom from failing the test
// this prevents vi-environment-jsdom from failing the test
// when an error in `onClose` is thrown
// it does not prevent errors thrown directly inside the test,
// so we don't have to worry about tests passing that should
// otherwise fail
// see: https://github.com/jestjs/jest/blob/main/packages/jest-environment-jsdom/src/index.ts#L95-L115
// see: https://github.com/vijs/vi/blob/main/packages/vi-environment-jsdom/src/index.ts#L95-L115
WINDOW.addEventListener('error', dummyErrorHandler);
});

Expand All@@ -166,7 +172,7 @@ describe('SentryBrowser', () => {
};

it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand All@@ -179,7 +185,7 @@ describe('SentryBrowser', () => {
});

it('should call `onClose` only once even if it throws', async () => {
const onClose = jest.fn(() => {
const onClose = vi.fn(() => {
throw new Error();
});

Expand All@@ -194,7 +200,7 @@ describe('SentryBrowser', () => {
});

it('should not call `onClose` for other MessageEvents', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand DownExpand Up@@ -236,49 +242,52 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});

it('should capture an event', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});

it('should set `platform` on events', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});
it('should capture a message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should set `platform` on events', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should not dedupe an event on bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand All@@ -295,7 +304,7 @@ describe('SentryBrowser', () => {
});

it('should use inboundfilter rules of bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand DownExpand Up@@ -374,7 +383,7 @@ describe('SentryBrowser initialization', () => {
});

it('uses SDK source from global for package name', () => {
const spy = jest.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
const spy = vi.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
init({ dsn });

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
Expand Down
6 changes: 4 additions & 2 deletions ...est/unit/integrations/breadcrumbs.test.ts → ...ser/test/integrations/breadcrumbs.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it, vi } from 'vitest';

import * as SentryCore from '@sentry/core';

import { BrowserClient, breadcrumbsIntegration, flush } from '../../../src';
import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';

describe('Breadcrumbs', () => {
Expand All@@ -14,7 +16,7 @@ describe('Breadcrumbs', () => {
SentryCore.setCurrentClient(client);
client.init();

const addBreadcrumbSpy = jest.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});
const addBreadcrumbSpy = vi.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});

client.captureMessage('test');
await flush(2000);
Expand Down
4 changes: 3 additions & 1 deletion ...st/unit/integrations/contextlines.test.ts → ...er/test/integrations/contextlines.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it } from 'vitest';

import type { StackFrame } from '@sentry/types';

import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';

const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
describe('ContextLines', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

test(browser): Switch from jest to vitest#13092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 1 commit into from
Aug 1, 2024
Merged

test(browser): Switch from jest to vitest #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions packages/browser/jest.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/browser/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,9 +70,8 @@
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:unit:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
17 changes: 11 additions & 6 deletions ...es/browser/test/unit/eventbuilder.test.ts → packages/browser/test/eventbuilder.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { defaultStackParser } from '../../src';
import { eventFromUnknownInput } from '../../src/eventbuilder';
/**
* @vitest-environment jsdom
*/

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
import { afterEach, describe, expect, it, vi } from 'vitest';

import { defaultStackParser } from '../src';
import { eventFromUnknownInput } from '../src/eventbuilder';

vi.mock('@sentry/core', async requireActual => {
return {
...original,
...((await requireActual()) as any),
getClient() {
return {
getOptions(): any {
Expand All@@ -21,7 +26,7 @@ class MyTestClass {
}

afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe('eventFromUnknownInput', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...est/unit/helper/browser-client-options.ts → ...ser/test/helper/browser-client-options.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { createTransport } from '@sentry/core';
import { resolvedSyncPromise } from '@sentry/utils';

import type { BrowserClientOptions } from '../../../src/client';
import type { BrowserClientOptions } from '../../src/client';

export function getDefaultBrowserClientOptions(options: Partial<BrowserClientOptions> = {}): BrowserClientOptions {
return {
Expand Down
6 changes: 4 additions & 2 deletions ...r/test/unit/index.bundle.feedback.test.ts → ...rowser/test/index.bundle.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { feedbackAsyncIntegration } from '../../src';
import { feedbackAsyncIntegration } from '../src';

import * as FeedbackBundle from '../../src/index.bundle.feedback';
import * as FeedbackBundle from '../src/index.bundle.feedback';

describe('index.bundle.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ser/test/unit/index.bundle.replay.test.ts → .../browser/test/index.bundle.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '../../src';
import { replayIntegration } from '../src';

import * as ReplayBundle from '../../src/index.bundle.replay';
import * as ReplayBundle from '../src/index.bundle.replay';

describe('index.bundle.replay', () => {
it('has correct exports', () => {
Expand Down
4 changes: 3 additions & 1 deletion ...es/browser/test/unit/index.bundle.test.ts → packages/browser/test/index.bundle.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';

import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';

import * as Bundle from '../../src/index.bundle';
import * as Bundle from '../src/index.bundle';

describe('index.bundle', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...ex.bundle.tracing.replay.feedback.test.ts → ...ex.bundle.tracing.replay.feedback.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src';
import { describe, expect, it } from 'vitest';

import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';

import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';

describe('index.bundle.tracing.replay.feedback', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions .../unit/index.bundle.tracing.replay.test.ts → .../test/index.bundle.tracing.replay.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration, replayIntegration } from '../../src';
import { browserTracingIntegration, replayIntegration } from '../src';

import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';

describe('index.bundle.tracing.replay', () => {
it('has correct exports', () => {
Expand Down
6 changes: 4 additions & 2 deletions ...er/test/unit/index.bundle.tracing.test.ts → ...browser/test/index.bundle.tracing.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';

import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { browserTracingIntegration } from '../../src';
import { browserTracingIntegration } from '../src';

import * as TracingBundle from '../../src/index.bundle.tracing';
import * as TracingBundle from '../src/index.bundle.tracing';

describe('index.bundle.tracing', () => {
it('has correct exports', () => {
Expand Down
123 changes: 66 additions & 57 deletions packages/browser/test/unit/index.test.ts → packages/browser/test/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
/**
* @vitest-environment jsdom
*/

import type { Mock } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
getGlobalScope,
Expand All@@ -8,7 +15,7 @@ import {
} from '@sentry/core';
import * as utils from '@sentry/utils';

import { setCurrentClient } from '../../src';
import { setCurrentClient } from '../src';
import {
BrowserClient,
Scope,
Expand All@@ -22,7 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
} from '../../src';
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';

Expand All@@ -31,16 +38,15 @@ const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
// eslint-disable-next-line no-var
declare var global: any;

jest.mock('@sentry/core', () => {
const original = jest.requireActual('@sentry/core');
vi.mock('@sentry/core', async requireActual => {
return {
...original,
getReportDialogEndpoint: jest.fn(),
...((await requireActual()) as any),
getReportDialogEndpoint: vi.fn(),
};
});

describe('SentryBrowser', () => {
const beforeSend = jest.fn(event => event);
const beforeSend = vi.fn(event => event);

beforeEach(() => {
getGlobalScope().clear();
Expand DownExpand Up@@ -84,7 +90,7 @@ describe('SentryBrowser', () => {

describe('showReportDialog', () => {
beforeEach(() => {
(getReportDialogEndpoint as jest.Mock).mockReset();
(getReportDialogEndpoint as Mock).mockReset();
});

describe('user', () => {
Expand DownExpand Up@@ -145,14 +151,14 @@ describe('SentryBrowser', () => {
});

describe('onClose', () => {
const dummyErrorHandler = jest.fn();
const dummyErrorHandler = vi.fn();
beforeEach(() => {
// this prevents jest-environment-jsdom from failing the test
// this prevents vi-environment-jsdom from failing the test
// when an error in `onClose` is thrown
// it does not prevent errors thrown directly inside the test,
// so we don't have to worry about tests passing that should
// otherwise fail
// see: https://github.com/jestjs/jest/blob/main/packages/jest-environment-jsdom/src/index.ts#L95-L115
// see: https://github.com/vijs/vi/blob/main/packages/vi-environment-jsdom/src/index.ts#L95-L115
WINDOW.addEventListener('error', dummyErrorHandler);
});

Expand All@@ -166,7 +172,7 @@ describe('SentryBrowser', () => {
};

it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand All@@ -179,7 +185,7 @@ describe('SentryBrowser', () => {
});

it('should call `onClose` only once even if it throws', async () => {
const onClose = jest.fn(() => {
const onClose = vi.fn(() => {
throw new Error();
});

Expand All@@ -194,7 +200,7 @@ describe('SentryBrowser', () => {
});

it('should not call `onClose` for other MessageEvents', async () => {
const onClose = jest.fn();
const onClose = vi.fn();

showReportDialog({ onClose });

Expand DownExpand Up@@ -236,49 +242,52 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});

it('should capture an event', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});

it('should set `platform` on events', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
});
it('should capture a message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.message).toBe('event');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should set `platform` on events', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.platform).toBe('javascript');
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureEvent({ message: 'event' });
}));

it('should not dedupe an event on bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand All@@ -295,7 +304,7 @@ describe('SentryBrowser', () => {
});

it('should use inboundfilter rules of bound client', async () => {
const localBeforeSend = jest.fn();
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
Expand DownExpand Up@@ -374,7 +383,7 @@ describe('SentryBrowser initialization', () => {
});

it('uses SDK source from global for package name', () => {
const spy = jest.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
const spy = vi.spyOn(utils, 'getSDKSource').mockReturnValue('cdn');
init({ dsn });

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
Expand Down
6 changes: 4 additions & 2 deletions ...est/unit/integrations/breadcrumbs.test.ts → ...ser/test/integrations/breadcrumbs.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it, vi } from 'vitest';

import * as SentryCore from '@sentry/core';

import { BrowserClient, breadcrumbsIntegration, flush } from '../../../src';
import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';

describe('Breadcrumbs', () => {
Expand All@@ -14,7 +16,7 @@ describe('Breadcrumbs', () => {
SentryCore.setCurrentClient(client);
client.init();

const addBreadcrumbSpy = jest.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});
const addBreadcrumbSpy = vi.spyOn(SentryCore, 'addBreadcrumb').mockImplementation(() => {});

client.captureMessage('test');
await flush(2000);
Expand Down
4 changes: 3 additions & 1 deletion ...st/unit/integrations/contextlines.test.ts → ...er/test/integrations/contextlines.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { describe, expect, it } from 'vitest';

import type { StackFrame } from '@sentry/types';

import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';

const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
describe('ContextLines', () => {
Expand Down
Loading