From 7f6b9ad691e3934f6d850bd6674f039f97321cbc Mon Sep 17 00:00:00 2001 From: Steve Kinney Date: Tue, 1 Oct 2024 16:49:45 -0500 Subject: [PATCH] Make Vitest helpers global --- examples/accident-counter/vite.config.ts | 4 ++++ examples/accident-counter/vitest.config.js | 8 -------- examples/button-factory/src/button.test.js | 1 - examples/button-factory/src/local-storage.test.js | 2 -- examples/button-factory/src/secret-input.test.js | 1 - examples/button-factory/vitest.config.ts | 1 + examples/calculator/vite.config.js | 4 ++++ examples/calculator/vitest.config.js | 8 -------- examples/characters/vitest.config.js | 1 + examples/guess-the-number/vitest.config.js | 1 + examples/logjam/vitest.config.js | 8 ++++++++ examples/task-list/src/actions.test.js | 11 +++++++++++ examples/task-list/src/components/create-task.jsx | 2 +- examples/task-list/src/components/task.jsx | 4 ++-- examples/task-list/vite.config.ts | 5 +++++ examples/task-list/vitest.config.js | 8 -------- examples/utility-belt/src/index.js | 1 + examples/utility-belt/vitest.config.js | 8 ++++++++ jsconfig.json | 2 +- 19 files changed, 48 insertions(+), 32 deletions(-) delete mode 100644 examples/accident-counter/vitest.config.js delete mode 100644 examples/calculator/vitest.config.js create mode 100644 examples/logjam/vitest.config.js create mode 100644 examples/task-list/src/actions.test.js delete mode 100644 examples/task-list/vitest.config.js create mode 100644 examples/utility-belt/vitest.config.js diff --git a/examples/accident-counter/vite.config.ts b/examples/accident-counter/vite.config.ts index 571846b..4382e12 100644 --- a/examples/accident-counter/vite.config.ts +++ b/examples/accident-counter/vite.config.ts @@ -6,4 +6,8 @@ import { css } from 'css-configuration'; export default defineConfig({ plugins: [react()], css, + test: { + environment: 'happy-dom', + globals: true, + }, }); diff --git a/examples/accident-counter/vitest.config.js b/examples/accident-counter/vitest.config.js deleted file mode 100644 index eca96b3..0000000 --- a/examples/accident-counter/vitest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -import { mergeConfig } from 'vitest/config'; -import config from './vite.config'; - -export default mergeConfig(config, { - test: { - environment: 'happy-dom', - }, -}); diff --git a/examples/button-factory/src/button.test.js b/examples/button-factory/src/button.test.js index be4af3c..2f6de6b 100644 --- a/examples/button-factory/src/button.test.js +++ b/examples/button-factory/src/button.test.js @@ -1,4 +1,3 @@ -import { it, expect, describe } from 'vitest'; import { createButton } from './button.js'; describe('createButton', () => { diff --git a/examples/button-factory/src/local-storage.test.js b/examples/button-factory/src/local-storage.test.js index 8a5b8ca..aa5f12a 100644 --- a/examples/button-factory/src/local-storage.test.js +++ b/examples/button-factory/src/local-storage.test.js @@ -1,5 +1,3 @@ -import { it, expect } from 'vitest'; - it('should properly assign to localStorage', () => { const key = 'secret'; const message = "It's a secret to everybody."; diff --git a/examples/button-factory/src/secret-input.test.js b/examples/button-factory/src/secret-input.test.js index 13add1c..3143f29 100644 --- a/examples/button-factory/src/secret-input.test.js +++ b/examples/button-factory/src/secret-input.test.js @@ -1,4 +1,3 @@ -import { describe, expect, it, beforeEach, vi, afterEach } from 'vitest'; import { screen } from '@testing-library/dom'; import userEvent from '@testing-library/user-event'; import { createSecretInput } from './secret-input.js'; diff --git a/examples/button-factory/vitest.config.ts b/examples/button-factory/vitest.config.ts index a9f5456..e6fe3d7 100644 --- a/examples/button-factory/vitest.config.ts +++ b/examples/button-factory/vitest.config.ts @@ -3,5 +3,6 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { environment: 'happy-dom', + globals: true, }, }); diff --git a/examples/calculator/vite.config.js b/examples/calculator/vite.config.js index dd8de87..fd0bc9f 100644 --- a/examples/calculator/vite.config.js +++ b/examples/calculator/vite.config.js @@ -4,4 +4,8 @@ import { css } from 'css-configuration'; export default defineConfig({ assetsInclude: ['**/*.html'], css, + test: { + environment: 'happy-dom', + globals: true, + }, }); diff --git a/examples/calculator/vitest.config.js b/examples/calculator/vitest.config.js deleted file mode 100644 index eca96b3..0000000 --- a/examples/calculator/vitest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -import { mergeConfig } from 'vitest/config'; -import config from './vite.config'; - -export default mergeConfig(config, { - test: { - environment: 'happy-dom', - }, -}); diff --git a/examples/characters/vitest.config.js b/examples/characters/vitest.config.js index 33ec9e2..404f3e0 100644 --- a/examples/characters/vitest.config.js +++ b/examples/characters/vitest.config.js @@ -1,5 +1,6 @@ export default { test: { environment: 'node', + globals: true, }, }; diff --git a/examples/guess-the-number/vitest.config.js b/examples/guess-the-number/vitest.config.js index 33ec9e2..404f3e0 100644 --- a/examples/guess-the-number/vitest.config.js +++ b/examples/guess-the-number/vitest.config.js @@ -1,5 +1,6 @@ export default { test: { environment: 'node', + globals: true, }, }; diff --git a/examples/logjam/vitest.config.js b/examples/logjam/vitest.config.js new file mode 100644 index 0000000..014f97e --- /dev/null +++ b/examples/logjam/vitest.config.js @@ -0,0 +1,8 @@ +import { defineConfig } from 'vitest/config'; + +export default defineConfig({ + test: { + environment: 'node', + globals: true, + }, +}); diff --git a/examples/task-list/src/actions.test.js b/examples/task-list/src/actions.test.js new file mode 100644 index 0000000..0d0130c --- /dev/null +++ b/examples/task-list/src/actions.test.js @@ -0,0 +1,11 @@ +import { setTasks } from './actions'; + +describe('setTasks', () => { + it('creates a set-tasks action', () => { + const tasks = [{ id: '1', text: 'Task 1', completed: false }]; + expect(setTasks(tasks)).toEqual({ + type: 'set-tasks', + payload: tasks, + }); + }); +}); diff --git a/examples/task-list/src/components/create-task.jsx b/examples/task-list/src/components/create-task.jsx index da2b553..4013dfb 100644 --- a/examples/task-list/src/components/create-task.jsx +++ b/examples/task-list/src/components/create-task.jsx @@ -15,7 +15,7 @@ export const CreateTask = ({ onSubmit }) => { >
{ @@ -7,7 +6,7 @@ export const Task = memo(({ task, updateTask, removeTask }) => {
  • { diff --git a/examples/task-list/vite.config.ts b/examples/task-list/vite.config.ts index 2530d4c..aa4d639 100644 --- a/examples/task-list/vite.config.ts +++ b/examples/task-list/vite.config.ts @@ -16,4 +16,9 @@ export default defineConfig({ }, }, }, + test: { + environment: 'happy-dom', + globals: true, + setupFiles: ['@testing-library/jest-dom/vitest'], + }, }); diff --git a/examples/task-list/vitest.config.js b/examples/task-list/vitest.config.js deleted file mode 100644 index 8a860ea..0000000 --- a/examples/task-list/vitest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -import { mergeConfig } from 'vite'; -import config from './vite.config'; - -export default mergeConfig(config, { - test: { - environment: 'happy-dom', - }, -}); diff --git a/examples/utility-belt/src/index.js b/examples/utility-belt/src/index.js index e69de29..82e58bd 100644 --- a/examples/utility-belt/src/index.js +++ b/examples/utility-belt/src/index.js @@ -0,0 +1 @@ +export * from './string-to-number'; diff --git a/examples/utility-belt/vitest.config.js b/examples/utility-belt/vitest.config.js new file mode 100644 index 0000000..014f97e --- /dev/null +++ b/examples/utility-belt/vitest.config.js @@ -0,0 +1,8 @@ +import { defineConfig } from 'vitest/config'; + +export default defineConfig({ + test: { + environment: 'node', + globals: true, + }, +}); diff --git a/jsconfig.json b/jsconfig.json index a4cafb7..e837348 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -11,6 +11,6 @@ "./*.html?raw": ["./*"] } }, - "include": ["examples/**/*.js", "examples/accident-counter/src/reducer.ts"], + "include": ["examples/**/*.js"], "exclude": ["node_modules", "dist"] }