From 5bf23385b95cd13f1e1739dce44bc8bbd5fe7e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2024 14:06:57 +0100 Subject: [PATCH 1/3] fix(web): fix RootUser definition --- web/src/types/users.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/types/users.ts b/web/src/types/users.ts index bd88452d4c..a89fe211bd 100644 --- a/web/src/types/users.ts +++ b/web/src/types/users.ts @@ -28,7 +28,7 @@ type FirstUser = { type RootUser = { password: boolean; - sshkey: string | null; + sshkey: string; }; type RootUserChanges = { From 783053efd0c96a48470f8d7cd4bd7908ff34e01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2024 14:09:06 +0100 Subject: [PATCH 2/3] fix(web): fix root auth tests --- web/src/components/users/RootAuthMethods.test.jsx | 2 +- web/src/components/users/RootPasswordPopup.test.jsx | 2 +- web/src/components/users/RootSSHKeyPopup.test.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/components/users/RootAuthMethods.test.jsx b/web/src/components/users/RootAuthMethods.test.jsx index ea1c5f22dd..14b3222590 100644 --- a/web/src/components/users/RootAuthMethods.test.jsx +++ b/web/src/components/users/RootAuthMethods.test.jsx @@ -33,7 +33,7 @@ let mockSSHKey; jest.mock("~/queries/users", () => ({ ...jest.requireActual("~/queries/users"), - useRootUser: () => ({ data: { password: mockPassword, sshkey: mockSSHKey } }), + useRootUser: () => ({ password: mockPassword, sshkey: mockSSHKey }), useRootUserMutation: () => mockRootUserMutation, useRootUserChanges: () => jest.fn(), })); diff --git a/web/src/components/users/RootPasswordPopup.test.jsx b/web/src/components/users/RootPasswordPopup.test.jsx index 833e388019..b2a825c477 100644 --- a/web/src/components/users/RootPasswordPopup.test.jsx +++ b/web/src/components/users/RootPasswordPopup.test.jsx @@ -31,7 +31,7 @@ let mockSSHKey; jest.mock("~/queries/users", () => ({ ...jest.requireActual("~/queries/users"), - useRootUser: () => ({ data: { password: mockPassword, sshkey: "" } }), + useRootUser: () => ({ password: mockPassword, sshkey: "" }), useRootUserMutation: () => mockRootUserMutation, useRootUserChanges: () => jest.fn(), })); diff --git a/web/src/components/users/RootSSHKeyPopup.test.jsx b/web/src/components/users/RootSSHKeyPopup.test.jsx index e68bcc8bcb..da0dff615f 100644 --- a/web/src/components/users/RootSSHKeyPopup.test.jsx +++ b/web/src/components/users/RootSSHKeyPopup.test.jsx @@ -30,7 +30,7 @@ let mockSSHKey; jest.mock("~/queries/users", () => ({ ...jest.requireActual("~/queries/users"), - useRootUser: () => ({ data: { sshkey: mockSSHKey } }), + useRootUser: () => ({ sshkey: mockSSHKey }), useRootUserMutation: () => mockRootUserMutation, useRootUserChanges: () => jest.fn(), })); From 084e3d39a5cdbdf629eac1b222c6754fe2221371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2024 14:10:37 +0100 Subject: [PATCH 3/3] refactor(web): users tests clean-up --- web/src/components/users/RootAuthMethods.test.jsx | 9 ++------- web/src/components/users/RootSSHKeyPopup.test.jsx | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/web/src/components/users/RootAuthMethods.test.jsx b/web/src/components/users/RootAuthMethods.test.jsx index 14b3222590..41b8ae686c 100644 --- a/web/src/components/users/RootAuthMethods.test.jsx +++ b/web/src/components/users/RootAuthMethods.test.jsx @@ -20,12 +20,9 @@ */ import React from "react"; -import { act, screen, within } from "@testing-library/react"; -import { plainRender, installerRender, createCallbackMock } from "~/test-utils"; -import { noop } from "~/utils"; - +import { screen, within } from "@testing-library/react"; +import { plainRender } from "~/test-utils"; import { RootAuthMethods } from "~/components/users"; -import { useRootUser, useRootUserMutation } from "~/queries/users"; const mockRootUserMutation = { mutate: jest.fn(), mutateAsync: jest.fn() }; let mockPassword; @@ -38,8 +35,6 @@ jest.mock("~/queries/users", () => ({ useRootUserChanges: () => jest.fn(), })); -const isRootPasswordSetFn = jest.fn(); -const removeRootPasswordFn = jest.fn(); const testKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM+ test@example"; beforeEach(() => { diff --git a/web/src/components/users/RootSSHKeyPopup.test.jsx b/web/src/components/users/RootSSHKeyPopup.test.jsx index da0dff615f..33230974d7 100644 --- a/web/src/components/users/RootSSHKeyPopup.test.jsx +++ b/web/src/components/users/RootSSHKeyPopup.test.jsx @@ -21,7 +21,7 @@ import React from "react"; -import { screen, waitFor, within } from "@testing-library/react"; +import { screen, within } from "@testing-library/react"; import { plainRender } from "~/test-utils"; import { RootSSHKeyPopup } from "~/components/users"; @@ -36,7 +36,6 @@ jest.mock("~/queries/users", () => ({ })); const onCloseCallback = jest.fn(); -const setRootSSHKeyFn = jest.fn(); const testKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM+ test@example"; describe("when it is closed", () => {