refactor all the remaining tests

coder · aslilac · Sep 11, 2023 · Sep 8, 2023 · Sep 8, 2023 · Sep 8, 2023
commit f1c5909b21063497959d912c513fca4c9c8dab0a
@@ -12,9 +12,6 @@ import {
 } from "testHelpers/renderHelpers";
 import { TemplateScheduleFormValues, getValidationSchema } from "./formHelpers";
 import TemplateSchedulePage from "./TemplateSchedulePage";
-import i18next from "i18next";
-
-const { t } = i18next;
 
 const validFormValues: TemplateScheduleFormValues = {
   default_ttl_ms: 1,
@@ -55,17 +52,15 @@ const fillAndSubmitForm = async ({
   const user = userEvent.setup();
 
   if (default_ttl_ms) {
-    const defaultTtlLabel = t("defaultTtlLabel", {
-      ns: "templateSettingsPage",
-    });
-    const defaultTtlField = await screen.findByLabelText(defaultTtlLabel);
+    const defaultTtlField = await screen.findByLabelText(
+      "Default autostop (hours)",
+    );
     await user.clear(defaultTtlField);
     await user.type(defaultTtlField, default_ttl_ms.toString());
   }
 
   if (max_ttl_ms) {
-    const maxTtlLabel = t("maxTtlLabel", { ns: "templateSettingsPage" });
-    const maxTtlField = await screen.findByLabelText(maxTtlLabel);
+    const maxTtlField = await screen.findByLabelText("Max lifetime (hours)");
     await user.clear(maxTtlField);
     await user.type(maxTtlField, max_ttl_ms.toString());
   }
@@ -203,7 +198,7 @@ describe("TemplateSchedulePage", () => {
     };
     const validate = () => getValidationSchema().validateSync(values);
     expect(validate).toThrowError(
-      t("defaultTTLMaxError", { ns: "templateSettingsPage" }).toString(),
+      "Please enter a limit that is less than or equal to 720 hours (30 days).",
     );
   });
 

@@ -5,7 +5,6 @@ import {
   waitForLoaderToBeRemoved,
 } from "testHelpers/renderHelpers";
 import * as API from "api/api";
-import i18next from "i18next";
 import TemplateVariablesPage from "./TemplateVariablesPage";
 import { Language as FooterFormLanguage } from "components/FormFooter/FormFooter";
 import {
@@ -17,18 +16,12 @@ import {
   MockTemplateVersionVariable5,
 } from "testHelpers/entities";
 
-const { t } = i18next;
-
 const validFormValues = {
   first_variable: "Hello world",
   second_variable: "123",
 };
 
-const pageTitleText = t("title", { ns: "templateVariablesPage" });
-
-const validationRequiredField = t("validationRequiredVariable", {
-  ns: "templateVariablesPage",
-});
+const validationRequiredField = "Variable is required.";
 
 const renderTemplateVariablesPage = async () => {
   renderWithTemplateSettingsLayout(<TemplateVariablesPage />, {
@@ -54,9 +47,6 @@ describe("TemplateVariablesPage", () => {
 
     await renderTemplateVariablesPage();
 
-    const element = await screen.findByText(pageTitleText);
-    expect(element).toBeDefined();
-
     const firstVariable = await screen.findByLabelText(
       MockTemplateVersionVariable1.name,
     );
@@ -88,9 +78,6 @@ describe("TemplateVariablesPage", () => {
 
     await renderTemplateVariablesPage();
 
-    const element = await screen.findByText(pageTitleText);
-    expect(element).toBeDefined();
-
     const firstVariable = await screen.findByLabelText(
       MockTemplateVersionVariable1.name,
     );
@@ -144,9 +131,6 @@ describe("TemplateVariablesPage", () => {
 
     await renderTemplateVariablesPage();
 
-    const element = await screen.findByText(pageTitleText);
-    expect(element).toBeDefined();
-
     const firstVariable = await screen.findByLabelText(
       MockTemplateVersionVariable1.name,
     );

@@ -4,11 +4,8 @@ import * as AccountForm from "./AccountForm";
 import { renderWithAuth } from "testHelpers/renderHelpers";
 import * as AuthXService from "xServices/auth/authXService";
 import { AccountPage } from "./AccountPage";
-import i18next from "i18next";
 import { mockApiError } from "testHelpers/entities";
 
-const { t } = i18next;
-
 const renderPage = () => {
   return renderWithAuth(<AccountPage />);
 };
@@ -86,10 +83,7 @@ describe("AccountPage", () => {
       const { user } = renderPage();
       await fillAndSubmitForm();
 
-      const errorText = t("warningsAndErrors.somethingWentWrong", {
-        ns: "common",
-      });
-      const errorMessage = await screen.findByText(errorText);
+      const errorMessage = await screen.findByText("Something went wrong.");
       expect(errorMessage).toBeDefined();
       expect(API.updateProfile).toBeCalledTimes(1);
       expect(API.updateProfile).toBeCalledWith(user.id, newData);

@@ -6,7 +6,6 @@ import {
   waitForLoaderToBeRemoved,
 } from "../../../testHelpers/renderHelpers";
 import { SecurityPage } from "./SecurityPage";
-import i18next from "i18next";
 import {
   MockAuthMethodsWithPasswordType,
   mockApiError,
@@ -15,8 +14,6 @@ import userEvent from "@testing-library/user-event";
 import * as SSO from "./SingleSignOnSection";
 import { OAuthConversionResponse } from "api/typesGenerated";
 
-const { t } = i18next;
-
 const renderPage = async () => {
   const utils = renderWithAuth(<SecurityPage />);
   await waitForLoaderToBeRemoved();
@@ -58,10 +55,7 @@ test("update password successfully", async () => {
   const { user } = await renderPage();
   fillAndSubmitSecurityForm();
 
-  const expectedMessage = t("securityUpdateSuccessMessage", {
-    ns: "userSettingsPage",
-  });
-  const successMessage = await screen.findByText(expectedMessage);
+  const successMessage = await screen.findByText("Updated password.");
   expect(successMessage).toBeDefined();
   expect(API.updateUserPassword).toBeCalledTimes(1);
   expect(API.updateUserPassword).toBeCalledWith(user.id, newSecurityFormValues);
@@ -113,10 +107,7 @@ test("update password when submit returns an unknown error", async () => {
   const { user } = await renderPage();
   fillAndSubmitSecurityForm();
 
-  const errorText = t("warningsAndErrors.somethingWentWrong", {
-    ns: "common",
-  });
-  const errorMessage = await screen.findByText(errorText);
+  const errorMessage = await screen.findByText("Something went wrong.");
   expect(errorMessage).toBeDefined();
   expect(API.updateUserPassword).toBeCalledTimes(1);
   expect(API.updateUserPassword).toBeCalledWith(user.id, newSecurityFormValues);

@@ -1,7 +1,6 @@
 import { screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import EventSourceMock from "eventsourcemock";
-import i18next from "i18next";
 import { rest } from "msw";
 import {
   MockTemplate,
@@ -34,8 +33,6 @@ import {
 import { server } from "../../testHelpers/server";
 import { WorkspacePage } from "./WorkspacePage";
 
-const { t } = i18next;
-
 // It renders the workspace page and waits for it be loaded
 const renderWorkspacePage = async () => {
   jest.spyOn(api, "getTemplate").mockResolvedValueOnce(MockTemplate);
@@ -114,18 +111,14 @@ describe("WorkspacePage", () => {
     // open the workspace action popover so we have access to all available ctas
     const trigger = screen.getByTestId("workspace-options-button");
     await user.click(trigger);
-    const buttonText = t("actionButton.delete", { ns: "workspacePage" });
 
     // Click on delete
-    const button = await screen.findByText(buttonText);
+    const button = await screen.findByText("Delete");
     await user.click(button);
 
     // Get dialog and confirm
     const dialog = await screen.findByTestId("dialog");
-    const labelText = t("deleteDialog.confirmLabel", {
-      ns: "common",
-      entity: "workspace",
-    });
+    const labelText = "Name of workspace to delete";
     const textField = within(dialog).getByLabelText(labelText);
     await user.type(textField, MockWorkspace.name);
     const confirmButton = within(dialog).getByRole("button", {
@@ -148,21 +141,15 @@ describe("WorkspacePage", () => {
     const startWorkspaceMock = jest
       .spyOn(api, "startWorkspace")
       .mockImplementation(() => Promise.resolve(MockWorkspaceBuild));
-    await testButton(
-      t("actionButton.start", { ns: "workspacePage" }),
-      startWorkspaceMock,
-    );
+    await testButton("Start", startWorkspaceMock);
   });
 
   it("requests a stop job when the user presses Stop", async () => {
     const stopWorkspaceMock = jest
       .spyOn(api, "stopWorkspace")
       .mockResolvedValueOnce(MockWorkspaceBuild);
 
-    await testButton(
-      t("actionButton.stop", { ns: "workspacePage" }),
-      stopWorkspaceMock,
-    );
+    await testButton("Stop", stopWorkspaceMock);
   });
 
   it("requests a stop when the user presses Restart", async () => {
@@ -319,66 +306,39 @@ describe("WorkspacePage", () => {
   });
 
   it("shows the Stopping status when the workspace is stopping", async () => {
-    await testStatus(
-      MockStoppingWorkspace,
-      t("workspaceStatus.stopping", { ns: "common" }),
-    );
+    await testStatus(MockStoppingWorkspace, "Stopping");
   });
 
   it("shows the Stopped status when the workspace is stopped", async () => {
-    await testStatus(
-      MockStoppedWorkspace,
-      t("workspaceStatus.stopped", { ns: "common" }),
-    );
+    await testStatus(MockStoppedWorkspace, "Stopped");
   });
 
   it("shows the Building status when the workspace is starting", async () => {
-    await testStatus(
-      MockStartingWorkspace,
-      t("workspaceStatus.starting", { ns: "common" }),
-    );
+    await testStatus(MockStartingWorkspace, "Starting");
   });
 
   it("shows the Running status when the workspace is running", async () => {
-    await testStatus(
-      MockWorkspace,
-      t("workspaceStatus.running", { ns: "common" }),
-    );
+    await testStatus(MockWorkspace, "Running");
   });
 
   it("shows the Failed status when the workspace is failed or canceled", async () => {
-    await testStatus(
-      MockFailedWorkspace,
-      t("workspaceStatus.failed", { ns: "common" }),
-    );
+    await testStatus(MockFailedWorkspace, "Failed");
   });
 
   it("shows the Canceling status when the workspace is canceling", async () => {
-    await testStatus(
-      MockCancelingWorkspace,
-      t("workspaceStatus.canceling", { ns: "common" }),
-    );
+    await testStatus(MockCancelingWorkspace, "Canceling");
   });
 
   it("shows the Canceled status when the workspace is canceling", async () => {
-    await testStatus(
-      MockCanceledWorkspace,
-      t("workspaceStatus.canceled", { ns: "common" }),
-    );
+    await testStatus(MockCanceledWorkspace, "Canceled");
   });
 
   it("shows the Deleting status when the workspace is deleting", async () => {
-    await testStatus(
-      MockDeletingWorkspace,
-      t("workspaceStatus.deleting", { ns: "common" }),
-    );
+    await testStatus(MockDeletingWorkspace, "Deleting");
   });
 
   it("shows the Deleted status when the workspace is deleted", async () => {
-    await testStatus(
-      MockDeletedWorkspace,
-      t("workspaceStatus.deleted", { ns: "common" }),
-    );
+    await testStatus(MockDeletedWorkspace, "Deleted");
   });
 
   it("shows the Impending deletion status when the workspace is impending deletion", async () => {

@@ -19,13 +19,10 @@ import {
   Language as FormLanguage,
 } from "./WorkspaceScheduleForm";
 import { WorkspaceSchedulePage } from "./WorkspaceSchedulePage";
-import i18next from "i18next";
 import { server } from "testHelpers/server";
 import { rest } from "msw";
 import { MockUser, MockWorkspace } from "testHelpers/entities";
 
-const { t } = i18next;
-
 const validValues: WorkspaceScheduleFormValues = {
   autostartEnabled: true,
   sunday: false,
@@ -306,8 +303,7 @@ describe("WorkspaceSchedulePage", () => {
         name: /submit/i,
       });
       await user.click(submitButton);
-      const title = t("dialogTitle", { ns: "workspaceSchedulePage" });
-      const dialog = await screen.findByText(title);
+      const dialog = await screen.findByText("Restart workspace?");
       expect(dialog).toBeInTheDocument();
     });
 
@@ -328,8 +324,7 @@ describe("WorkspaceSchedulePage", () => {
         name: /submit/i,
       });
       await user.click(submitButton);
-      const title = t("dialogTitle", { ns: "workspaceSchedulePage" });
-      const dialog = screen.queryByText(title);
+      const dialog = screen.queryByText("Restart workspace?");
       expect(dialog).not.toBeInTheDocument();
     });
   });