diff --git a/packages/astro/test/client/sdk.test.ts b/packages/astro/test/client/sdk.test.ts index 4e7882b33e32..55381f52be17 100644 --- a/packages/astro/test/client/sdk.test.ts +++ b/packages/astro/test/client/sdk.test.ts @@ -1,3 +1,5 @@ +import { afterEach, describe, expect, it, vi } from 'vitest'; + import type { BrowserClient } from '@sentry/browser'; import { browserTracingIntegration, @@ -8,9 +10,8 @@ import { } from '@sentry/browser'; import * as SentryBrowser from '@sentry/browser'; import { SDK_VERSION, getClient } from '@sentry/browser'; -import { vi } from 'vitest'; -import { init } from '../../../astro/src/client/sdk'; +import { init } from '../../src/client/sdk'; const browserInit = vi.spyOn(SentryBrowser, 'init'); @@ -66,7 +67,7 @@ describe('Sentry client SDK', () => { ...tracingOptions, }); - const integrationsToInit = browserInit.mock.calls[0][0]?.defaultIntegrations; + const integrationsToInit = browserInit.mock.calls[0]![0]?.defaultIntegrations; const browserTracing = getClient()?.getIntegrationByName('BrowserTracing'); expect(integrationsToInit).toContainEqual(expect.objectContaining({ name: 'BrowserTracing' })); @@ -82,7 +83,7 @@ describe('Sentry client SDK', () => { ...tracingOptions, }); - const integrationsToInit = browserInit.mock.calls[0][0]?.defaultIntegrations || []; + const integrationsToInit = browserInit.mock.calls[0]![0]?.defaultIntegrations || []; const browserTracing = getClient()?.getIntegrationByName('BrowserTracing'); expect(integrationsToInit).not.toContainEqual(expect.objectContaining({ name: 'BrowserTracing' })); @@ -90,20 +91,20 @@ describe('Sentry client SDK', () => { }); it("doesn't add browserTracingIntegration if `__SENTRY_TRACING__` is set to false", () => { - globalThis.__SENTRY_TRACING__ = false; + (globalThis as any).__SENTRY_TRACING__ = false; init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', enableTracing: true, }); - const integrationsToInit = browserInit.mock.calls[0][0]?.defaultIntegrations || []; + const integrationsToInit = browserInit.mock.calls[0]![0]?.defaultIntegrations || []; const browserTracing = getClient()?.getIntegrationByName('BrowserTracing'); expect(integrationsToInit).not.toContainEqual(expect.objectContaining({ name: 'BrowserTracing' })); expect(browserTracing).toBeUndefined(); - delete globalThis.__SENTRY_TRACING__; + delete (globalThis as any).__SENTRY_TRACING__; }); it('Overrides the automatically default browserTracingIntegration instance with a a user-provided browserTracingIntegration instance', () => { diff --git a/packages/astro/test/integration/index.files.test.ts b/packages/astro/test/integration/index.files.test.ts index f0b15f6a48c2..0b28b2a0550d 100644 --- a/packages/astro/test/integration/index.files.test.ts +++ b/packages/astro/test/integration/index.files.test.ts @@ -1,12 +1,10 @@ -import { vi } from 'vitest'; +import { afterEach, describe, expect, it, vi } from 'vitest'; import { sentryAstro } from '../../src/integration'; -vi.mock('fs', async () => { - const actual = await vi.importActual('fs'); +vi.mock('fs', async requireActual => { return { - // @ts-expect-error - just mocking around - ...actual, + ...(await requireActual()), existsSync: vi.fn(p => p.endsWith('js')), }; }); diff --git a/packages/astro/test/integration/index.test.ts b/packages/astro/test/integration/index.test.ts index 886e77ada2dd..008132264602 100644 --- a/packages/astro/test/integration/index.test.ts +++ b/packages/astro/test/integration/index.test.ts @@ -1,4 +1,4 @@ -import { vi } from 'vitest'; +import { afterEach, describe, expect, it, vi } from 'vitest'; import { sentryAstro } from '../../src/integration'; @@ -294,7 +294,7 @@ describe('sentryAstro integration', () => { it.each([{ output: 'static' }, { output: undefined }])( "doesn't add middleware if in static mode (config %s)", - async config => { + async (config: any) => { const integration = sentryAstro({}); const addMiddleware = vi.fn(); const updateConfig = vi.fn(); diff --git a/packages/astro/test/integration/middleware/index.test.ts b/packages/astro/test/integration/middleware/index.test.ts index b9d1273261de..3b12508feaa7 100644 --- a/packages/astro/test/integration/middleware/index.test.ts +++ b/packages/astro/test/integration/middleware/index.test.ts @@ -1,4 +1,4 @@ -import { vi } from 'vitest'; +import { describe, expect, it, vi } from 'vitest'; import { onRequest } from '../../../src/integration/middleware'; diff --git a/packages/astro/test/integration/snippets.test.ts b/packages/astro/test/integration/snippets.test.ts index 5911372c6647..04aaa866aee9 100644 --- a/packages/astro/test/integration/snippets.test.ts +++ b/packages/astro/test/integration/snippets.test.ts @@ -1,3 +1,5 @@ +import { describe, expect, it } from 'vitest'; + import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from '../../src/integration/snippets'; const allSdkOptions = { diff --git a/packages/astro/tsconfig.test.json b/packages/astro/tsconfig.test.json index 3fbe012384ee..c41efeacd92f 100644 --- a/packages/astro/tsconfig.test.json +++ b/packages/astro/tsconfig.test.json @@ -5,6 +5,6 @@ "compilerOptions": { // should include all types from `./tsconfig.json` plus types for all test frameworks used - "types": ["node", "vitest/globals"] + "types": ["node"] } } diff --git a/packages/astro/vite.config.ts b/packages/astro/vite.config.ts index 1094fe0d79da..f18ec92095bc 100644 --- a/packages/astro/vite.config.ts +++ b/packages/astro/vite.config.ts @@ -4,6 +4,5 @@ export default { ...baseConfig, test: { ...baseConfig.test, - environment: 'jsdom', }, };