test(vue): Switch to using vitest#12955

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
Jul 18, 2024
Merged

test(vue): Switch to using vitest #12955

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
6 changes: 0 additions & 6 deletions packages/vue/jest.config.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions packages/vue/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,8 @@
"clean": "rimraf build coverage sentry-vue-*.tgz",
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"test": "jest",
"test:watch": "jest --watch",
"test": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
18 changes: 10 additions & 8 deletions packages/vue/test/errorHandler.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, test, vi } from 'vitest';

import { setCurrentClient } from '@sentry/browser';

import { attachErrorHandler } from '../src/errorhandler';
Expand All@@ -7,7 +9,7 @@ import { generateComponentTrace } from '../src/vendor/components';
describe('attachErrorHandler', () => {
describe('attachProps', () => {
afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
});

describe("given I don't want to `attachProps`", () => {
Expand DownExpand Up@@ -325,21 +327,21 @@ const testHarness = ({
enableConsole,
vm,
}: TestHarnessOpts) => {
jest.useFakeTimers();
const providedErrorHandlerSpy = jest.fn();
const warnHandlerSpy = jest.fn();
const consoleErrorSpy = jest.fn();
vi.useFakeTimers();
const providedErrorHandlerSpy = vi.fn();
const warnHandlerSpy = vi.fn();
const consoleErrorSpy = vi.fn();

const client: any = {
captureException: jest.fn(async () => Promise.resolve()),
captureException: vi.fn(async () => Promise.resolve()),
};
setCurrentClient(client);

const app: Vue = {
config: {
silent: !!silent,
},
mixin: jest.fn(),
mixin: vi.fn(),
};

if (enableErrorHandler) {
Expand DownExpand Up@@ -380,7 +382,7 @@ const testHarness = ({
app.config.errorHandler(new DummyError(), vm, 'stub-lifecycle-hook');

// and waits for internal timers
jest.runAllTimers();
vi.runAllTimers();
},
expect: {
errorHandlerSpy: expect(providedErrorHandlerSpy),
Expand Down
18 changes: 12 additions & 6 deletions packages/vue/test/integration/VueIntegration.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
* @vitest-environment jsdom
*/

import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

import type { Client } from '@sentry/types';
import { logger } from '@sentry/utils';
import { createApp } from 'vue';
Expand All@@ -15,10 +21,10 @@ describe('Sentry.VueIntegration', () => {
const globalRequest = globalThis.Request;

beforeAll(() => {
globalThis.fetch = jest.fn();
globalThis.fetch = vi.fn();
// @ts-expect-error This is a mock
globalThis.Response = jest.fn();
globalThis.Request = jest.fn();
globalThis.Response = vi.fn();
globalThis.Request = vi.fn();
});

afterAll(() => {
Expand All@@ -31,17 +37,17 @@ describe('Sentry.VueIntegration', () => {
warnings = [];
loggerWarnings = [];

jest.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
loggerWarnings.push(message);
});

jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
warnings.push(message);
});
});

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

it('allows to initialize integration later', () => {
Expand Down
10 changes: 8 additions & 2 deletions packages/vue/test/integration/init.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
* @vitest-environment jsdom
*/

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

import { createApp } from 'vue';

import type { Client } from '@sentry/types';
Expand All@@ -11,13 +17,13 @@ describe('Sentry.init', () => {

beforeEach(() => {
warnings = [];
jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
warnings.push(message);
});
});

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

it('does not warn when correctly setup (Vue 3)', () => {
Expand Down
74 changes: 38 additions & 36 deletions packages/vue/test/router.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as SentryBrowser from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
Expand All@@ -6,21 +8,21 @@ import type { Span, SpanAttributes } from '@sentry/types';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';

const captureExceptionSpy = jest.spyOn(SentryBrowser, 'captureException');
jest.mock('@sentry/core', () => {
const actual = jest.requireActual('@sentry/core');
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
vi.mock('@sentry/core', async () => {
const actual = await vi.importActual('@sentry/core');
return {
...actual,
getActiveSpan: jest.fn().mockReturnValue({}),
getActiveSpan: vi.fn().mockReturnValue({}),
};
});

const mockVueRouter = {
onError: jest.fn<void, [(error: Error) => void]>(),
beforeEach: jest.fn<void, [(from: Route, to: Route, next?: () => void) => void]>(),
onError: vi.fn<[(error: Error) => void]>(),
beforeEach: vi.fn<[(from: Route, to: Route, next?: () => void) => void]>(),
};

const mockNext = jest.fn();
const mockNext = vi.fn();

const testRoutes: Record<string, Route> = {
initialPageloadRoute: { matched: [], params: {}, path: '', query: {} },
Expand DownExpand Up@@ -68,11 +70,11 @@ const testRoutes: Record<string, Route> = {

describe('instrumentVueRouter()', () => {
afterEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
});

it('should return instrumentation that instruments VueRouter.onError', () => {
const mockStartSpan = jest.fn();
const mockStartSpan = vi.fn();
instrumentVueRouter(
mockVueRouter,
{ routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -99,7 +101,7 @@ describe('instrumentVueRouter()', () => {
])(
'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for navigations',
(fromKey, toKey, transactionName, transactionSource) => {
const mockStartSpan = jest.fn();
const mockStartSpan = vi.fn();
instrumentVueRouter(
mockVueRouter,
{ routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -138,15 +140,15 @@ describe('instrumentVueRouter()', () => {
'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for pageloads',
(fromKey, toKey, transactionName, transactionSource) => {
const mockRootSpan = {
getSpanJSON: jest.fn().mockReturnValue({ op: 'pageload' }),
updateName: jest.fn(),
setAttribute: jest.fn(),
setAttributes: jest.fn(),
getSpanJSON: vi.fn().mockReturnValue({ op: 'pageload' }),
updateName: vi.fn(),
setAttribute: vi.fn(),
setAttributes: vi.fn(),
};

jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

const mockStartSpan = jest.fn().mockImplementation(_ => {
const mockStartSpan = vi.fn().mockImplementation(_ => {
return mockRootSpan;
});
instrumentVueRouter(
Expand DownExpand Up@@ -178,7 +180,7 @@ describe('instrumentVueRouter()', () => {
);

it('allows to configure routeLabel=path', () => {
const mockStartSpan = jest.fn();
const mockStartSpan = vi.fn();
instrumentVueRouter(
mockVueRouter,
{ routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -205,7 +207,7 @@ describe('instrumentVueRouter()', () => {
});

it('allows to configure routeLabel=name', () => {
const mockStartSpan = jest.fn();
const mockStartSpan = vi.fn();
instrumentVueRouter(
mockVueRouter,
{ routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -233,9 +235,9 @@ describe('instrumentVueRouter()', () => {

it("doesn't overwrite a pageload transaction name it was set to custom before the router resolved the route", () => {
const mockRootSpan = {
updateName: jest.fn(),
setAttribute: jest.fn(),
setAttributes: jest.fn(),
updateName: vi.fn(),
setAttribute: vi.fn(),
setAttributes: vi.fn(),
name: '',
getSpanJSON: () => ({
op: 'pageload',
Expand All@@ -244,10 +246,10 @@ describe('instrumentVueRouter()', () => {
},
}),
};
const mockStartSpan = jest.fn().mockImplementation(_ => {
const mockStartSpan = vi.fn().mockImplementation(_ => {
return mockRootSpan;
});
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

instrumentVueRouter(
mockVueRouter,
Expand DownExpand Up@@ -287,14 +289,14 @@ describe('instrumentVueRouter()', () => {
});

it("updates the scope's `transactionName` when a route is resolved", () => {
const mockStartSpan = jest.fn().mockImplementation(_ => {
const mockStartSpan = vi.fn().mockImplementation(_ => {
return {};
});

const scopeSetTransactionNameSpy = jest.fn();
const scopeSetTransactionNameSpy = vi.fn();

// @ts-expect-error - only creating a partial scope but that's fine
jest.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
vi.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
setTransactionName: scopeSetTransactionNameSpy,
}));

Expand All@@ -315,17 +317,17 @@ describe('instrumentVueRouter()', () => {
expect(scopeSetTransactionNameSpy).toHaveBeenCalledWith('/books/:bookId/chapter/:chapterId');
});

test.each([
it.each([
[false, 0],
[true, 1],
])(
'should return instrumentation that considers the instrumentPageLoad = %p',
(instrumentPageLoad, expectedCallsAmount) => {
const mockRootSpan = {
updateName: jest.fn(),
setData: jest.fn(),
setAttribute: jest.fn(),
setAttributes: jest.fn(),
updateName: vi.fn(),
setData: vi.fn(),
setAttribute: vi.fn(),
setAttributes: vi.fn(),
name: '',
getSpanJSON: () => ({
op: 'pageload',
Expand All@@ -334,9 +336,9 @@ describe('instrumentVueRouter()', () => {
},
}),
};
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

const mockStartSpan = jest.fn();
const mockStartSpan = vi.fn();
instrumentVueRouter(
mockVueRouter,
{ routeLabel: 'name', instrumentPageLoad, instrumentNavigation: true },
Expand All@@ -354,13 +356,13 @@ describe('instrumentVueRouter()', () => {
},
);

test.each([
it.each([
[false, 0],
[true, 1],
])(
'should return instrumentation that considers the instrumentNavigation = %p',
(instrumentNavigation, expectedCallsAmount) => {
const mockStartSpan = jest.fn();
const mockStartSpan = vi.fn();
instrumentVueRouter(
mockVueRouter,
{ routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation },
Expand All@@ -378,7 +380,7 @@ describe('instrumentVueRouter()', () => {
);

it("doesn't throw when `next` is not available in the beforeEach callback (Vue Router 4)", () => {
const mockStartSpan = jest.fn();
const mockStartSpan = vi.fn();
instrumentVueRouter(
mockVueRouter,
{ routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/test/vendor/components.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';

import { formatComponentName } from '../../src/vendor/components';

describe('formatComponentName', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/tsconfig.test.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
"extends": "./tsconfig.json",

"include": ["test/**/*"],
"include": ["test/**/*", "vite.config.ts"],

"compilerOptions": {
// should include all types from `./tsconfig.json` plus types for all test frameworks used
"types": ["jest"]
"types": []

// other package-specific, test-specific options
}
Expand Down
5 changes: 5 additions & 0 deletions packages/vue/vite.config.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 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(vue): Switch to using vitest#12955

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

Jul 18, 2024
 Merged


test(vue): Switch to using vitest
#12955
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


6 changes: 0 additions & 6 deletions
packages/vue/jest.config.js

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
packages/vue/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,8 @@
 "clean": "rimraf build coverage sentry-vue-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "jest",
 "test:watch": "jest --watch",
 "test": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

18 changes: 10 additions & 8 deletions
packages/vue/test/errorHandler.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, test, vi } from 'vitest';

import { setCurrentClient } from '@sentry/browser';

import { attachErrorHandler } from '../src/errorhandler';
Expand All@@ -7,7 +9,7 @@ import { generateComponentTrace } from '../src/vendor/components';
describe('attachErrorHandler', () => {
 describe('attachProps', () => {
 afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
 });

 describe("given I don't want to `attachProps`", () => {
Expand DownExpand Up@@ -325,21 +327,21 @@ const testHarness = ({
 enableConsole,
 vm,
}: TestHarnessOpts) => {
jest.useFakeTimers();
 const providedErrorHandlerSpy = jest.fn();
 const warnHandlerSpy = jest.fn();
 const consoleErrorSpy = jest.fn();
vi.useFakeTimers();
 const providedErrorHandlerSpy = vi.fn();
 const warnHandlerSpy = vi.fn();
 const consoleErrorSpy = vi.fn();

 const client: any = {
 captureException: jest.fn(async () => Promise.resolve()),
 captureException: vi.fn(async () => Promise.resolve()),
 };
 setCurrentClient(client);

 const app: Vue = {
 config: {
 silent: !!silent,
 },
 mixin: jest.fn(),
 mixin: vi.fn(),
 };

 if (enableErrorHandler) {
Expand DownExpand Up@@ -380,7 +382,7 @@ const testHarness = ({
 app.config.errorHandler(new DummyError(), vm, 'stub-lifecycle-hook');

 // and waits for internal timers
jest.runAllTimers();
vi.runAllTimers();
 },
 expect: {
 errorHandlerSpy: expect(providedErrorHandlerSpy),
Expand Down

18 changes: 12 additions & 6 deletions
packages/vue/test/integration/VueIntegration.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

import type { Client } from '@sentry/types';
import { logger } from '@sentry/utils';
import { createApp } from 'vue';
Expand All@@ -15,10 +21,10 @@ describe('Sentry.VueIntegration', () => {
 const globalRequest = globalThis.Request;

 beforeAll(() => {
 globalThis.fetch = jest.fn();
 globalThis.fetch = vi.fn();
 // @ts-expect-error This is a mock
 globalThis.Response = jest.fn();
 globalThis.Request = jest.fn();
 globalThis.Response = vi.fn();
 globalThis.Request = vi.fn();
 });

 afterAll(() => {
Expand All@@ -31,17 +37,17 @@ describe('Sentry.VueIntegration', () => {
 warnings = [];
 loggerWarnings = [];

jest.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
 loggerWarnings.push(message);
 });

jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('allows to initialize integration later', () => {
Expand Down

10 changes: 8 additions & 2 deletions
packages/vue/test/integration/init.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

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

import { createApp } from 'vue';

import type { Client } from '@sentry/types';
Expand All@@ -11,13 +17,13 @@ describe('Sentry.init', () => {

 beforeEach(() => {
 warnings = [];
jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('does not warn when correctly setup (Vue 3)', () => {
Expand Down

74 changes: 38 additions & 36 deletions
packages/vue/test/router.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as SentryBrowser from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
Expand All@@ -6,21 +8,21 @@ import type { Span, SpanAttributes } from '@sentry/types';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';

const captureExceptionSpy = jest.spyOn(SentryBrowser, 'captureException');
jest.mock('@sentry/core', () => {
 const actual = jest.requireActual('@sentry/core');
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
vi.mock('@sentry/core', async () => {
 const actual = await vi.importActual('@sentry/core');
 return {
 ...actual,
 getActiveSpan: jest.fn().mockReturnValue({}),
 getActiveSpan: vi.fn().mockReturnValue({}),
 };
});

const mockVueRouter = {
 onError: jest.fn<void, [(error: Error) => void]>(),
 beforeEach: jest.fn<void, [(from: Route, to: Route, next?: () => void) => void]>(),
 onError: vi.fn<[(error: Error) => void]>(),
 beforeEach: vi.fn<[(from: Route, to: Route, next?: () => void) => void]>(),
};

const mockNext = jest.fn();
const mockNext = vi.fn();

const testRoutes: Record<string, Route> = {
 initialPageloadRoute: { matched: [], params: {}, path: '', query: {} },
Expand DownExpand Up@@ -68,11 +70,11 @@ const testRoutes: Record<string, Route> = {

describe('instrumentVueRouter()', () => {
 afterEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
 });

 it('should return instrumentation that instruments VueRouter.onError', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -99,7 +101,7 @@ describe('instrumentVueRouter()', () => {
 ])(
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for navigations',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -138,15 +140,15 @@ describe('instrumentVueRouter()', () => {
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for pageloads',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockRootSpan = {
 getSpanJSON: jest.fn().mockReturnValue({ op: 'pageload' }),
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 getSpanJSON: vi.fn().mockReturnValue({ op: 'pageload' }),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 };

jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
 instrumentVueRouter(
Expand DownExpand Up@@ -178,7 +180,7 @@ describe('instrumentVueRouter()', () => {
 );

 it('allows to configure routeLabel=path', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -205,7 +207,7 @@ describe('instrumentVueRouter()', () => {
 });

 it('allows to configure routeLabel=name', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -233,9 +235,9 @@ describe('instrumentVueRouter()', () => {

 it("doesn't overwrite a pageload transaction name it was set to custom before the router resolved the route", () => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -244,10 +246,10 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 instrumentVueRouter(
 mockVueRouter,
Expand DownExpand Up@@ -287,14 +289,14 @@ describe('instrumentVueRouter()', () => {
 });

 it("updates the scope's `transactionName` when a route is resolved", () => {
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return {};
 });

 const scopeSetTransactionNameSpy = jest.fn();
 const scopeSetTransactionNameSpy = vi.fn();

 // @ts-expect-error - only creating a partial scope but that's fine
jest.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
vi.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
 setTransactionName: scopeSetTransactionNameSpy,
 }));

Expand All@@ -315,17 +317,17 @@ describe('instrumentVueRouter()', () => {
 expect(scopeSetTransactionNameSpy).toHaveBeenCalledWith('/books/:bookId/chapter/:chapterId');
 });

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentPageLoad = %p',
 (instrumentPageLoad, expectedCallsAmount) => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setData: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setData: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -334,9 +336,9 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad, instrumentNavigation: true },
Expand All@@ -354,13 +356,13 @@ describe('instrumentVueRouter()', () => {
 },
 );

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentNavigation = %p',
 (instrumentNavigation, expectedCallsAmount) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation },
Expand All@@ -378,7 +380,7 @@ describe('instrumentVueRouter()', () => {
 );

 it("doesn't throw when `next` is not available in the beforeEach callback (Vue Router 4)", () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand Down

2 changes: 2 additions & 0 deletions
packages/vue/test/vendor/components.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';

import { formatComponentName } from '../../src/vendor/components';

describe('formatComponentName', () => {
Expand Down

4 changes: 2 additions & 2 deletions
packages/vue/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "extends": "./tsconfig.json",

 "include": ["test/**/*"],
 "include": ["test/**/*", "vite.config.ts"],

 "compilerOptions": {
 // should include all types from `./tsconfig.json` plus types for all test frameworks used
 "types": ["jest"]
 "types": []

 // other package-specific, test-specific options
 }
Expand Down

5 changes: 5 additions & 0 deletions
packages/vue/vite.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import baseConfig from '../../vite/vite.config';

export default {
 ...baseConfig,
};

, '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(vue): Switch to using vitest#12955

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

Jul 18, 2024
 Merged


test(vue): Switch to using vitest
#12955
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


6 changes: 0 additions & 6 deletions
packages/vue/jest.config.js

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
packages/vue/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,8 @@
 "clean": "rimraf build coverage sentry-vue-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "jest",
 "test:watch": "jest --watch",
 "test": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

18 changes: 10 additions & 8 deletions
packages/vue/test/errorHandler.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, test, vi } from 'vitest';

import { setCurrentClient } from '@sentry/browser';

import { attachErrorHandler } from '../src/errorhandler';
Expand All@@ -7,7 +9,7 @@ import { generateComponentTrace } from '../src/vendor/components';
describe('attachErrorHandler', () => {
 describe('attachProps', () => {
 afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
 });

 describe("given I don't want to `attachProps`", () => {
Expand DownExpand Up@@ -325,21 +327,21 @@ const testHarness = ({
 enableConsole,
 vm,
}: TestHarnessOpts) => {
jest.useFakeTimers();
 const providedErrorHandlerSpy = jest.fn();
 const warnHandlerSpy = jest.fn();
 const consoleErrorSpy = jest.fn();
vi.useFakeTimers();
 const providedErrorHandlerSpy = vi.fn();
 const warnHandlerSpy = vi.fn();
 const consoleErrorSpy = vi.fn();

 const client: any = {
 captureException: jest.fn(async () => Promise.resolve()),
 captureException: vi.fn(async () => Promise.resolve()),
 };
 setCurrentClient(client);

 const app: Vue = {
 config: {
 silent: !!silent,
 },
 mixin: jest.fn(),
 mixin: vi.fn(),
 };

 if (enableErrorHandler) {
Expand DownExpand Up@@ -380,7 +382,7 @@ const testHarness = ({
 app.config.errorHandler(new DummyError(), vm, 'stub-lifecycle-hook');

 // and waits for internal timers
jest.runAllTimers();
vi.runAllTimers();
 },
 expect: {
 errorHandlerSpy: expect(providedErrorHandlerSpy),
Expand Down

18 changes: 12 additions & 6 deletions
packages/vue/test/integration/VueIntegration.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

import type { Client } from '@sentry/types';
import { logger } from '@sentry/utils';
import { createApp } from 'vue';
Expand All@@ -15,10 +21,10 @@ describe('Sentry.VueIntegration', () => {
 const globalRequest = globalThis.Request;

 beforeAll(() => {
 globalThis.fetch = jest.fn();
 globalThis.fetch = vi.fn();
 // @ts-expect-error This is a mock
 globalThis.Response = jest.fn();
 globalThis.Request = jest.fn();
 globalThis.Response = vi.fn();
 globalThis.Request = vi.fn();
 });

 afterAll(() => {
Expand All@@ -31,17 +37,17 @@ describe('Sentry.VueIntegration', () => {
 warnings = [];
 loggerWarnings = [];

jest.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
 loggerWarnings.push(message);
 });

jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('allows to initialize integration later', () => {
Expand Down

10 changes: 8 additions & 2 deletions
packages/vue/test/integration/init.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

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

import { createApp } from 'vue';

import type { Client } from '@sentry/types';
Expand All@@ -11,13 +17,13 @@ describe('Sentry.init', () => {

 beforeEach(() => {
 warnings = [];
jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('does not warn when correctly setup (Vue 3)', () => {
Expand Down

74 changes: 38 additions & 36 deletions
packages/vue/test/router.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as SentryBrowser from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
Expand All@@ -6,21 +8,21 @@ import type { Span, SpanAttributes } from '@sentry/types';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';

const captureExceptionSpy = jest.spyOn(SentryBrowser, 'captureException');
jest.mock('@sentry/core', () => {
 const actual = jest.requireActual('@sentry/core');
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
vi.mock('@sentry/core', async () => {
 const actual = await vi.importActual('@sentry/core');
 return {
 ...actual,
 getActiveSpan: jest.fn().mockReturnValue({}),
 getActiveSpan: vi.fn().mockReturnValue({}),
 };
});

const mockVueRouter = {
 onError: jest.fn<void, [(error: Error) => void]>(),
 beforeEach: jest.fn<void, [(from: Route, to: Route, next?: () => void) => void]>(),
 onError: vi.fn<[(error: Error) => void]>(),
 beforeEach: vi.fn<[(from: Route, to: Route, next?: () => void) => void]>(),
};

const mockNext = jest.fn();
const mockNext = vi.fn();

const testRoutes: Record<string, Route> = {
 initialPageloadRoute: { matched: [], params: {}, path: '', query: {} },
Expand DownExpand Up@@ -68,11 +70,11 @@ const testRoutes: Record<string, Route> = {

describe('instrumentVueRouter()', () => {
 afterEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
 });

 it('should return instrumentation that instruments VueRouter.onError', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -99,7 +101,7 @@ describe('instrumentVueRouter()', () => {
 ])(
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for navigations',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -138,15 +140,15 @@ describe('instrumentVueRouter()', () => {
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for pageloads',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockRootSpan = {
 getSpanJSON: jest.fn().mockReturnValue({ op: 'pageload' }),
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 getSpanJSON: vi.fn().mockReturnValue({ op: 'pageload' }),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 };

jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
 instrumentVueRouter(
Expand DownExpand Up@@ -178,7 +180,7 @@ describe('instrumentVueRouter()', () => {
 );

 it('allows to configure routeLabel=path', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -205,7 +207,7 @@ describe('instrumentVueRouter()', () => {
 });

 it('allows to configure routeLabel=name', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -233,9 +235,9 @@ describe('instrumentVueRouter()', () => {

 it("doesn't overwrite a pageload transaction name it was set to custom before the router resolved the route", () => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -244,10 +246,10 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 instrumentVueRouter(
 mockVueRouter,
Expand DownExpand Up@@ -287,14 +289,14 @@ describe('instrumentVueRouter()', () => {
 });

 it("updates the scope's `transactionName` when a route is resolved", () => {
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return {};
 });

 const scopeSetTransactionNameSpy = jest.fn();
 const scopeSetTransactionNameSpy = vi.fn();

 // @ts-expect-error - only creating a partial scope but that's fine
jest.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
vi.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
 setTransactionName: scopeSetTransactionNameSpy,
 }));

Expand All@@ -315,17 +317,17 @@ describe('instrumentVueRouter()', () => {
 expect(scopeSetTransactionNameSpy).toHaveBeenCalledWith('/books/:bookId/chapter/:chapterId');
 });

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentPageLoad = %p',
 (instrumentPageLoad, expectedCallsAmount) => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setData: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setData: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -334,9 +336,9 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad, instrumentNavigation: true },
Expand All@@ -354,13 +356,13 @@ describe('instrumentVueRouter()', () => {
 },
 );

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentNavigation = %p',
 (instrumentNavigation, expectedCallsAmount) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation },
Expand All@@ -378,7 +380,7 @@ describe('instrumentVueRouter()', () => {
 );

 it("doesn't throw when `next` is not available in the beforeEach callback (Vue Router 4)", () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand Down

2 changes: 2 additions & 0 deletions
packages/vue/test/vendor/components.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';

import { formatComponentName } from '../../src/vendor/components';

describe('formatComponentName', () => {
Expand Down

4 changes: 2 additions & 2 deletions
packages/vue/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "extends": "./tsconfig.json",

 "include": ["test/**/*"],
 "include": ["test/**/*", "vite.config.ts"],

 "compilerOptions": {
 // should include all types from `./tsconfig.json` plus types for all test frameworks used
 "types": ["jest"]
 "types": []

 // other package-specific, test-specific options
 }
Expand Down

5 changes: 5 additions & 0 deletions
packages/vue/vite.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import baseConfig from '../../vite/vite.config';

export default {
 ...baseConfig,
};

, '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 > 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(vue): Switch to using vitest#12955

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

Jul 18, 2024
 Merged


test(vue): Switch to using vitest
#12955
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


6 changes: 0 additions & 6 deletions
packages/vue/jest.config.js

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
packages/vue/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,8 @@
 "clean": "rimraf build coverage sentry-vue-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "jest",
 "test:watch": "jest --watch",
 "test": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

18 changes: 10 additions & 8 deletions
packages/vue/test/errorHandler.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, test, vi } from 'vitest';

import { setCurrentClient } from '@sentry/browser';

import { attachErrorHandler } from '../src/errorhandler';
Expand All@@ -7,7 +9,7 @@ import { generateComponentTrace } from '../src/vendor/components';
describe('attachErrorHandler', () => {
 describe('attachProps', () => {
 afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
 });

 describe("given I don't want to `attachProps`", () => {
Expand DownExpand Up@@ -325,21 +327,21 @@ const testHarness = ({
 enableConsole,
 vm,
}: TestHarnessOpts) => {
jest.useFakeTimers();
 const providedErrorHandlerSpy = jest.fn();
 const warnHandlerSpy = jest.fn();
 const consoleErrorSpy = jest.fn();
vi.useFakeTimers();
 const providedErrorHandlerSpy = vi.fn();
 const warnHandlerSpy = vi.fn();
 const consoleErrorSpy = vi.fn();

 const client: any = {
 captureException: jest.fn(async () => Promise.resolve()),
 captureException: vi.fn(async () => Promise.resolve()),
 };
 setCurrentClient(client);

 const app: Vue = {
 config: {
 silent: !!silent,
 },
 mixin: jest.fn(),
 mixin: vi.fn(),
 };

 if (enableErrorHandler) {
Expand DownExpand Up@@ -380,7 +382,7 @@ const testHarness = ({
 app.config.errorHandler(new DummyError(), vm, 'stub-lifecycle-hook');

 // and waits for internal timers
jest.runAllTimers();
vi.runAllTimers();
 },
 expect: {
 errorHandlerSpy: expect(providedErrorHandlerSpy),
Expand Down

18 changes: 12 additions & 6 deletions
packages/vue/test/integration/VueIntegration.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

import type { Client } from '@sentry/types';
import { logger } from '@sentry/utils';
import { createApp } from 'vue';
Expand All@@ -15,10 +21,10 @@ describe('Sentry.VueIntegration', () => {
 const globalRequest = globalThis.Request;

 beforeAll(() => {
 globalThis.fetch = jest.fn();
 globalThis.fetch = vi.fn();
 // @ts-expect-error This is a mock
 globalThis.Response = jest.fn();
 globalThis.Request = jest.fn();
 globalThis.Response = vi.fn();
 globalThis.Request = vi.fn();
 });

 afterAll(() => {
Expand All@@ -31,17 +37,17 @@ describe('Sentry.VueIntegration', () => {
 warnings = [];
 loggerWarnings = [];

jest.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
 loggerWarnings.push(message);
 });

jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('allows to initialize integration later', () => {
Expand Down

10 changes: 8 additions & 2 deletions
packages/vue/test/integration/init.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

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

import { createApp } from 'vue';

import type { Client } from '@sentry/types';
Expand All@@ -11,13 +17,13 @@ describe('Sentry.init', () => {

 beforeEach(() => {
 warnings = [];
jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('does not warn when correctly setup (Vue 3)', () => {
Expand Down

74 changes: 38 additions & 36 deletions
packages/vue/test/router.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as SentryBrowser from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
Expand All@@ -6,21 +8,21 @@ import type { Span, SpanAttributes } from '@sentry/types';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';

const captureExceptionSpy = jest.spyOn(SentryBrowser, 'captureException');
jest.mock('@sentry/core', () => {
 const actual = jest.requireActual('@sentry/core');
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
vi.mock('@sentry/core', async () => {
 const actual = await vi.importActual('@sentry/core');
 return {
 ...actual,
 getActiveSpan: jest.fn().mockReturnValue({}),
 getActiveSpan: vi.fn().mockReturnValue({}),
 };
});

const mockVueRouter = {
 onError: jest.fn<void, [(error: Error) => void]>(),
 beforeEach: jest.fn<void, [(from: Route, to: Route, next?: () => void) => void]>(),
 onError: vi.fn<[(error: Error) => void]>(),
 beforeEach: vi.fn<[(from: Route, to: Route, next?: () => void) => void]>(),
};

const mockNext = jest.fn();
const mockNext = vi.fn();

const testRoutes: Record<string, Route> = {
 initialPageloadRoute: { matched: [], params: {}, path: '', query: {} },
Expand DownExpand Up@@ -68,11 +70,11 @@ const testRoutes: Record<string, Route> = {

describe('instrumentVueRouter()', () => {
 afterEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
 });

 it('should return instrumentation that instruments VueRouter.onError', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -99,7 +101,7 @@ describe('instrumentVueRouter()', () => {
 ])(
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for navigations',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -138,15 +140,15 @@ describe('instrumentVueRouter()', () => {
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for pageloads',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockRootSpan = {
 getSpanJSON: jest.fn().mockReturnValue({ op: 'pageload' }),
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 getSpanJSON: vi.fn().mockReturnValue({ op: 'pageload' }),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 };

jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
 instrumentVueRouter(
Expand DownExpand Up@@ -178,7 +180,7 @@ describe('instrumentVueRouter()', () => {
 );

 it('allows to configure routeLabel=path', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -205,7 +207,7 @@ describe('instrumentVueRouter()', () => {
 });

 it('allows to configure routeLabel=name', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -233,9 +235,9 @@ describe('instrumentVueRouter()', () => {

 it("doesn't overwrite a pageload transaction name it was set to custom before the router resolved the route", () => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -244,10 +246,10 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 instrumentVueRouter(
 mockVueRouter,
Expand DownExpand Up@@ -287,14 +289,14 @@ describe('instrumentVueRouter()', () => {
 });

 it("updates the scope's `transactionName` when a route is resolved", () => {
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return {};
 });

 const scopeSetTransactionNameSpy = jest.fn();
 const scopeSetTransactionNameSpy = vi.fn();

 // @ts-expect-error - only creating a partial scope but that's fine
jest.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
vi.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
 setTransactionName: scopeSetTransactionNameSpy,
 }));

Expand All@@ -315,17 +317,17 @@ describe('instrumentVueRouter()', () => {
 expect(scopeSetTransactionNameSpy).toHaveBeenCalledWith('/books/:bookId/chapter/:chapterId');
 });

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentPageLoad = %p',
 (instrumentPageLoad, expectedCallsAmount) => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setData: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setData: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -334,9 +336,9 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad, instrumentNavigation: true },
Expand All@@ -354,13 +356,13 @@ describe('instrumentVueRouter()', () => {
 },
 );

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentNavigation = %p',
 (instrumentNavigation, expectedCallsAmount) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation },
Expand All@@ -378,7 +380,7 @@ describe('instrumentVueRouter()', () => {
 );

 it("doesn't throw when `next` is not available in the beforeEach callback (Vue Router 4)", () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand Down

2 changes: 2 additions & 0 deletions
packages/vue/test/vendor/components.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';

import { formatComponentName } from '../../src/vendor/components';

describe('formatComponentName', () => {
Expand Down

4 changes: 2 additions & 2 deletions
packages/vue/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "extends": "./tsconfig.json",

 "include": ["test/**/*"],
 "include": ["test/**/*", "vite.config.ts"],

 "compilerOptions": {
 // should include all types from `./tsconfig.json` plus types for all test frameworks used
 "types": ["jest"]
 "types": []

 // other package-specific, test-specific options
 }
Expand Down

5 changes: 5 additions & 0 deletions
packages/vue/vite.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import baseConfig from '../../vite/vite.config';

export default {
 ...baseConfig,
};

, '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(vue): Switch to using vitest#12955

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

Jul 18, 2024
 Merged


test(vue): Switch to using vitest
#12955
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


6 changes: 0 additions & 6 deletions
packages/vue/jest.config.js

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
packages/vue/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,8 @@
 "clean": "rimraf build coverage sentry-vue-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "jest",
 "test:watch": "jest --watch",
 "test": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

18 changes: 10 additions & 8 deletions
packages/vue/test/errorHandler.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, test, vi } from 'vitest';

import { setCurrentClient } from '@sentry/browser';

import { attachErrorHandler } from '../src/errorhandler';
Expand All@@ -7,7 +9,7 @@ import { generateComponentTrace } from '../src/vendor/components';
describe('attachErrorHandler', () => {
 describe('attachProps', () => {
 afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
 });

 describe("given I don't want to `attachProps`", () => {
Expand DownExpand Up@@ -325,21 +327,21 @@ const testHarness = ({
 enableConsole,
 vm,
}: TestHarnessOpts) => {
jest.useFakeTimers();
 const providedErrorHandlerSpy = jest.fn();
 const warnHandlerSpy = jest.fn();
 const consoleErrorSpy = jest.fn();
vi.useFakeTimers();
 const providedErrorHandlerSpy = vi.fn();
 const warnHandlerSpy = vi.fn();
 const consoleErrorSpy = vi.fn();

 const client: any = {
 captureException: jest.fn(async () => Promise.resolve()),
 captureException: vi.fn(async () => Promise.resolve()),
 };
 setCurrentClient(client);

 const app: Vue = {
 config: {
 silent: !!silent,
 },
 mixin: jest.fn(),
 mixin: vi.fn(),
 };

 if (enableErrorHandler) {
Expand DownExpand Up@@ -380,7 +382,7 @@ const testHarness = ({
 app.config.errorHandler(new DummyError(), vm, 'stub-lifecycle-hook');

 // and waits for internal timers
jest.runAllTimers();
vi.runAllTimers();
 },
 expect: {
 errorHandlerSpy: expect(providedErrorHandlerSpy),
Expand Down

18 changes: 12 additions & 6 deletions
packages/vue/test/integration/VueIntegration.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

import type { Client } from '@sentry/types';
import { logger } from '@sentry/utils';
import { createApp } from 'vue';
Expand All@@ -15,10 +21,10 @@ describe('Sentry.VueIntegration', () => {
 const globalRequest = globalThis.Request;

 beforeAll(() => {
 globalThis.fetch = jest.fn();
 globalThis.fetch = vi.fn();
 // @ts-expect-error This is a mock
 globalThis.Response = jest.fn();
 globalThis.Request = jest.fn();
 globalThis.Response = vi.fn();
 globalThis.Request = vi.fn();
 });

 afterAll(() => {
Expand All@@ -31,17 +37,17 @@ describe('Sentry.VueIntegration', () => {
 warnings = [];
 loggerWarnings = [];

jest.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
 loggerWarnings.push(message);
 });

jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('allows to initialize integration later', () => {
Expand Down

10 changes: 8 additions & 2 deletions
packages/vue/test/integration/init.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

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

import { createApp } from 'vue';

import type { Client } from '@sentry/types';
Expand All@@ -11,13 +17,13 @@ describe('Sentry.init', () => {

 beforeEach(() => {
 warnings = [];
jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('does not warn when correctly setup (Vue 3)', () => {
Expand Down

74 changes: 38 additions & 36 deletions
packages/vue/test/router.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as SentryBrowser from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
Expand All@@ -6,21 +8,21 @@ import type { Span, SpanAttributes } from '@sentry/types';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';

const captureExceptionSpy = jest.spyOn(SentryBrowser, 'captureException');
jest.mock('@sentry/core', () => {
 const actual = jest.requireActual('@sentry/core');
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
vi.mock('@sentry/core', async () => {
 const actual = await vi.importActual('@sentry/core');
 return {
 ...actual,
 getActiveSpan: jest.fn().mockReturnValue({}),
 getActiveSpan: vi.fn().mockReturnValue({}),
 };
});

const mockVueRouter = {
 onError: jest.fn<void, [(error: Error) => void]>(),
 beforeEach: jest.fn<void, [(from: Route, to: Route, next?: () => void) => void]>(),
 onError: vi.fn<[(error: Error) => void]>(),
 beforeEach: vi.fn<[(from: Route, to: Route, next?: () => void) => void]>(),
};

const mockNext = jest.fn();
const mockNext = vi.fn();

const testRoutes: Record<string, Route> = {
 initialPageloadRoute: { matched: [], params: {}, path: '', query: {} },
Expand DownExpand Up@@ -68,11 +70,11 @@ const testRoutes: Record<string, Route> = {

describe('instrumentVueRouter()', () => {
 afterEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
 });

 it('should return instrumentation that instruments VueRouter.onError', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -99,7 +101,7 @@ describe('instrumentVueRouter()', () => {
 ])(
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for navigations',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -138,15 +140,15 @@ describe('instrumentVueRouter()', () => {
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for pageloads',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockRootSpan = {
 getSpanJSON: jest.fn().mockReturnValue({ op: 'pageload' }),
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 getSpanJSON: vi.fn().mockReturnValue({ op: 'pageload' }),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 };

jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
 instrumentVueRouter(
Expand DownExpand Up@@ -178,7 +180,7 @@ describe('instrumentVueRouter()', () => {
 );

 it('allows to configure routeLabel=path', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -205,7 +207,7 @@ describe('instrumentVueRouter()', () => {
 });

 it('allows to configure routeLabel=name', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -233,9 +235,9 @@ describe('instrumentVueRouter()', () => {

 it("doesn't overwrite a pageload transaction name it was set to custom before the router resolved the route", () => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -244,10 +246,10 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 instrumentVueRouter(
 mockVueRouter,
Expand DownExpand Up@@ -287,14 +289,14 @@ describe('instrumentVueRouter()', () => {
 });

 it("updates the scope's `transactionName` when a route is resolved", () => {
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return {};
 });

 const scopeSetTransactionNameSpy = jest.fn();
 const scopeSetTransactionNameSpy = vi.fn();

 // @ts-expect-error - only creating a partial scope but that's fine
jest.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
vi.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
 setTransactionName: scopeSetTransactionNameSpy,
 }));

Expand All@@ -315,17 +317,17 @@ describe('instrumentVueRouter()', () => {
 expect(scopeSetTransactionNameSpy).toHaveBeenCalledWith('/books/:bookId/chapter/:chapterId');
 });

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentPageLoad = %p',
 (instrumentPageLoad, expectedCallsAmount) => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setData: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setData: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -334,9 +336,9 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad, instrumentNavigation: true },
Expand All@@ -354,13 +356,13 @@ describe('instrumentVueRouter()', () => {
 },
 );

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentNavigation = %p',
 (instrumentNavigation, expectedCallsAmount) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation },
Expand All@@ -378,7 +380,7 @@ describe('instrumentVueRouter()', () => {
 );

 it("doesn't throw when `next` is not available in the beforeEach callback (Vue Router 4)", () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand Down

2 changes: 2 additions & 0 deletions
packages/vue/test/vendor/components.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';

import { formatComponentName } from '../../src/vendor/components';

describe('formatComponentName', () => {
Expand Down

4 changes: 2 additions & 2 deletions
packages/vue/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "extends": "./tsconfig.json",

 "include": ["test/**/*"],
 "include": ["test/**/*", "vite.config.ts"],

 "compilerOptions": {
 // should include all types from `./tsconfig.json` plus types for all test frameworks used
 "types": ["jest"]
 "types": []

 // other package-specific, test-specific options
 }
Expand Down

5 changes: 5 additions & 0 deletions
packages/vue/vite.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import baseConfig from '../../vite/vite.config';

export default {
 ...baseConfig,
};

, '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(vue): Switch to using vitest#12955

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

Jul 18, 2024
 Merged


test(vue): Switch to using vitest
#12955
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


6 changes: 0 additions & 6 deletions
packages/vue/jest.config.js

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
packages/vue/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,8 @@
 "clean": "rimraf build coverage sentry-vue-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "jest",
 "test:watch": "jest --watch",
 "test": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

18 changes: 10 additions & 8 deletions
packages/vue/test/errorHandler.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, test, vi } from 'vitest';

import { setCurrentClient } from '@sentry/browser';

import { attachErrorHandler } from '../src/errorhandler';
Expand All@@ -7,7 +9,7 @@ import { generateComponentTrace } from '../src/vendor/components';
describe('attachErrorHandler', () => {
 describe('attachProps', () => {
 afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
 });

 describe("given I don't want to `attachProps`", () => {
Expand DownExpand Up@@ -325,21 +327,21 @@ const testHarness = ({
 enableConsole,
 vm,
}: TestHarnessOpts) => {
jest.useFakeTimers();
 const providedErrorHandlerSpy = jest.fn();
 const warnHandlerSpy = jest.fn();
 const consoleErrorSpy = jest.fn();
vi.useFakeTimers();
 const providedErrorHandlerSpy = vi.fn();
 const warnHandlerSpy = vi.fn();
 const consoleErrorSpy = vi.fn();

 const client: any = {
 captureException: jest.fn(async () => Promise.resolve()),
 captureException: vi.fn(async () => Promise.resolve()),
 };
 setCurrentClient(client);

 const app: Vue = {
 config: {
 silent: !!silent,
 },
 mixin: jest.fn(),
 mixin: vi.fn(),
 };

 if (enableErrorHandler) {
Expand DownExpand Up@@ -380,7 +382,7 @@ const testHarness = ({
 app.config.errorHandler(new DummyError(), vm, 'stub-lifecycle-hook');

 // and waits for internal timers
jest.runAllTimers();
vi.runAllTimers();
 },
 expect: {
 errorHandlerSpy: expect(providedErrorHandlerSpy),
Expand Down

18 changes: 12 additions & 6 deletions
packages/vue/test/integration/VueIntegration.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

import type { Client } from '@sentry/types';
import { logger } from '@sentry/utils';
import { createApp } from 'vue';
Expand All@@ -15,10 +21,10 @@ describe('Sentry.VueIntegration', () => {
 const globalRequest = globalThis.Request;

 beforeAll(() => {
 globalThis.fetch = jest.fn();
 globalThis.fetch = vi.fn();
 // @ts-expect-error This is a mock
 globalThis.Response = jest.fn();
 globalThis.Request = jest.fn();
 globalThis.Response = vi.fn();
 globalThis.Request = vi.fn();
 });

 afterAll(() => {
Expand All@@ -31,17 +37,17 @@ describe('Sentry.VueIntegration', () => {
 warnings = [];
 loggerWarnings = [];

jest.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
 loggerWarnings.push(message);
 });

jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('allows to initialize integration later', () => {
Expand Down

10 changes: 8 additions & 2 deletions
packages/vue/test/integration/init.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

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

import { createApp } from 'vue';

import type { Client } from '@sentry/types';
Expand All@@ -11,13 +17,13 @@ describe('Sentry.init', () => {

 beforeEach(() => {
 warnings = [];
jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('does not warn when correctly setup (Vue 3)', () => {
Expand Down

74 changes: 38 additions & 36 deletions
packages/vue/test/router.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as SentryBrowser from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
Expand All@@ -6,21 +8,21 @@ import type { Span, SpanAttributes } from '@sentry/types';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';

const captureExceptionSpy = jest.spyOn(SentryBrowser, 'captureException');
jest.mock('@sentry/core', () => {
 const actual = jest.requireActual('@sentry/core');
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
vi.mock('@sentry/core', async () => {
 const actual = await vi.importActual('@sentry/core');
 return {
 ...actual,
 getActiveSpan: jest.fn().mockReturnValue({}),
 getActiveSpan: vi.fn().mockReturnValue({}),
 };
});

const mockVueRouter = {
 onError: jest.fn<void, [(error: Error) => void]>(),
 beforeEach: jest.fn<void, [(from: Route, to: Route, next?: () => void) => void]>(),
 onError: vi.fn<[(error: Error) => void]>(),
 beforeEach: vi.fn<[(from: Route, to: Route, next?: () => void) => void]>(),
};

const mockNext = jest.fn();
const mockNext = vi.fn();

const testRoutes: Record<string, Route> = {
 initialPageloadRoute: { matched: [], params: {}, path: '', query: {} },
Expand DownExpand Up@@ -68,11 +70,11 @@ const testRoutes: Record<string, Route> = {

describe('instrumentVueRouter()', () => {
 afterEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
 });

 it('should return instrumentation that instruments VueRouter.onError', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -99,7 +101,7 @@ describe('instrumentVueRouter()', () => {
 ])(
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for navigations',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -138,15 +140,15 @@ describe('instrumentVueRouter()', () => {
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for pageloads',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockRootSpan = {
 getSpanJSON: jest.fn().mockReturnValue({ op: 'pageload' }),
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 getSpanJSON: vi.fn().mockReturnValue({ op: 'pageload' }),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 };

jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
 instrumentVueRouter(
Expand DownExpand Up@@ -178,7 +180,7 @@ describe('instrumentVueRouter()', () => {
 );

 it('allows to configure routeLabel=path', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -205,7 +207,7 @@ describe('instrumentVueRouter()', () => {
 });

 it('allows to configure routeLabel=name', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -233,9 +235,9 @@ describe('instrumentVueRouter()', () => {

 it("doesn't overwrite a pageload transaction name it was set to custom before the router resolved the route", () => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -244,10 +246,10 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 instrumentVueRouter(
 mockVueRouter,
Expand DownExpand Up@@ -287,14 +289,14 @@ describe('instrumentVueRouter()', () => {
 });

 it("updates the scope's `transactionName` when a route is resolved", () => {
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return {};
 });

 const scopeSetTransactionNameSpy = jest.fn();
 const scopeSetTransactionNameSpy = vi.fn();

 // @ts-expect-error - only creating a partial scope but that's fine
jest.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
vi.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
 setTransactionName: scopeSetTransactionNameSpy,
 }));

Expand All@@ -315,17 +317,17 @@ describe('instrumentVueRouter()', () => {
 expect(scopeSetTransactionNameSpy).toHaveBeenCalledWith('/books/:bookId/chapter/:chapterId');
 });

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentPageLoad = %p',
 (instrumentPageLoad, expectedCallsAmount) => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setData: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setData: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -334,9 +336,9 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad, instrumentNavigation: true },
Expand All@@ -354,13 +356,13 @@ describe('instrumentVueRouter()', () => {
 },
 );

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentNavigation = %p',
 (instrumentNavigation, expectedCallsAmount) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation },
Expand All@@ -378,7 +380,7 @@ describe('instrumentVueRouter()', () => {
 );

 it("doesn't throw when `next` is not available in the beforeEach callback (Vue Router 4)", () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand Down

2 changes: 2 additions & 0 deletions
packages/vue/test/vendor/components.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';

import { formatComponentName } from '../../src/vendor/components';

describe('formatComponentName', () => {
Expand Down

4 changes: 2 additions & 2 deletions
packages/vue/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "extends": "./tsconfig.json",

 "include": ["test/**/*"],
 "include": ["test/**/*", "vite.config.ts"],

 "compilerOptions": {
 // should include all types from `./tsconfig.json` plus types for all test frameworks used
 "types": ["jest"]
 "types": []

 // other package-specific, test-specific options
 }
Expand Down

5 changes: 5 additions & 0 deletions
packages/vue/vite.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import baseConfig from '../../vite/vite.config';

export default {
 ...baseConfig,
};

, '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(vue): Switch to using vitest#12955

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

Jul 18, 2024
 Merged


test(vue): Switch to using vitest
#12955
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


6 changes: 0 additions & 6 deletions
packages/vue/jest.config.js

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
packages/vue/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,8 @@
 "clean": "rimraf build coverage sentry-vue-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "jest",
 "test:watch": "jest --watch",
 "test": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

18 changes: 10 additions & 8 deletions
packages/vue/test/errorHandler.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, test, vi } from 'vitest';

import { setCurrentClient } from '@sentry/browser';

import { attachErrorHandler } from '../src/errorhandler';
Expand All@@ -7,7 +9,7 @@ import { generateComponentTrace } from '../src/vendor/components';
describe('attachErrorHandler', () => {
 describe('attachProps', () => {
 afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
 });

 describe("given I don't want to `attachProps`", () => {
Expand DownExpand Up@@ -325,21 +327,21 @@ const testHarness = ({
 enableConsole,
 vm,
}: TestHarnessOpts) => {
jest.useFakeTimers();
 const providedErrorHandlerSpy = jest.fn();
 const warnHandlerSpy = jest.fn();
 const consoleErrorSpy = jest.fn();
vi.useFakeTimers();
 const providedErrorHandlerSpy = vi.fn();
 const warnHandlerSpy = vi.fn();
 const consoleErrorSpy = vi.fn();

 const client: any = {
 captureException: jest.fn(async () => Promise.resolve()),
 captureException: vi.fn(async () => Promise.resolve()),
 };
 setCurrentClient(client);

 const app: Vue = {
 config: {
 silent: !!silent,
 },
 mixin: jest.fn(),
 mixin: vi.fn(),
 };

 if (enableErrorHandler) {
Expand DownExpand Up@@ -380,7 +382,7 @@ const testHarness = ({
 app.config.errorHandler(new DummyError(), vm, 'stub-lifecycle-hook');

 // and waits for internal timers
jest.runAllTimers();
vi.runAllTimers();
 },
 expect: {
 errorHandlerSpy: expect(providedErrorHandlerSpy),
Expand Down

18 changes: 12 additions & 6 deletions
packages/vue/test/integration/VueIntegration.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

import type { Client } from '@sentry/types';
import { logger } from '@sentry/utils';
import { createApp } from 'vue';
Expand All@@ -15,10 +21,10 @@ describe('Sentry.VueIntegration', () => {
 const globalRequest = globalThis.Request;

 beforeAll(() => {
 globalThis.fetch = jest.fn();
 globalThis.fetch = vi.fn();
 // @ts-expect-error This is a mock
 globalThis.Response = jest.fn();
 globalThis.Request = jest.fn();
 globalThis.Response = vi.fn();
 globalThis.Request = vi.fn();
 });

 afterAll(() => {
Expand All@@ -31,17 +37,17 @@ describe('Sentry.VueIntegration', () => {
 warnings = [];
 loggerWarnings = [];

jest.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
 loggerWarnings.push(message);
 });

jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('allows to initialize integration later', () => {
Expand Down

10 changes: 8 additions & 2 deletions
packages/vue/test/integration/init.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

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

import { createApp } from 'vue';

import type { Client } from '@sentry/types';
Expand All@@ -11,13 +17,13 @@ describe('Sentry.init', () => {

 beforeEach(() => {
 warnings = [];
jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('does not warn when correctly setup (Vue 3)', () => {
Expand Down

74 changes: 38 additions & 36 deletions
packages/vue/test/router.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as SentryBrowser from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
Expand All@@ -6,21 +8,21 @@ import type { Span, SpanAttributes } from '@sentry/types';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';

const captureExceptionSpy = jest.spyOn(SentryBrowser, 'captureException');
jest.mock('@sentry/core', () => {
 const actual = jest.requireActual('@sentry/core');
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
vi.mock('@sentry/core', async () => {
 const actual = await vi.importActual('@sentry/core');
 return {
 ...actual,
 getActiveSpan: jest.fn().mockReturnValue({}),
 getActiveSpan: vi.fn().mockReturnValue({}),
 };
});

const mockVueRouter = {
 onError: jest.fn<void, [(error: Error) => void]>(),
 beforeEach: jest.fn<void, [(from: Route, to: Route, next?: () => void) => void]>(),
 onError: vi.fn<[(error: Error) => void]>(),
 beforeEach: vi.fn<[(from: Route, to: Route, next?: () => void) => void]>(),
};

const mockNext = jest.fn();
const mockNext = vi.fn();

const testRoutes: Record<string, Route> = {
 initialPageloadRoute: { matched: [], params: {}, path: '', query: {} },
Expand DownExpand Up@@ -68,11 +70,11 @@ const testRoutes: Record<string, Route> = {

describe('instrumentVueRouter()', () => {
 afterEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
 });

 it('should return instrumentation that instruments VueRouter.onError', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -99,7 +101,7 @@ describe('instrumentVueRouter()', () => {
 ])(
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for navigations',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -138,15 +140,15 @@ describe('instrumentVueRouter()', () => {
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for pageloads',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockRootSpan = {
 getSpanJSON: jest.fn().mockReturnValue({ op: 'pageload' }),
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 getSpanJSON: vi.fn().mockReturnValue({ op: 'pageload' }),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 };

jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
 instrumentVueRouter(
Expand DownExpand Up@@ -178,7 +180,7 @@ describe('instrumentVueRouter()', () => {
 );

 it('allows to configure routeLabel=path', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -205,7 +207,7 @@ describe('instrumentVueRouter()', () => {
 });

 it('allows to configure routeLabel=name', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -233,9 +235,9 @@ describe('instrumentVueRouter()', () => {

 it("doesn't overwrite a pageload transaction name it was set to custom before the router resolved the route", () => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -244,10 +246,10 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 instrumentVueRouter(
 mockVueRouter,
Expand DownExpand Up@@ -287,14 +289,14 @@ describe('instrumentVueRouter()', () => {
 });

 it("updates the scope's `transactionName` when a route is resolved", () => {
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return {};
 });

 const scopeSetTransactionNameSpy = jest.fn();
 const scopeSetTransactionNameSpy = vi.fn();

 // @ts-expect-error - only creating a partial scope but that's fine
jest.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
vi.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
 setTransactionName: scopeSetTransactionNameSpy,
 }));

Expand All@@ -315,17 +317,17 @@ describe('instrumentVueRouter()', () => {
 expect(scopeSetTransactionNameSpy).toHaveBeenCalledWith('/books/:bookId/chapter/:chapterId');
 });

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentPageLoad = %p',
 (instrumentPageLoad, expectedCallsAmount) => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setData: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setData: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -334,9 +336,9 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad, instrumentNavigation: true },
Expand All@@ -354,13 +356,13 @@ describe('instrumentVueRouter()', () => {
 },
 );

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentNavigation = %p',
 (instrumentNavigation, expectedCallsAmount) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation },
Expand All@@ -378,7 +380,7 @@ describe('instrumentVueRouter()', () => {
 );

 it("doesn't throw when `next` is not available in the beforeEach callback (Vue Router 4)", () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand Down

2 changes: 2 additions & 0 deletions
packages/vue/test/vendor/components.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';

import { formatComponentName } from '../../src/vendor/components';

describe('formatComponentName', () => {
Expand Down

4 changes: 2 additions & 2 deletions
packages/vue/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "extends": "./tsconfig.json",

 "include": ["test/**/*"],
 "include": ["test/**/*", "vite.config.ts"],

 "compilerOptions": {
 // should include all types from `./tsconfig.json` plus types for all test frameworks used
 "types": ["jest"]
 "types": []

 // other package-specific, test-specific options
 }
Expand Down

5 changes: 5 additions & 0 deletions
packages/vue/vite.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import baseConfig from '../../vite/vite.config';

export default {
 ...baseConfig,
};

, '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(vue): Switch to using vitest#12955

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

Jul 18, 2024
 Merged


test(vue): Switch to using vitest
#12955
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


6 changes: 0 additions & 6 deletions
packages/vue/jest.config.js

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
packages/vue/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,8 @@
 "clean": "rimraf build coverage sentry-vue-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "jest",
 "test:watch": "jest --watch",
 "test": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

18 changes: 10 additions & 8 deletions
packages/vue/test/errorHandler.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, test, vi } from 'vitest';

import { setCurrentClient } from '@sentry/browser';

import { attachErrorHandler } from '../src/errorhandler';
Expand All@@ -7,7 +9,7 @@ import { generateComponentTrace } from '../src/vendor/components';
describe('attachErrorHandler', () => {
 describe('attachProps', () => {
 afterEach(() => {
jest.resetAllMocks();
vi.resetAllMocks();
 });

 describe("given I don't want to `attachProps`", () => {
Expand DownExpand Up@@ -325,21 +327,21 @@ const testHarness = ({
 enableConsole,
 vm,
}: TestHarnessOpts) => {
jest.useFakeTimers();
 const providedErrorHandlerSpy = jest.fn();
 const warnHandlerSpy = jest.fn();
 const consoleErrorSpy = jest.fn();
vi.useFakeTimers();
 const providedErrorHandlerSpy = vi.fn();
 const warnHandlerSpy = vi.fn();
 const consoleErrorSpy = vi.fn();

 const client: any = {
 captureException: jest.fn(async () => Promise.resolve()),
 captureException: vi.fn(async () => Promise.resolve()),
 };
 setCurrentClient(client);

 const app: Vue = {
 config: {
 silent: !!silent,
 },
 mixin: jest.fn(),
 mixin: vi.fn(),
 };

 if (enableErrorHandler) {
Expand DownExpand Up@@ -380,7 +382,7 @@ const testHarness = ({
 app.config.errorHandler(new DummyError(), vm, 'stub-lifecycle-hook');

 // and waits for internal timers
jest.runAllTimers();
vi.runAllTimers();
 },
 expect: {
 errorHandlerSpy: expect(providedErrorHandlerSpy),
Expand Down

18 changes: 12 additions & 6 deletions
packages/vue/test/integration/VueIntegration.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

import type { Client } from '@sentry/types';
import { logger } from '@sentry/utils';
import { createApp } from 'vue';
Expand All@@ -15,10 +21,10 @@ describe('Sentry.VueIntegration', () => {
 const globalRequest = globalThis.Request;

 beforeAll(() => {
 globalThis.fetch = jest.fn();
 globalThis.fetch = vi.fn();
 // @ts-expect-error This is a mock
 globalThis.Response = jest.fn();
 globalThis.Request = jest.fn();
 globalThis.Response = vi.fn();
 globalThis.Request = vi.fn();
 });

 afterAll(() => {
Expand All@@ -31,17 +37,17 @@ describe('Sentry.VueIntegration', () => {
 warnings = [];
 loggerWarnings = [];

jest.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(logger, 'warn').mockImplementation((message: unknown) => {
 loggerWarnings.push(message);
 });

jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('allows to initialize integration later', () => {
Expand Down

10 changes: 8 additions & 2 deletions
packages/vue/test/integration/init.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
/**
 * @vitest-environment jsdom
 */

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

import { createApp } from 'vue';

import type { Client } from '@sentry/types';
Expand All@@ -11,13 +17,13 @@ describe('Sentry.init', () => {

 beforeEach(() => {
 warnings = [];
jest.spyOn(console, 'warn').mockImplementation((message: unknown) => {
vi.spyOn(console, 'warn').mockImplementation((message: unknown) => {
 warnings.push(message);
 });
 });

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

 it('does not warn when correctly setup (Vue 3)', () => {
Expand Down

74 changes: 38 additions & 36 deletions
packages/vue/test/router.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as SentryBrowser from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
Expand All@@ -6,21 +8,21 @@ import type { Span, SpanAttributes } from '@sentry/types';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';

const captureExceptionSpy = jest.spyOn(SentryBrowser, 'captureException');
jest.mock('@sentry/core', () => {
 const actual = jest.requireActual('@sentry/core');
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
vi.mock('@sentry/core', async () => {
 const actual = await vi.importActual('@sentry/core');
 return {
 ...actual,
 getActiveSpan: jest.fn().mockReturnValue({}),
 getActiveSpan: vi.fn().mockReturnValue({}),
 };
});

const mockVueRouter = {
 onError: jest.fn<void, [(error: Error) => void]>(),
 beforeEach: jest.fn<void, [(from: Route, to: Route, next?: () => void) => void]>(),
 onError: vi.fn<[(error: Error) => void]>(),
 beforeEach: vi.fn<[(from: Route, to: Route, next?: () => void) => void]>(),
};

const mockNext = jest.fn();
const mockNext = vi.fn();

const testRoutes: Record<string, Route> = {
 initialPageloadRoute: { matched: [], params: {}, path: '', query: {} },
Expand DownExpand Up@@ -68,11 +70,11 @@ const testRoutes: Record<string, Route> = {

describe('instrumentVueRouter()', () => {
 afterEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
 });

 it('should return instrumentation that instruments VueRouter.onError', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -99,7 +101,7 @@ describe('instrumentVueRouter()', () => {
 ])(
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for navigations',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -138,15 +140,15 @@ describe('instrumentVueRouter()', () => {
 'should return instrumentation that instruments VueRouter.beforeEach(%s, %s) for pageloads',
 (fromKey, toKey, transactionName, transactionSource) => {
 const mockRootSpan = {
 getSpanJSON: jest.fn().mockReturnValue({ op: 'pageload' }),
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 getSpanJSON: vi.fn().mockReturnValue({ op: 'pageload' }),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 };

jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
 instrumentVueRouter(
Expand DownExpand Up@@ -178,7 +180,7 @@ describe('instrumentVueRouter()', () => {
 );

 it('allows to configure routeLabel=path', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand All@@ -205,7 +207,7 @@ describe('instrumentVueRouter()', () => {
 });

 it('allows to configure routeLabel=name', () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation: true },
Expand DownExpand Up@@ -233,9 +235,9 @@ describe('instrumentVueRouter()', () => {

 it("doesn't overwrite a pageload transaction name it was set to custom before the router resolved the route", () => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -244,10 +246,10 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return mockRootSpan;
 });
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 instrumentVueRouter(
 mockVueRouter,
Expand DownExpand Up@@ -287,14 +289,14 @@ describe('instrumentVueRouter()', () => {
 });

 it("updates the scope's `transactionName` when a route is resolved", () => {
 const mockStartSpan = jest.fn().mockImplementation(_ => {
 const mockStartSpan = vi.fn().mockImplementation(_ => {
 return {};
 });

 const scopeSetTransactionNameSpy = jest.fn();
 const scopeSetTransactionNameSpy = vi.fn();

 // @ts-expect-error - only creating a partial scope but that's fine
jest.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
vi.spyOn(SentryCore, 'getCurrentScope').mockImplementation(() => ({
 setTransactionName: scopeSetTransactionNameSpy,
 }));

Expand All@@ -315,17 +317,17 @@ describe('instrumentVueRouter()', () => {
 expect(scopeSetTransactionNameSpy).toHaveBeenCalledWith('/books/:bookId/chapter/:chapterId');
 });

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentPageLoad = %p',
 (instrumentPageLoad, expectedCallsAmount) => {
 const mockRootSpan = {
 updateName: jest.fn(),
 setData: jest.fn(),
 setAttribute: jest.fn(),
 setAttributes: jest.fn(),
 updateName: vi.fn(),
 setData: vi.fn(),
 setAttribute: vi.fn(),
 setAttributes: vi.fn(),
 name: '',
 getSpanJSON: () => ({
 op: 'pageload',
Expand All@@ -334,9 +336,9 @@ describe('instrumentVueRouter()', () => {
 },
 }),
 };
jest.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);
vi.spyOn(SentryCore, 'getRootSpan').mockImplementation(() => mockRootSpan as unknown as Span);

 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad, instrumentNavigation: true },
Expand All@@ -354,13 +356,13 @@ describe('instrumentVueRouter()', () => {
 },
 );

test.each([
it.each([
 [false, 0],
 [true, 1],
 ])(
 'should return instrumentation that considers the instrumentNavigation = %p',
 (instrumentNavigation, expectedCallsAmount) => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'name', instrumentPageLoad: true, instrumentNavigation },
Expand All@@ -378,7 +380,7 @@ describe('instrumentVueRouter()', () => {
 );

 it("doesn't throw when `next` is not available in the beforeEach callback (Vue Router 4)", () => {
 const mockStartSpan = jest.fn();
 const mockStartSpan = vi.fn();
 instrumentVueRouter(
 mockVueRouter,
 { routeLabel: 'path', instrumentPageLoad: true, instrumentNavigation: true },
Expand Down

2 changes: 2 additions & 0 deletions
packages/vue/test/vendor/components.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';

import { formatComponentName } from '../../src/vendor/components';

describe('formatComponentName', () => {
Expand Down

4 changes: 2 additions & 2 deletions
packages/vue/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "extends": "./tsconfig.json",

 "include": ["test/**/*"],
 "include": ["test/**/*", "vite.config.ts"],

 "compilerOptions": {
 // should include all types from `./tsconfig.json` plus types for all test frameworks used
 "types": ["jest"]
 "types": []

 // other package-specific, test-specific options
 }
Expand Down

5 changes: 5 additions & 0 deletions
packages/vue/vite.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import baseConfig from '../../vite/vite.config';

export default {
 ...baseConfig,
};