Skip to content

Commit

Permalink
Ensure browser version of Svelte is used in tests (viamrobotics#471)
Browse files Browse the repository at this point in the history
  • Loading branch information
mcous authored Feb 9, 2024
1 parent 889f8fd commit c4d211f
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 38 deletions.
2 changes: 1 addition & 1 deletion packages/blocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@testing-library/dom": "^9.3.3",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/svelte": "^4.0.5",
"@testing-library/svelte": "^4.1.0",
"@threlte/core": "^7.0.12",
"@threlte/extras": "^8.0.10",
"@types/three": "^0.159.0",
Expand Down
7 changes: 1 addition & 6 deletions packages/blocks/src/vitest.setup.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import { afterEach } from 'vitest';
import { cleanup } from '@testing-library/svelte';
import '@testing-library/jest-dom/vitest';

afterEach(() => {
cleanup();
});
import '@testing-library/svelte/vitest';
7 changes: 5 additions & 2 deletions packages/blocks/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vitest/config';

export default defineConfig({
export default defineConfig(({ mode }) => ({
plugins: [sveltekit()],
server: {
fs: {
allow: ['prime.css'],
},
},
resolve: {
conditions: mode === 'test' ? ['browser'] : [],
},
test: {
include: ['src/**/*.spec.ts'],
setupFiles: ['src/vitest.setup.ts'],
environment: 'jsdom',
mockReset: true,
unstubGlobals: true,
},
});
}));
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@testing-library/dom": "^9.3.3",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/svelte": "^4.0.5",
"@testing-library/svelte": "^4.1.0",
"@testing-library/user-event": "^14.5.1",
"@types/lodash-es": "^4.17.12",
"@types/prismjs": "^1.26.3",
Expand Down
7 changes: 1 addition & 6 deletions packages/core/src/vitest.setup.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { afterEach } from 'vitest';
import { cleanup } from '@testing-library/svelte';
import '@testing-library/jest-dom/vitest';
import '@testing-library/svelte/vitest';

/**
* `PointerEvent` does not exist in `jsdom` so this polyfill is based off this
Expand Down Expand Up @@ -39,7 +38,3 @@ if (!global.PointerEvent) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any
global.PointerEvent = PointerEvent as any;
}

afterEach(() => {
cleanup();
});
9 changes: 5 additions & 4 deletions packages/core/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vitest/config';

export default defineConfig({
export default defineConfig(({ mode }) => ({
plugins: [sveltekit()],
server: {
fs: {
allow: ['prime.css'],
},
},
resolve: {
conditions: mode === 'test' ? ['browser'] : [],
},
test: {
include: ['src/**/__tests__/*.spec.ts'],
setupFiles: ['src/vitest.setup.ts'],
environment: 'jsdom',
mockReset: true,
unstubGlobals: true,
// For testing svelte internals like onMount, see: https://github.com/vitest-dev/vitest/issues/2834
alias: [{ find: /^svelte$/u, replacement: 'svelte/internal' }],
},
});
}));
36 changes: 18 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c4d211f

Please sign in to comment.