Fic previous tests

BrunoQuaresma · BrunoQuaresma · commit 2d36d44e53ee · 2023-06-23T14:27:52.000Z
diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx
@@ -1,116 +1,117 @@
 import { fireEvent, screen, waitFor } from "@testing-library/react"
 import * as API from "../../../api/api"
 import * as SecurityForm from "../../../components/SettingsSecurityForm/SettingsSecurityForm"
-import { renderWithAuth } from "../../../testHelpers/renderHelpers"
+import {
+  renderWithAuth,
+  waitForLoaderToBeRemoved,
+} from "../../../testHelpers/renderHelpers"
 import { SecurityPage } from "./SecurityPage"
 import i18next from "i18next"
-import { mockApiError } from "testHelpers/entities"
+import {
+  MockAuthMethodsWithPasswordType,
+  mockApiError,
+} from "testHelpers/entities"
 
 const { t } = i18next
 
-const renderPage = () => {
-  return renderWithAuth(<SecurityPage />)
+const renderPage = async () => {
+  const utils = renderWithAuth(<SecurityPage />)
+  await waitForLoaderToBeRemoved()
+  return utils
 }
 
-const newData = {
+const newSecurityFormValues = {
   old_password: "password1",
   password: "password2",
   confirm_password: "password2",
 }
 
-const fillAndSubmitForm = async () => {
-  await waitFor(() => screen.findByLabelText("Old Password"))
+const fillAndSubmitSecurityForm = () => {
   fireEvent.change(screen.getByLabelText("Old Password"), {
-    target: { value: newData.old_password },
+    target: { value: newSecurityFormValues.old_password },
   })
   fireEvent.change(screen.getByLabelText("New Password"), {
-    target: { value: newData.password },
+    target: { value: newSecurityFormValues.password },
   })
   fireEvent.change(screen.getByLabelText("Confirm Password"), {
-    target: { value: newData.confirm_password },
+    target: { value: newSecurityFormValues.confirm_password },
   })
   fireEvent.click(screen.getByText(SecurityForm.Language.updatePassword))
 }
 
-describe("SecurityPage", () => {
-  describe("when it is a success", () => {
-    it("shows the success message", async () => {
-      jest
-        .spyOn(API, "updateUserPassword")
-        .mockImplementationOnce((_userId, _data) => Promise.resolve(undefined))
-      const { user } = renderPage()
-      await fillAndSubmitForm()
-
-      const expectedMessage = t("securityUpdateSuccessMessage", {
-        ns: "userSettingsPage",
-      })
-      const successMessage = await screen.findByText(expectedMessage)
-      expect(successMessage).toBeDefined()
-      expect(API.updateUserPassword).toBeCalledTimes(1)
-      expect(API.updateUserPassword).toBeCalledWith(user.id, newData)
-
-      await waitFor(() => expect(window.location).toBeAt("/"))
-    })
-  })
+beforeEach(() => {
+  jest
+    .spyOn(API, "getAuthMethods")
+    .mockResolvedValue(MockAuthMethodsWithPasswordType)
+})
+
+test("update password successfully", async () => {
+  jest
+    .spyOn(API, "updateUserPassword")
+    .mockImplementationOnce((_userId, _data) => Promise.resolve(undefined))
+  const { user } = await renderPage()
+  fillAndSubmitSecurityForm()
 
-  describe("when the old_password is incorrect", () => {
-    it("shows an error", async () => {
-      jest.spyOn(API, "updateUserPassword").mockRejectedValueOnce(
-        mockApiError({
-          message: "Incorrect password.",
-          validations: [
-            { detail: "Incorrect password.", field: "old_password" },
-          ],
-        }),
-      )
-
-      const { user } = renderPage()
-      await fillAndSubmitForm()
-
-      const errorMessage = await screen.findAllByText("Incorrect password.")
-      expect(errorMessage).toBeDefined()
-      expect(errorMessage).toHaveLength(2)
-      expect(API.updateUserPassword).toBeCalledTimes(1)
-      expect(API.updateUserPassword).toBeCalledWith(user.id, newData)
-    })
+  const expectedMessage = t("securityUpdateSuccessMessage", {
+    ns: "userSettingsPage",
   })
+  const successMessage = await screen.findByText(expectedMessage)
+  expect(successMessage).toBeDefined()
+  expect(API.updateUserPassword).toBeCalledTimes(1)
+  expect(API.updateUserPassword).toBeCalledWith(user.id, newSecurityFormValues)
+
+  await waitFor(() => expect(window.location).toBeAt("/"))
+})
 
-  describe("when the password is invalid", () => {
-    it("shows an error", async () => {
-      jest.spyOn(API, "updateUserPassword").mockRejectedValueOnce(
-        mockApiError({
-          message: "Invalid password.",
-          validations: [{ detail: "Invalid password.", field: "password" }],
-        }),
-      )
-
-      const { user } = renderPage()
-      await fillAndSubmitForm()
-
-      const errorMessage = await screen.findAllByText("Invalid password.")
-      expect(errorMessage).toBeDefined()
-      expect(errorMessage).toHaveLength(2)
-      expect(API.updateUserPassword).toBeCalledTimes(1)
-      expect(API.updateUserPassword).toBeCalledWith(user.id, newData)
-    })
+test("update password with incorrect old password", async () => {
+  jest.spyOn(API, "updateUserPassword").mockRejectedValueOnce(
+    mockApiError({
+      message: "Incorrect password.",
+      validations: [{ detail: "Incorrect password.", field: "old_password" }],
+    }),
+  )
+
+  const { user } = await renderPage()
+  fillAndSubmitSecurityForm()
+
+  const errorMessage = await screen.findAllByText("Incorrect password.")
+  expect(errorMessage).toBeDefined()
+  expect(errorMessage).toHaveLength(2)
+  expect(API.updateUserPassword).toBeCalledTimes(1)
+  expect(API.updateUserPassword).toBeCalledWith(user.id, newSecurityFormValues)
+})
+
+test("update password with invalid password", async () => {
+  jest.spyOn(API, "updateUserPassword").mockRejectedValueOnce(
+    mockApiError({
+      message: "Invalid password.",
+      validations: [{ detail: "Invalid password.", field: "password" }],
+    }),
+  )
+
+  const { user } = await renderPage()
+  fillAndSubmitSecurityForm()
+
+  const errorMessage = await screen.findAllByText("Invalid password.")
+  expect(errorMessage).toBeDefined()
+  expect(errorMessage).toHaveLength(2)
+  expect(API.updateUserPassword).toBeCalledTimes(1)
+  expect(API.updateUserPassword).toBeCalledWith(user.id, newSecurityFormValues)
+})
+
+test("update password when submit returns an unknown error", async () => {
+  jest.spyOn(API, "updateUserPassword").mockRejectedValueOnce({
+    data: "unknown error",
   })
 
-  describe("when it is an unknown error", () => {
-    it("shows a generic error message", async () => {
-      jest.spyOn(API, "updateUserPassword").mockRejectedValueOnce({
-        data: "unknown error",
-      })
-
-      const { user } = renderPage()
-      await fillAndSubmitForm()
-
-      const errorText = t("warningsAndErrors.somethingWentWrong", {
-        ns: "common",
-      })
-      const errorMessage = await screen.findByText(errorText)
-      expect(errorMessage).toBeDefined()
-      expect(API.updateUserPassword).toBeCalledTimes(1)
-      expect(API.updateUserPassword).toBeCalledWith(user.id, newData)
-    })
+  const { user } = await renderPage()
+  fillAndSubmitSecurityForm()
+
+  const errorText = t("warningsAndErrors.somethingWentWrong", {
+    ns: "common",
   })
+  const errorMessage = await screen.findByText(errorText)
+  expect(errorMessage).toBeDefined()
+  expect(API.updateUserPassword).toBeCalledTimes(1)
+  expect(API.updateUserPassword).toBeCalledWith(user.id, newSecurityFormValues)
 })
diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPageView.stories.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPageView.stories.tsx
@@ -1,10 +1,12 @@
 import type { Meta, StoryObj } from "@storybook/react"
 import { SecurityPageView } from "./SecurityPage"
 import { action } from "@storybook/addon-actions"
-import { MockAuthMethods } from "testHelpers/entities"
+import {
+  MockAuthMethods,
+  MockAuthMethodsWithPasswordType,
+} from "testHelpers/entities"
 import { ComponentProps } from "react"
 import set from "lodash/fp/set"
-import { AuthMethods } from "api/typesGenerated"
 
 const defaultArgs: ComponentProps<typeof SecurityPageView> = {
   security: {
@@ -46,23 +48,20 @@ export const NoOIDCAvailable: Story = {
   },
 }
 
-const authMethodsWithPassword: AuthMethods = {
-  ...MockAuthMethods,
-  me_login_type: "password",
-  github: { enabled: true },
-  oidc: { enabled: true, signInText: "", iconUrl: "" },
-}
-
 export const UserLoginTypeIsPassword: Story = {
-  args: set("oidc.section.authMethods", authMethodsWithPassword, defaultArgs),
+  args: set(
+    "oidc.section.authMethods",
+    MockAuthMethodsWithPasswordType,
+    defaultArgs,
+  ),
 }
 
 export const ConfirmingOIDCConversion: Story = {
   args: set(
     "oidc.section",
     {
       ...defaultArgs.oidc?.section,
-      authMethods: authMethodsWithPassword,
+      authMethods: MockAuthMethodsWithPasswordType,
       isConfirming: true,
     },
     defaultArgs,
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -1024,6 +1024,13 @@ export const MockAuthMethods: TypesGen.AuthMethods = {
   convert_to_oidc_enabled: true,
 }
 
+export const MockAuthMethodsWithPasswordType: TypesGen.AuthMethods = {
+  ...MockAuthMethods,
+  me_login_type: "password",
+  github: { enabled: true },
+  oidc: { enabled: true, signInText: "", iconUrl: "" },
+}
+
 export const MockGitSSHKey: TypesGen.GitSSHKey = {
   user_id: "1fa0200f-7331-4524-a364-35770666caa7",
   created_at: "2022-05-16T14:30:34.148205897Z",
