stragglers

coder · aslilac · Sep 11, 2023 · Sep 8, 2023 · Sep 8, 2023 · Sep 8, 2023
commit 1ee252d1b84fc797bccdc7cf963de4ec0482128e
diff --git a/site/src/pages/LoginPage/LoginPage.test.tsx b/site/src/pages/LoginPage/LoginPage.test.tsx
@@ -11,9 +11,6 @@ import {
 import { server } from "testHelpers/server";
 import { LoginPage } from "./LoginPage";
 import * as TypesGen from "api/typesGenerated";
-import { i18n } from "i18n";
-
-const { t } = i18n;
 
 describe("LoginPage", () => {
   beforeEach(() => {
@@ -101,8 +98,7 @@ describe("LoginPage", () => {
     expect(screen.queryByText(Language.passwordSignIn)).not.toBeInTheDocument();
     await screen.findByText(Language.githubSignIn);
 
-    const showPasswordLabel = t("showPassword", { ns: "loginPage" });
-    const showPasswordAuthLink = screen.getByText(showPasswordLabel);
+    const showPasswordAuthLink = screen.getByText("Email and password");
     await userEvent.click(showPasswordAuthLink);
 
     await screen.findByText(Language.passwordSignIn);

diff --git a/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx
@@ -3,11 +3,8 @@ import * as API from "../../../api/api";
 import { renderWithAuth } from "../../../testHelpers/renderHelpers";
 import { Language as SSHKeysPageLanguage, SSHKeysPage } from "./SSHKeysPage";
 import { Language as SSHKeysPageViewLanguage } from "./SSHKeysPageView";
-import { i18n } from "i18n";
 import { MockGitSSHKey, mockApiError } from "testHelpers/entities";
 
-const { t } = i18n;
-
 describe("SSH keys Page", () => {
   it("shows the SSH key", async () => {
     renderWithAuth(<SSHKeysPage />);
@@ -46,10 +43,7 @@ describe("SSH keys Page", () => {
         fireEvent.click(confirmButton);
 
         // Check if the success message is displayed
-        const successMessage = t("sshRegenerateSuccessMessage", {
-          ns:
10000
 "userSettingsPage",
-        });
-        await screen.findByText(successMessage);
+        await screen.findByText("SSH Key regenerated successfully.");
 
         // Check if the API was called correctly
         expect(API.regenerateUserSSHKey).toBeCalledTimes(1);

diff --git a/site/src/pages/UsersPage/UsersPage.test.tsx b/site/src/pages/UsersPage/UsersPage.test.tsx
@@ -1,6 +1,5 @@
 import { fireEvent, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { i18n } from "i18n";
 import { rest } from "msw";
 import {
   MockUser,
@@ -17,8 +16,6 @@ import { renderWithAuth } from "../../testHelpers/renderHelpers";
 import { server } from "../../testHelpers/server";
 import { Language as UsersPageLanguage, UsersPage } from "./UsersPage";
 
-const { t } = i18n;
-
 const renderPage = () => {
   return renderWithAuth(<UsersPage />);
 };
@@ -32,8 +29,7 @@ const suspendUser = async (setupActionSpies: () => void) => {
   await user.click(firstMoreButton);
 
   const menu = await screen.findByRole("menu");
-  const text = t("suspendMenuItem", { ns: "usersPage" });
-  const suspendButton = within(menu).getByText(text);
+  const suspendButton = within(menu).getByText("Suspend");
 
   await user.click(suspendButton);
 
@@ -64,27 +60,18 @@ const deleteUser = async (setupActionSpies: () => void) => {
   await user.click(selectedMoreButton);
 
   const menu = await screen.findByRole("menu");
-  const text = t("deleteMenuItem", { ns: "usersPage" });
-  const deleteButton = within(menu).getByText(text);
+  const deleteButton = within(menu).getByText("Delete");
 
   await user.click(deleteButton);
 
   // Check if the confirm message is displayed
   const confirmDialog = await screen.findByRole("dialog");
   expect(confirmDialog).toHaveTextContent(
-    t("deleteDialog.confirm", {
-      ns: "common",
-      entity: "user",
-      name: MockUser2.username,
-    }).toString(),
+    `Type ${MockUser2.username} below to confirm.`,
   );
 
   // Confirm with text input
-  const labelText = t("deleteDialog.confirmLabel", {
-    ns: "common",
-    entity: "user",
-  });
-  const textField = screen.getByLabelText(labelText);
+  const textField = screen.getByLabelText("Name of user to delete");
   const dialog = screen.getByRole("dialog");
   await user.type(textField, MockUser2.username);
 
@@ -102,8 +89,7 @@ const activateUser = async (setupActionSpies: () => void) => {
   fireEvent.click(suspendedMoreButton);
 
   const menu = screen.getByRole("menu");
-  const text = t("activateMenuItem", { ns: "usersPage" });
-  const activateButton = within(menu).getByText(text);
+  const activateButton = within(menu).getByText("Activate");
   fireEvent.click(activateButton);
 
   // Check if the confirm message is displayed
@@ -129,8 +115,7 @@ const resetUserPassword = async (setupActionSpies: () => void) => {
   fireEvent.click(firstMoreButton);
 
   const menu = screen.getByRole("menu");
-  const text = t("resetPasswordMenuItem", { ns: "usersPage" });
-  const resetPasswordButton = within(menu).getByText(text);
+  const resetPasswordButton = within(menu).getByText("Reset password");
 
   fireEvent.click(resetPasswordButton);
 
@@ -160,16 +145,14 @@ const updateUserRole = async (setupActionSpies: () => void, role: Role) => {
   }
 
   // Click on the "edit icon" to display the role options
-  const buttonTitle = t("editUserRolesTooltip", { ns: "usersPage" });
-  const editButton = within(userRow).getByTitle(buttonTitle);
+  const editButton = within(userRow).getByTitle("Edit user roles");
   fireEvent.click(editButton);
 
   // Setup spies to check the actions after
   setupActionSpies();
 
   // Click on the role option
-  const fieldsetTitle = t("fieldSetRolesTooltip", { ns: "usersPage" });
-  const fieldset = await screen.findByTitle(fieldsetTitle);
+  const fieldset = await screen.findByTitle("Available roles");
   const auditorOption = within(fieldset).getByText(role.display_name);
   fireEvent.click(auditorOption);
 

diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.test.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.test.tsx
@@ -8,13 +8,10 @@ import {
 } from "testHelpers/renderHelpers";
 import { server } from "testHelpers/server";
 import WorkspacesPage from "./WorkspacesPage";
-import { i18n } from "i18n";
 import userEvent from "@testing-library/user-event";
 import * as API from "api/api";
 import { Workspace } from "api/typesGenerated";
 
-const { t } = i18n;
-
 describe("WorkspacesPage", () => {
   beforeEach(() => {
     // Mocking the dayjs module within the createDayString file
@@ -34,8 +31,7 @@ describe("WorkspacesPage", () => {
     renderWithAuth(<WorkspacesPage />);
 
     // Then
-    const text = t("emptyCreateWorkspaceMessage", { ns: "workspacesPage" });
-    await screen.findByText(text);
+    await screen.findByText("Create a Workspace");
   });
 
   it("renders a filled workspaces page", async () => {

diff --git a/site/src/xServices/sshKey/sshKeyXService.ts b/site/src/xServices/sshKey/sshKeyXService.ts
@@ -2,9 +2,6 @@ import { getUserSSHKey, regenerateUserSSHKey } from "api/api";
 import { GitSSHKey } from "api/typesGenerated";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
 import { createMachine, assign } from "xstate";
-import { i18n } from "i18n";
-
-const { t } = i18n;
 
 interface Context {
   sshKey?: GitSSHKey;
@@ -116,9 +113,7 @@ export const sshKeyMachine = createMachine(
         regenerateSSHKeyError: (_) => undefined,
       }),
       notifySuccessSSHKeyRegenerated: () => {
-        displaySuccess(
-          t("sshRegenerateSuccessMessage", { ns: "userSettingsPage" }),
-        );
+        displaySuccess("SSH Key regenerated successfully.");
       },
     },
   },