From 274829dc2c96df61decb31de03352701ac67e100 Mon Sep 17 00:00:00 2001 From: Miroslav Petrik Date: Sat, 2 Dec 2023 16:45:12 +0100 Subject: [PATCH] chore: drop react-hooks test util --- package.json | 2 - src/TemplateField.test.skip.tsx | 11 ++-- .../checkbox-field/CheckboxField.test.tsx | 7 +-- .../CheckboxGroupField.test.tsx | 7 +-- src/components/file-field/FilesField.test.tsx | 17 ++++-- .../number-field/NumberField.test.tsx | 17 ++++-- .../radio-field/RadioField.test.tsx | 7 +-- .../select-field/SelectField.test.tsx | 7 +-- src/components/text-field/TextField.test.tsx | 15 +++-- .../textarea-field/TextareaField.test.tsx | 15 +++-- yarn.lock | 60 +++---------------- 11 files changed, 66 insertions(+), 99 deletions(-) diff --git a/package.json b/package.json index 0d32ead..836d212 100644 --- a/package.json +++ b/package.json @@ -61,12 +61,10 @@ "@storybook/theming": "7.6.3", "@testing-library/jest-dom": "6.1.5", "@testing-library/react": "14.1.2", - "@testing-library/react-hooks": "8.0.1", "@testing-library/user-event": "14.5.1", "@types/react": "^18", "@types/react-dom": "^18", "@types/semantic-release": "^20.0.6", - "@types/testing-library__jest-dom": "^6.0.0", "@typescript-eslint/eslint-plugin": "6.13.1", "@typescript-eslint/parser": "6.13.1", "@vitejs/plugin-react": "^4.2.0", diff --git a/src/TemplateField.test.skip.tsx b/src/TemplateField.test.skip.tsx index 27c9fda..701023e 100644 --- a/src/TemplateField.test.skip.tsx +++ b/src/TemplateField.test.skip.tsx @@ -1,5 +1,4 @@ -import { fireEvent, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { act, fireEvent, renderHook, screen } from "@testing-library/react"; import { userEvent } from "@testing-library/user-event"; import { formAtom, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -23,10 +22,8 @@ describe("", () => { }); const { result } = renderHook(() => useFormSubmit(form)); - // render - const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -50,7 +47,7 @@ describe("", () => { expect(input).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -73,7 +70,7 @@ describe("", () => { expect(textarea).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); diff --git a/src/components/checkbox-field/CheckboxField.test.tsx b/src/components/checkbox-field/CheckboxField.test.tsx index 6d58312..bbd9ec6 100644 --- a/src/components/checkbox-field/CheckboxField.test.tsx +++ b/src/components/checkbox-field/CheckboxField.test.tsx @@ -1,6 +1,5 @@ import { checkboxField } from "@form-atoms/field"; -import { render, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { act, render, renderHook, screen } from "@testing-library/react"; import { userEvent } from "@testing-library/user-event"; import { formAtom, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -42,7 +41,7 @@ describe("", () => { render(); const handleSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(handleSubmit)(); }); @@ -63,7 +62,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); diff --git a/src/components/checkbox-group-field/CheckboxGroupField.test.tsx b/src/components/checkbox-group-field/CheckboxGroupField.test.tsx index 723b172..dd8479d 100644 --- a/src/components/checkbox-group-field/CheckboxGroupField.test.tsx +++ b/src/components/checkbox-group-field/CheckboxGroupField.test.tsx @@ -1,6 +1,5 @@ import { stringArrayField } from "@form-atoms/field"; -import { render, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { act, render, renderHook, screen } from "@testing-library/react"; import { userEvent } from "@testing-library/user-event"; import { formAtom, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -37,7 +36,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -57,7 +56,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); diff --git a/src/components/file-field/FilesField.test.tsx b/src/components/file-field/FilesField.test.tsx index 7dc1cb6..7a39a5b 100644 --- a/src/components/file-field/FilesField.test.tsx +++ b/src/components/file-field/FilesField.test.tsx @@ -1,6 +1,11 @@ import { filesField } from "@form-atoms/field"; -import { fireEvent, render, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { + act, + fireEvent, + render, + renderHook, + screen, +} from "@testing-library/react"; import { userEvent } from "@testing-library/user-event"; import { formAtom, useForm, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -26,7 +31,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -51,7 +56,7 @@ describe("", () => { expect(input).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -81,7 +86,7 @@ describe("", () => { target: { files: [], value: "" }, }); // must be after workarround, so zod validator gets undefined input instead of empty array - await domAct(async () => { + await act(async () => { result.current.reset(); }); @@ -89,7 +94,7 @@ describe("", () => { expect(fileInput).toHaveValue(""); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current.submit(onSubmit)(); }); diff --git a/src/components/number-field/NumberField.test.tsx b/src/components/number-field/NumberField.test.tsx index 5827361..1532a7c 100644 --- a/src/components/number-field/NumberField.test.tsx +++ b/src/components/number-field/NumberField.test.tsx @@ -1,6 +1,11 @@ import { numberField } from "@form-atoms/field"; -import { fireEvent, render, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { + act, + fireEvent, + render, + renderHook, + screen, +} from "@testing-library/react"; import { userEvent } from "@testing-library/user-event"; import { formAtom, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -27,7 +32,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -44,7 +49,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -56,7 +61,7 @@ describe("", () => { expect(input).toBeValid(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -77,7 +82,7 @@ describe("", () => { expect(input).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); diff --git a/src/components/radio-field/RadioField.test.tsx b/src/components/radio-field/RadioField.test.tsx index 4e4c62f..1ac1cab 100644 --- a/src/components/radio-field/RadioField.test.tsx +++ b/src/components/radio-field/RadioField.test.tsx @@ -1,6 +1,5 @@ import { stringField } from "@form-atoms/field"; -import { render, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { act, render, renderHook, screen } from "@testing-library/react"; import { formAtom, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -24,7 +23,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -48,7 +47,7 @@ describe("", () => { expect(firstRadio).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); diff --git a/src/components/select-field/SelectField.test.tsx b/src/components/select-field/SelectField.test.tsx index 53e4da4..0553d3d 100644 --- a/src/components/select-field/SelectField.test.tsx +++ b/src/components/select-field/SelectField.test.tsx @@ -1,6 +1,5 @@ import { stringField } from "@form-atoms/field"; -import { render, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { act, render, renderHook, screen } from "@testing-library/react"; import { userEvent } from "@testing-library/user-event"; import { formAtom, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -33,7 +32,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -72,7 +71,7 @@ describe("", () => { // expect(select).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); diff --git a/src/components/text-field/TextField.test.tsx b/src/components/text-field/TextField.test.tsx index 541780b..af93fef 100644 --- a/src/components/text-field/TextField.test.tsx +++ b/src/components/text-field/TextField.test.tsx @@ -1,6 +1,11 @@ import { textField } from "@form-atoms/field"; -import { fireEvent, render, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { + act, + fireEvent, + render, + renderHook, + screen, +} from "@testing-library/react"; import { userEvent } from "@testing-library/user-event"; import { formAtom, useForm, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -31,7 +36,7 @@ describe("", () => { expect(textbox).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -52,14 +57,14 @@ describe("", () => { expect(textbox).toHaveValue("memento mori"); - await domAct(async () => { + await act(async () => { result.current.reset(); }); expect(textbox).toHaveValue(""); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current.submit(onSubmit)(); }); diff --git a/src/components/textarea-field/TextareaField.test.tsx b/src/components/textarea-field/TextareaField.test.tsx index a319086..d956a69 100644 --- a/src/components/textarea-field/TextareaField.test.tsx +++ b/src/components/textarea-field/TextareaField.test.tsx @@ -1,6 +1,11 @@ import { textField } from "@form-atoms/field"; -import { fireEvent, render, screen } from "@testing-library/react"; -import { act as domAct, renderHook } from "@testing-library/react-hooks/dom"; +import { + act, + fireEvent, + render, + renderHook, + screen, +} from "@testing-library/react"; import { userEvent } from "@testing-library/user-event"; import { formAtom, useFormSubmit } from "form-atoms"; import { describe, expect, it } from "vitest"; @@ -26,7 +31,7 @@ describe("", () => { render(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -49,7 +54,7 @@ describe("", () => { expect(textarea).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); @@ -70,7 +75,7 @@ describe("", () => { expect(textarea).toBeValid(); const onSubmit = vi.fn(); - await domAct(async () => { + await act(async () => { result.current(onSubmit)(); }); diff --git a/yarn.lock b/yarn.lock index cede2db..5a018de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2744,12 +2744,10 @@ __metadata: "@storybook/theming": "npm:7.6.3" "@testing-library/jest-dom": "npm:6.1.5" "@testing-library/react": "npm:14.1.2" - "@testing-library/react-hooks": "npm:8.0.1" "@testing-library/user-event": "npm:14.5.1" "@types/react": "npm:^18" "@types/react-dom": "npm:^18" "@types/semantic-release": "npm:^20.0.6" - "@types/testing-library__jest-dom": "npm:^6.0.0" "@typescript-eslint/eslint-plugin": "npm:6.13.1" "@typescript-eslint/parser": "npm:6.13.1" "@vitejs/plugin-react": "npm:^4.2.0" @@ -5714,9 +5712,9 @@ __metadata: languageName: node linkType: hard -"@testing-library/jest-dom@npm:*, @testing-library/jest-dom@npm:^6.1.2": - version: 6.1.4 - resolution: "@testing-library/jest-dom@npm:6.1.4" +"@testing-library/jest-dom@npm:6.1.5": + version: 6.1.5 + resolution: "@testing-library/jest-dom@npm:6.1.5" dependencies: "@adobe/css-tools": "npm:^4.3.1" "@babel/runtime": "npm:^7.9.2" @@ -5740,13 +5738,13 @@ __metadata: optional: true vitest: optional: true - checksum: e5a0cdb96eec509c0c85f2b7a0d08fc1c9f6c10aa49bba0d738bf4bb114c3472b92ace5067aedfaaf848ae13b38ba9296047c219aa24b66c87aa16de33341fdb + checksum: 3bc45dc9cb6dc49134e79ef636612b8639014bdd8c85c3741a78a92345147d03f9efeefc2f02ad306764a62f8c236b0e0ef3d5a68c16af1c51887be45d253f6b languageName: node linkType: hard -"@testing-library/jest-dom@npm:6.1.5": - version: 6.1.5 - resolution: "@testing-library/jest-dom@npm:6.1.5" +"@testing-library/jest-dom@npm:^6.1.2": + version: 6.1.4 + resolution: "@testing-library/jest-dom@npm:6.1.4" dependencies: "@adobe/css-tools": "npm:^4.3.1" "@babel/runtime": "npm:^7.9.2" @@ -5770,29 +5768,7 @@ __metadata: optional: true vitest: optional: true - checksum: 3bc45dc9cb6dc49134e79ef636612b8639014bdd8c85c3741a78a92345147d03f9efeefc2f02ad306764a62f8c236b0e0ef3d5a68c16af1c51887be45d253f6b - languageName: node - linkType: hard - -"@testing-library/react-hooks@npm:8.0.1": - version: 8.0.1 - resolution: "@testing-library/react-hooks@npm:8.0.1" - dependencies: - "@babel/runtime": "npm:^7.12.5" - react-error-boundary: "npm:^3.1.0" - peerDependencies: - "@types/react": ^16.9.0 || ^17.0.0 - react: ^16.9.0 || ^17.0.0 - react-dom: ^16.9.0 || ^17.0.0 - react-test-renderer: ^16.9.0 || ^17.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - react-dom: - optional: true - react-test-renderer: - optional: true - checksum: f7b69373feebe99bc7d60595822cc5c00a1a5a4801bc4f99b597256a5c1d23c45a51f359051dd8a7bdffcc23b26f324c582e9433c25804934fd351a886812790 + checksum: e5a0cdb96eec509c0c85f2b7a0d08fc1c9f6c10aa49bba0d738bf4bb114c3472b92ace5067aedfaaf848ae13b38ba9296047c219aa24b66c87aa16de33341fdb languageName: node linkType: hard @@ -6419,15 +6395,6 @@ __metadata: languageName: node linkType: hard -"@types/testing-library__jest-dom@npm:^6.0.0": - version: 6.0.0 - resolution: "@types/testing-library__jest-dom@npm:6.0.0" - dependencies: - "@testing-library/jest-dom": "npm:*" - checksum: 1b4db1aa3c4225524203b4d1c3b36c7129e9d1e0547e46d2e5283c3ece226a3c16f5f20387cc71b33ab0eecd99d0cf91111bb327e8adb240388d99fb94af7a4d - languageName: node - linkType: hard - "@types/unist@npm:*, @types/unist@npm:^3.0.0": version: 3.0.2 resolution: "@types/unist@npm:3.0.2" @@ -16398,17 +16365,6 @@ __metadata: languageName: node linkType: hard -"react-error-boundary@npm:^3.1.0": - version: 3.1.4 - resolution: "react-error-boundary@npm:3.1.4" - dependencies: - "@babel/runtime": "npm:^7.12.5" - peerDependencies: - react: ">=16.13.1" - checksum: 7418637bf352b88f35ff3798e6faa094ee046df9d422fc08f54c017892c3c0738dac661ba3d64d97209464e7a60e7fbbeffdbeaee5edc38f3aaf5f1f4a8bf610 - languageName: node - linkType: hard - "react-error-boundary@npm:^4.0.11": version: 4.0.11 resolution: "react-error-boundary@npm:4.0.11"