Skip to content

feat: add … to actions that require confirmation #9862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 25, 2023
Merged

feat: add … to actions that require confirmation #9862

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4cfa3fd
chore: clean up license settings
aslilac Sep 25, 2023
daac530
chore: clean up users table
aslilac Sep 25, 2023
1aac427
chore: minor changes to ssh keys page
aslilac Sep 25, 2023
245a754
chore: fix up group overview
aslilac Sep 25, 2023
7a157ec
test
aslilac Sep 25, 2023
e043506
🧹
aslilac Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test
  • Loading branch information
@aslilac
aslilac committed Sep 25, 2023
commit 7a157ec14869bdcfa3dd875e523aca58fd0a3f6f
16 changes: 8 additions & 8 deletions site/src/pages/UsersPage/UsersPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import {
MockOwnerRole,
} from "testHelpers/entities";
import { Language as usersXServiceLanguage } from "xServices/users/usersXService";
import * as API from "../../api/api";
import { Role } from "../../api/typesGenerated";
import * as API from "api/api";
import { Role } from "api/typesGenerated";
import { Language as ResetPasswordDialogLanguage } from "./ResetPasswordDialog";
import { renderWithAuth } from "../../testHelpers/renderHelpers";
import { server } from "../../testHelpers/server";
import { renderWithAuth } from "testHelpers/renderHelpers";
import { server } from "testHelpers/server";
import { Language as UsersPageLanguage, UsersPage } from "./UsersPage";

const renderPage = () => {
Expand All @@ -29,7 +29,7 @@ const suspendUser = async (setupActionSpies: () => void) => {
await user.click(firstMoreButton);

const menu = await screen.findByRole("menu");
const suspendButton = within(menu).getByText("Suspend");
const suspendButton = within(menu).getByText(/Suspend/);

await user.click(suspendButton);

Expand Down Expand Up @@ -60,7 +60,7 @@ const deleteUser = async (setupActionSpies: () => void) => {
await user.click(selectedMoreButton);

const menu = await screen.findByRole("menu");
const deleteButton = within(menu).getByText("Delete");
const deleteButton = within(menu).getByText(/Delete/);

await user.click(deleteButton);

Expand Down Expand Up @@ -89,7 +89,7 @@ const activateUser = async (setupActionSpies: () => void) => {
fireEvent.click(suspendedMoreButton);

const menu = screen.getByRole("menu");
const activateButton = within(menu).getByText("Activate");
const activateButton = within(menu).getByText(/Activate/);
fireEvent.click(activateButton);

// Check if the confirm message is displayed
Expand All @@ -115,7 +115,7 @@ const resetUserPassword = async (setupActionSpies: () => void) => {
fireEvent.click(firstMoreButton);

const menu = screen.getByRole("menu");
const resetPasswordButton = within(menu).getByText("Reset password");
const resetPasswordButton = within(menu).getByText(/Reset password/);

fireEvent.click(resetPasswordButton);

Expand Down