diff --git a/packages/astro/test/server/index.server.test.ts b/packages/astro/test/server/index.server.test.ts index f319ef90eaad..339ba3ef965e 100644 --- a/packages/astro/test/server/index.server.test.ts +++ b/packages/astro/test/server/index.server.test.ts @@ -1,4 +1,6 @@ import sentryAstro from '../../src/index.server'; +import { describe, expect, it } from 'vitest'; + describe('server SDK', () => { it('exports the astro integration as a default export', () => { const integration = sentryAstro(); diff --git a/packages/astro/test/server/sdk.test.ts b/packages/astro/test/server/sdk.test.ts index 3e571628d29f..ee3808204f5b 100644 --- a/packages/astro/test/server/sdk.test.ts +++ b/packages/astro/test/server/sdk.test.ts @@ -1,6 +1,6 @@ import * as SentryNode from '@sentry/node'; import { SDK_VERSION } from '@sentry/node'; -import { vi } from 'vitest'; +import { vi, describe, afterEach, expect, it } from 'vitest'; import { init } from '../../src/server/sdk'; diff --git a/packages/browser-utils/test/browser/browserMetrics.test.ts b/packages/browser-utils/test/browser/browserMetrics.test.ts index 27d489eae140..b62a8c33d122 100644 --- a/packages/browser-utils/test/browser/browserMetrics.test.ts +++ b/packages/browser-utils/test/browser/browserMetrics.test.ts @@ -12,6 +12,7 @@ import type { Span } from '@sentry/core'; import { _addMeasureSpans, _addResourceSpans } from '../../src/metrics/browserMetrics'; import { WINDOW } from '../../src/types'; import { TestClient, getDefaultClientOptions } from '../utils/TestClient'; +import {describe, beforeEach, it, expect, beforeAll, afterAll } from 'vitest'; const mockWindowLocation = { ancestorOrigins: {}, diff --git a/packages/browser-utils/test/browser/utils.test.ts b/packages/browser-utils/test/browser/utils.test.ts index 01fb5da605c4..70adf2ad75dd 100644 --- a/packages/browser-utils/test/browser/utils.test.ts +++ b/packages/browser-utils/test/browser/utils.test.ts @@ -1,6 +1,7 @@ import { SentrySpan, getCurrentScope, getIsolationScope, setCurrentClient, spanToJSON } from '@sentry/core'; import { extractNetworkProtocol, startAndEndSpan } from '../../src/metrics/utils'; import { TestClient, getDefaultClientOptions } from '../utils/TestClient'; +import { describe, beforeEach, it, expect, test } from 'vitest'; describe('startAndEndSpan()', () => { beforeEach(() => { diff --git a/packages/browser-utils/test/instrument/dom.test.ts b/packages/browser-utils/test/instrument/dom.test.ts index 102c6ba40829..a009abb5d164 100644 --- a/packages/browser-utils/test/instrument/dom.test.ts +++ b/packages/browser-utils/test/instrument/dom.test.ts @@ -1,5 +1,6 @@ import { instrumentDOM } from '../../src/instrument/dom'; import { WINDOW } from '../../src/types'; +import { describe, expect, it } from 'vitest'; // @ts-expect-error - idk WINDOW.XMLHttpRequest = undefined; diff --git a/packages/browser-utils/test/instrument/xhr.test.ts b/packages/browser-utils/test/instrument/xhr.test.ts index e53999de628b..112b9516a4f0 100644 --- a/packages/browser-utils/test/instrument/xhr.test.ts +++ b/packages/browser-utils/test/instrument/xhr.test.ts @@ -1,5 +1,6 @@ import { instrumentXHR } from '../../src/instrument/xhr'; import { WINDOW } from '../../src/types'; +import { describe, expect, it } from 'vitest'; // @ts-expect-error - idk WINDOW.XMLHttpRequest = undefined; diff --git a/packages/browser/test/sdk.test.ts b/packages/browser/test/sdk.test.ts index a6fc49edee89..6f8bdc66f450 100644 --- a/packages/browser/test/sdk.test.ts +++ b/packages/browser/test/sdk.test.ts @@ -4,7 +4,7 @@ /* eslint-disable @typescript-eslint/unbound-method */ import type { Mock } from 'vitest'; -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; +import { afterEach, beforeEach, describe, expect, it, vi, afterAll, test } from 'vitest'; import * as SentryCore from '@sentry/core'; import { createTransport } from '@sentry/core'; diff --git a/packages/browser/test/tracing/request.test.ts b/packages/browser/test/tracing/request.test.ts index 67cd96ee6717..717452a4dff0 100644 --- a/packages/browser/test/tracing/request.test.ts +++ b/packages/browser/test/tracing/request.test.ts @@ -1,5 +1,5 @@ import type { MockInstance } from 'vitest'; -import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'; +import { beforeAll, beforeEach, describe, expect, it, vi, afterEach } from 'vitest'; import * as browserUtils from '@sentry-internal/browser-utils'; import * as utils from '@sentry/core'; diff --git a/packages/browser/test/transports/offline.test.ts b/packages/browser/test/transports/offline.test.ts index 070d6623f967..7b1cd5ebf6dd 100644 --- a/packages/browser/test/transports/offline.test.ts +++ b/packages/browser/test/transports/offline.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, it } from 'vitest'; +import { describe, expect, it, beforeAll } from 'vitest'; import 'fake-indexeddb/auto'; diff --git a/packages/browser/test/utils/featureFlags.test.ts b/packages/browser/test/utils/featureFlags.test.ts index 48d2f20e3c91..39681a6dfe1f 100644 --- a/packages/browser/test/utils/featureFlags.test.ts +++ b/packages/browser/test/utils/featureFlags.test.ts @@ -1,7 +1,7 @@ import type { FeatureFlag } from '@sentry/core'; import { getCurrentScope, logger } from '@sentry/core'; -import { vi } from 'vitest'; +import { vi, describe, it, afterEach, expect } from 'vitest'; import { insertFlagToScope, insertToFlagBuffer } from '../../src/utils/featureFlags'; describe('flags', () => { diff --git a/packages/core/test/utils-hoist/envelope.test.ts b/packages/core/test/utils-hoist/envelope.test.ts index f80244d3d34d..4a5264978e5f 100644 --- a/packages/core/test/utils-hoist/envelope.test.ts +++ b/packages/core/test/utils-hoist/envelope.test.ts @@ -7,7 +7,7 @@ import { spanToJSON, } from '@sentry/core'; import { SentrySpan } from '@sentry/core'; -import { describe, expect, it, test, vi } from 'vitest'; +import { describe, expect, it, test, vi, afterEach } from 'vitest'; import { getSentryCarrier } from '../../src/carrier'; import { addItemToEnvelope, diff --git a/packages/eslint-plugin-sdk/test/lib/rules/no-eq-empty.test.ts b/packages/eslint-plugin-sdk/test/lib/rules/no-eq-empty.test.ts index 9a4c4c5a2ed6..08cfbf8f10e4 100644 --- a/packages/eslint-plugin-sdk/test/lib/rules/no-eq-empty.test.ts +++ b/packages/eslint-plugin-sdk/test/lib/rules/no-eq-empty.test.ts @@ -1,5 +1,5 @@ import { RuleTester } from 'eslint'; -import { describe } from 'vitest'; +import { describe, test } from 'vitest'; // @ts-expect-error untyped module import rule from '../../../src/rules/no-eq-empty'; diff --git a/packages/feedback/test/core/getFeedback.test.ts b/packages/feedback/test/core/getFeedback.test.ts index d79d2176e1c2..ce5ad0444755 100644 --- a/packages/feedback/test/core/getFeedback.test.ts +++ b/packages/feedback/test/core/getFeedback.test.ts @@ -1,4 +1,4 @@ -import { vi, describe, it, expect } from 'vitest'; +import { vi, describe, it, expect, beforeEach } from 'vitest'; import { getCurrentScope } from '@sentry/core'; import { getFeedback } from '../../src/core/getFeedback'; diff --git a/packages/feedback/test/core/sendFeedback.test.ts b/packages/feedback/test/core/sendFeedback.test.ts index c150c35ab69b..37e552090782 100644 --- a/packages/feedback/test/core/sendFeedback.test.ts +++ b/packages/feedback/test/core/sendFeedback.test.ts @@ -1,7 +1,7 @@ /** * @vitest-environment jsdom */ -import { vi, describe, it, expect } from 'vitest'; +import { vi, describe, it, expect, beforeEach, afterAll } from 'vitest'; import { addBreadcrumb, diff --git a/packages/nestjs/test/integrations/nest.test.ts b/packages/nestjs/test/integrations/nest.test.ts index b7ad5c041616..f4b60dde05df 100644 --- a/packages/nestjs/test/integrations/nest.test.ts +++ b/packages/nestjs/test/integrations/nest.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { beforeEach, describe, expect, it, vi, afterEach } from 'vitest'; import * as core from '@sentry/core'; import { isPatched } from '../../src/integrations/helpers'; diff --git a/packages/react/vite.config.ts b/packages/react/vite.config.ts index a5523c61f601..199c74df98ce 100644 --- a/packages/react/vite.config.ts +++ b/packages/react/vite.config.ts @@ -5,6 +5,7 @@ import baseConfig from '../../vite/vite.config'; export default defineConfig({ ...baseConfig, test: { + globals: true, ...baseConfig.test, }, }); diff --git a/packages/replay-internal/test.setup.ts b/packages/replay-internal/test.setup.ts index c7d1ffa8eb51..55c5bc1704e2 100644 --- a/packages/replay-internal/test.setup.ts +++ b/packages/replay-internal/test.setup.ts @@ -1,5 +1,5 @@ import { printDiffOrStringify } from 'jest-matcher-utils'; -import { vi } from 'vitest'; +import { vi, expect } from 'vitest'; import type { Mocked, MockedFunction } from 'vitest'; /* eslint-disable @typescript-eslint/no-unsafe-member-access */ diff --git a/packages/replay-internal/test/unit/util/logger.test.ts b/packages/replay-internal/test/unit/util/logger.test.ts index 0d349b15ee62..2334ad1d83e6 100644 --- a/packages/replay-internal/test/unit/util/logger.test.ts +++ b/packages/replay-internal/test/unit/util/logger.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import * as SentryCore from '@sentry/core'; import { logger as coreLogger } from '@sentry/core'; diff --git a/vite/vite.config.ts b/vite/vite.config.ts index 2717ad778e1d..a26454ad5712 100644 --- a/vite/vite.config.ts +++ b/vite/vite.config.ts @@ -5,7 +5,6 @@ export default defineConfig({ __DEBUG_BUILD__: true, }, test: { - globals: true, coverage: { enabled: true, reportsDirectory: './coverage',