Compare commits

...

21 Commits

Author SHA1 Message Date
Ashwin Bhatkal
0e9f611b12 test(dashboards): use menu row test IDs and split the list denial test 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
a3ef0d3044 test(explorer): mock the query editor where it is not under test and drop role queries 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
32e550666c test(ai-assistant): fake the retry backoff timers 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
4bdda574c2 test(llm-observability): use test IDs and fake the mapping save delay 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
79af7a6c32 test(integrations): split cloud account setup flows and wait for real readiness 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
8a0a5baee4 test(saved-views): fake the hover delay and render the panel alone 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
9d7092cc1b test(pipelines): split the pipeline edit flow and use test IDs 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
da89bd1a0a test(infra-monitoring): replace role queries in the k8s list and traces tables 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
de6739eb8a test(onboarding): test each questionnaire step on its own 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
ed940b7f3e test(settings): speed up billing, general, ingestion and service account tests 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
4ed05f4a8a test(alerts): render alert list pieces directly and start flows from URL state 2026-11-19 08:31:19 +05:30
Ashwin Bhatkal
b521c822c8 test(exceptions): wait for the run button to settle before clicking it 2026-11-19 08:31:18 +05:30
Ashwin Bhatkal
bb1b4bc3fd test(auth): fill login, sign-up and invite forms without per-key typing 2026-11-19 08:31:18 +05:30
Ashwin Bhatkal
fc224f2eb0 test(roles): test the permission wizard directly instead of through the page 2026-11-19 08:31:18 +05:30
Ashwin Bhatkal
cd1264883b test(sso): query the auth domain form by test ID and drop slow role lookups 2026-11-19 08:31:18 +05:30
Ashwin Bhatkal
feef647b95 test(authz): wait for the permission batch instead of a fixed 200 ms window 2026-11-19 08:31:18 +05:30
Ashwin Bhatkal
aad689acd2 test(frontend): cap local jest workers and recycle workers that grow past 1 GB 2026-11-19 08:31:00 +05:30
Ashwin Bhatkal
77ebf4dca9 test(frontend): skip antd popup scroll-container lookups in every test 2026-11-19 08:31:00 +05:30
Ashwin Bhatkal
c4ac1929fa docs(frontend): run checks only at the gate and add a no-checks keyword 2026-11-19 08:31:00 +05:30
Ashwin Bhatkal
df0f26b5fb docs(frontend): test rules that keep jest tests fast and stable 2026-11-19 08:31:00 +05:30
Ashwin Bhatkal
3843ac4eeb test(frontend): skip pointer-events checks and Floating UI layout in every test 2026-11-19 08:31:00 +05:30
98 changed files with 3177 additions and 3474 deletions

View File

@@ -9,12 +9,14 @@ paths:
Examples and the harness API live in [`frontend/src/tests/README.md`](../../frontend/src/tests/README.md).
- **Import from the harness.** `render`, `screen`, `userEvent`, `waitFor` and the rest come from `tests/test-utils`, never from `@testing-library/react`. The harness mounts the router, React Query, Redux, app context and preferences. When it can't do what a test needs, extend `tests/test-utils` instead of importing around it.
- **Find elements by test ID.** Query with `getByTestId`/`findByTestId` on the `data-testid` or `testId` the component exposes, and add one to the component when it has none. Fall back to role or text only for markup the app doesn't own. A test ID matches exactly one element and survives copy and markup changes; `getByRole` computes the accessibility tree on every call and is the slowest query.
- **Interact like a user.** `const user = userEvent.setup({ pointerEventsCheck: 0 })`, then an awaited `user.click`, `hover`, `keyboard` or `type`. `fireEvent` only for events `userEvent` has no equivalent for: scroll, resize, setting `scrollTop`.
- **Find elements by test ID.** Query with `getByTestId`/`findByTestId` on the `data-testid` or `testId` the component exposes, and add one to the component when it has none. Fall back to role or text only for markup the app doesn't own. A test ID matches exactly one element and survives copy and markup changes; `getByRole` computes the accessibility tree on every call and is the slowest query. Never call a `*ByRole` query inside `waitFor` or a loop: `waitFor` re-runs its callback every 50 ms. Wait with `findByTestId`, then query.
- **Interact like a user.** `const user = userEvent.setup()`, then an awaited `user.click`, `hover`, `keyboard` or `type`. The harness turns off the pointer-events check, which walks `getComputedStyle` up the tree on every action; never turn it back on. `fireEvent` only for events `userEvent` has no equivalent for: scroll, resize, setting `scrollTop`.
- **Fake timers per test only**, for debounce or throttle, with `userEvent.setup({ advanceTimers: (ms) => jest.advanceTimersByTime(ms) })`. Never global.
- **Network through MSW.** The global server runs for every test; override per test with `server.use(...)` from `mocks-server/server`. Large fixtures go in `mocks-server/__mockdata__`.
- **Router through the harness.** Pass `initialRoute`/`routePath` to `render` and assert with `getCurrentLocation()` from `lib/router/navigation`. Never mock `react-router`, `react-router-dom` or `lib/history`; when a test can't render at a route, use the `lib/router` spies in `tests/router-mocks`.
- **Mock only business boundaries.** Local `jest.mock` for API modules, custom hooks and domain components. Never re-mock what the harness provides or what `jest.config.ts` maps (`uplot`, `@signozhq/icons`, `useSafeNavigate`, `logEvent`).
- **Mock only business boundaries.** Local `jest.mock` for API modules, custom hooks and domain components. Never re-mock what the harness provides (`@floating-ui/dom`, `@testing-library/user-event` and antd's `collectScroller` in `jest.setup.ts`) or what `jest.config.ts` maps (`uplot`, `@signozhq/icons`, `useSafeNavigate`, `logEvent`).
- **Type mocks and fixtures.** `jest.mocked(fn)` for module mocks, `jest.fn() as jest.MockedFunction<T>` for a standalone mock you configure or assert on. Fixtures carry their real type, from `src/api/generated` where it exists. No `any`, no `as unknown as`. An inline `onX={jest.fn()}` on a typed prop that is never asserted needs no annotation.
- **A test fails without its change.** Revert the change, or break the line under test, and run the test before you finish: it must fail. Assert the specific outcome (exact text, request payload, call arguments), never only that an element exists.
- **One behaviour per test, at the smallest render.** Render the component that owns the behaviour, not the page around it, unless the page wiring is the behaviour. A flow of steps (a wizard, a multi-step form) becomes one test per step that starts at that step through props, store or route. A full click-through belongs in the e2e suite (`tests/e2e`).
- **Each test under 500 ms.** `pnpm jest <file> --verbose` prints each test's time. CI runs about four times slower than a laptop, and the timeout is 5 s. Never raise a timeout (`jest.setTimeout`, a third argument to `it`) to make a slow test pass; slim the test instead.
- **A test fails without its change.** At the gate in [`frontend/AGENTS.md`](../../frontend/AGENTS.md), revert the change, or break the line under test, and run the test: it must fail, and each test must stay under 500 ms. Assert the specific outcome (exact text, request payload, call arguments), never only that an element exists.
- **No limit on tests per file.** Split a file when it mixes unrelated behaviour, not to hit a count.

View File

@@ -99,7 +99,7 @@ is still by hand. The generator never adds a SideNav item; do that in
CSS Modules (`docs/css-modules-guide.md`), React Query for server state (prefer
`api/generated` hooks), nuqs for URL state, Zustand for client state, `data-testid` on
every interactive element.
5. **Verify** before reporting done:
5. **Verify** at the gate in `AGENTS.md` (commit, push or PR), not after each edit; skip it while the user says `no checks`:
```bash
pnpm tsgo --noEmit
pnpm oxlint src/pages/<Feature>

View File

@@ -34,14 +34,18 @@ You are operating within a constrained context window and strict system prompts.
- Identity keys (legend groups, color groups, CSV headers, React keys) come from structured values, never from joined display text: `['us, east', 'prod']` and `['us', 'east, prod']` both join to `us, east, prod`.
- A payload saved under another kind or schema copies only the fields that schema accepts, and drops bindings to columns the user removed. The server rejects unknown or stale fields, so the preview works and the save fails.
3. FORCED VERIFICATION: Your internal tools mark file writes as successful even if the code does not compile. Run these checks once all changes of a task are done, never after each edit. You are FORBIDDEN from reporting a task as complete until you have:
3. CHECKS AT THE GATE: Your internal tools mark file writes as successful even if the code does not compile, so the checks below are required, but only at the gate. The gate is when the user says commit, push, raise or update the PR, mark it ready, or "run checks". Never run them after each edit or between the user's iterations.
- Between gates, after an edit, run at most the one test file that covers it.
- `no checks`: when the user says it (or "don't run tests", "just making changes"), run nothing: no tests, type check, lint, format or build. Make the change and stop. This holds until the user names a gate.
At the gate, you are FORBIDDEN from reporting a task as complete until you have:
- Run `pnpm tsgo --noEmit`
- Run `pnpm lint:js --quiet` to find critical errors
- Run `pnpm oxlint <file1> <file2>` and fix all warnings
- Run `pnpm build`
- Find if the file has tests for it, or if there's `__test__` folder or the parent folder has tests, and run. Run them before coding the change or after all changes, never in between.
- For e2e, run only the specs you added or changed: the stack is heavy. Leave the full jest and e2e suites to CI unless the user asks.
- For every test you added or changed, revert the change it covers and confirm the test fails
- For every test you added or changed, revert the change it covers and confirm the test fails, and that each test runs under 500 ms (`pnpm jest <file> --verbose`)
- On a stacked branch (`gh stack`), run `pnpm tsgo --noEmit` on every branch above it before pushing: a renamed prop or moved export breaks them
- Fixed ALL resulting errors

View File

@@ -65,6 +65,8 @@ const config: Config.InitialOptions = {
testPathIgnorePatterns: ['/node_modules/', '/public/'],
moduleDirectories: ['node_modules', 'src'],
testEnvironment: '<rootDir>/jest.environment.cjs',
// Local only: the default (cores - 1) workers exhaust RAM when several runs overlap.
...(process.env.CI ? {} : { maxWorkers: 4, workerIdleMemoryLimit: '1GB' }),
coverageThreshold: {
global: {
statements: 80,

View File

@@ -144,6 +144,39 @@ window.getComputedStyle = function (
}
};
// jsdom has no layout, and Floating UI's getComputedStyle walk over every
// popover ancestor costs up to ~1 s per open.
jest.mock('@floating-ui/dom', () => ({
...jest.requireActual('@floating-ui/dom'),
autoUpdate: (): (() => void) => (): void => {},
computePosition: (
_reference: unknown,
_floating: unknown,
{ placement = 'bottom', strategy = 'absolute' } = {},
): Promise<unknown> =>
Promise.resolve({ x: 0, y: 0, placement, strategy, middlewareData: {} }),
}));
jest.mock('@testing-library/user-event', () =>
jest.requireActual('tests/userEventWithDefaults'),
);
// antd popups walk getComputedStyle up every ancestor to find scroll
// containers on each open. pnpm keeps the package under antd, not at the root.
jest.mock(
require.resolve('@rc-component/trigger/lib/util', {
paths: [require.resolve('antd')],
}),
() => ({
...jest.requireActual(
require.resolve('@rc-component/trigger/lib/util', {
paths: [require.resolve('antd')],
}),
),
collectScroller: (): HTMLElement[] => [],
}),
);
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());

View File

@@ -8,6 +8,8 @@ import {
createErrorHandler,
createRolesHandler,
createSuccessHandler,
enterInviteEmail,
pickInviteRole,
VALID_EMAIL,
} from './testUtils';
@@ -22,7 +24,7 @@ describe('InviteMembers - Edge Cases', () => {
describe('reset behavior', () => {
it('clears all rows when reset is called', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<InviteMembers
@@ -35,13 +37,12 @@ describe('InviteMembers - Edge Cases', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.type(emailInputs[1], 'bob@signoz.io');
await enterInviteEmail(user, 0, VALID_EMAIL);
await enterInviteEmail(user, 1, 'bob@signoz.io');
await user.click(screen.getByTestId('reset-btn'));
const resetInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
const resetInputs = screen.getAllByTestId(/^invite-email-/);
expect(resetInputs).toHaveLength(2);
resetInputs.forEach((input) => {
expect(input).toHaveValue('');
@@ -49,7 +50,7 @@ describe('InviteMembers - Edge Cases', () => {
});
it('clears results on reset', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<InviteMembers
@@ -66,10 +67,8 @@ describe('InviteMembers - Edge Cases', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, VALID_EMAIL);
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));
await expect(
@@ -84,7 +83,7 @@ describe('InviteMembers - Edge Cases', () => {
describe('results cleared on edit', () => {
it('clears API error when email is edited', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(createErrorHandler('already_exists', 'User already exists'));
@@ -98,17 +97,15 @@ describe('InviteMembers - Edge Cases', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, VALID_EMAIL);
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));
await expect(
screen.findByTestId('invite-api-error'),
).resolves.toBeInTheDocument();
await user.type(emailInputs[0], 'x');
await user.type(screen.getAllByTestId(/^invite-email-/)[0], 'x');
await waitFor(() => {
expect(screen.queryByTestId('invite-api-error')).not.toBeInTheDocument();
@@ -116,7 +113,7 @@ describe('InviteMembers - Edge Cases', () => {
});
it('clears API error when role is changed', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(createErrorHandler('already_exists', 'User already exists'));
@@ -130,10 +127,8 @@ describe('InviteMembers - Edge Cases', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, VALID_EMAIL);
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));
await expect(
@@ -153,7 +148,7 @@ describe('InviteMembers - Edge Cases', () => {
describe('empty submission', () => {
it('does not submit when no rows are touched', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const onSuccess = jest.fn();
render(
@@ -175,7 +170,7 @@ describe('InviteMembers - Edge Cases', () => {
describe('submitting state', () => {
it('disables submit while submitting', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<InviteMembers
@@ -187,10 +182,8 @@ describe('InviteMembers - Edge Cases', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, VALID_EMAIL);
await pickInviteRole(user, 'Viewer');
const submitBtn = screen.getByTestId('submit-btn');
await user.click(submitBtn);
@@ -203,7 +196,7 @@ describe('InviteMembers - Edge Cases', () => {
describe('whitespace handling', () => {
it('trims email whitespace before submission', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const calls: { email: string }[] = [];
server.use(
@@ -224,10 +217,8 @@ describe('InviteMembers - Edge Cases', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], ' alice@signoz.io ');
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, ' alice@signoz.io ');
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));

View File

@@ -9,6 +9,8 @@ import {
createRolesHandler,
createSuccessHandler,
createTrackingHandler,
enterInviteEmail,
pickInviteRole,
VALID_EMAIL,
} from './testUtils';
@@ -23,7 +25,7 @@ describe('InviteMembers - Submission', () => {
describe('API calls', () => {
it('calls createUser API for each touched row', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const { handler, calls } = createTrackingHandler();
server.use(handler);
@@ -38,10 +40,8 @@ describe('InviteMembers - Submission', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], 'alice@signoz.io');
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, 'alice@signoz.io');
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));
@@ -55,7 +55,7 @@ describe('InviteMembers - Submission', () => {
});
it('calls createUser API for multiple touched rows', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const { handler, calls } = createTrackingHandler();
server.use(handler);
@@ -70,21 +70,12 @@ describe('InviteMembers - Submission', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], 'alice@signoz.io');
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await user.type(emailInputs[1], 'bob@signoz.io');
await user.click(screen.getAllByText('Select roles')[0]);
const editorOptions = await screen.findAllByTitle('Editor');
await user.click(editorOptions[editorOptions.length - 1]);
await user.type(emailInputs[2], 'charlie@signoz.io');
await user.click(screen.getAllByText('Select roles')[0]);
const adminOptions = await screen.findAllByTitle('Admin');
await user.click(adminOptions[adminOptions.length - 1]);
await enterInviteEmail(user, 0, 'alice@signoz.io');
await pickInviteRole(user, 'Viewer');
await enterInviteEmail(user, 1, 'bob@signoz.io');
await pickInviteRole(user, 'Editor');
await enterInviteEmail(user, 2, 'charlie@signoz.io');
await pickInviteRole(user, 'Admin');
await user.click(screen.getByTestId('submit-btn'));
@@ -109,7 +100,7 @@ describe('InviteMembers - Submission', () => {
describe('callbacks', () => {
it('calls onSuccess when all invites succeed', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const onSuccess = jest.fn();
render(
@@ -123,10 +114,8 @@ describe('InviteMembers - Submission', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, VALID_EMAIL);
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));
@@ -136,7 +125,7 @@ describe('InviteMembers - Submission', () => {
});
it('calls onAllFailed when all invites fail', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const onAllFailed = jest.fn();
server.use(createErrorHandler('already_exists', 'User already exists'));
@@ -152,10 +141,8 @@ describe('InviteMembers - Submission', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, VALID_EMAIL);
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));
@@ -173,7 +160,7 @@ describe('InviteMembers - Submission', () => {
});
it('calls onPartialSuccess when some invites succeed and some fail', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const onPartialSuccess = jest.fn();
const onSuccess = jest.fn();
const onAllFailed = jest.fn();
@@ -215,16 +202,10 @@ describe('InviteMembers - Submission', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], 'alice@signoz.io');
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await user.type(emailInputs[1], 'bob@signoz.io');
await user.click(screen.getAllByText('Select roles')[0]);
const editorOptions = await screen.findAllByTitle('Editor');
await user.click(editorOptions[editorOptions.length - 1]);
await enterInviteEmail(user, 0, 'alice@signoz.io');
await pickInviteRole(user, 'Viewer');
await enterInviteEmail(user, 1, 'bob@signoz.io');
await pickInviteRole(user, 'Editor');
await user.click(screen.getByTestId('submit-btn'));
@@ -262,7 +243,7 @@ describe('InviteMembers - Submission', () => {
describe('result display', () => {
it('shows success callout when all invites succeed', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<InviteMembers
@@ -274,10 +255,8 @@ describe('InviteMembers - Submission', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, VALID_EMAIL);
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));
@@ -287,7 +266,7 @@ describe('InviteMembers - Submission', () => {
});
it('shows error callout with failed emails when API fails', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(createErrorHandler('already_exists', 'User already exists'));
@@ -301,10 +280,8 @@ describe('InviteMembers - Submission', () => {
/>,
);
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await user.click(screen.getAllByText('Select roles')[0]);
await user.click(await screen.findByTitle('Viewer'));
await enterInviteEmail(user, 0, VALID_EMAIL);
await pickInviteRole(user, 'Viewer');
await user.click(screen.getByTestId('submit-btn'));
@@ -317,7 +294,7 @@ describe('InviteMembers - Submission', () => {
describe('footer props', () => {
it('provides correct canSubmit state', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<InviteMembers
@@ -331,14 +308,13 @@ describe('InviteMembers - Submission', () => {
expect(screen.getByTestId('submit-btn')).toBeDisabled();
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], VALID_EMAIL);
await enterInviteEmail(user, 0, VALID_EMAIL);
expect(screen.getByTestId('submit-btn')).not.toBeDisabled();
});
it('provides touchedCount', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<InviteMembers
@@ -351,12 +327,11 @@ describe('InviteMembers - Submission', () => {
expect(screen.getByTestId('touched-count')).toHaveTextContent('0');
const emailInputs = screen.getAllByPlaceholderText('e.g. john@signoz.io');
await user.type(emailInputs[0], 'a@b.com');
await enterInviteEmail(user, 0, 'a@b.com');
expect(screen.getByTestId('touched-count')).toHaveTextContent('1');
await user.type(emailInputs[1], 'c@d.com');
await enterInviteEmail(user, 1, 'c@d.com');
expect(screen.getByTestId('touched-count')).toHaveTextContent('2');
});

View File

@@ -1,5 +1,8 @@
import { RestHandler } from 'msw';
import { rest } from 'mocks-server/server';
import { screen, userEvent } from 'tests/test-utils';
type User = ReturnType<typeof userEvent.setup>;
export const CREATE_USER_ENDPOINT = '*/api/v2/users';
export const LIST_ROLES_ENDPOINT = '*/api/v1/roles';
@@ -52,3 +55,18 @@ export function createTrackingHandler(): {
});
return { handler, calls };
}
export async function enterInviteEmail(
user: User,
rowIndex: number,
email: string,
): Promise<void> {
await user.click(screen.getAllByTestId(/^invite-email-/)[rowIndex]);
await user.paste(email);
}
export async function pickInviteRole(user: User, role: string): Promise<void> {
await user.click(screen.getAllByText('Select roles')[0]);
const options = await screen.findAllByTitle(role);
await user.click(options[options.length - 1]);
}

View File

@@ -52,7 +52,10 @@ function MultiSelectFilter({
disabled={disabled}
onClear={onClear}
optionRender={(option): JSX.Element => (
<div className={styles.checkOption}>
<div
className={styles.checkOption}
data-testid={`${testId}-option-${String(option.value)}`}
>
<div className={styles.checkOptionBox}>
<Checkbox
color="primary"

View File

@@ -1,40 +1,32 @@
import React, { ComponentType, Suspense } from 'react';
import {
render,
screen,
waitForElementToBeRemoved,
} from '@testing-library/react';
import { render, screen } from 'tests/test-utils';
import Loadable from './index';
// Sample component to be loaded lazily
function SampleComponent(): JSX.Element {
return <div>Sample Component</div>;
return <div data-testid="sample-component">Sample Component</div>;
}
const loadSampleComponent = (): Promise<{
default: ComponentType;
}> =>
new Promise<{ default: ComponentType }>((resolve) => {
setTimeout(() => {
resolve({ default: SampleComponent });
}, 500);
});
}> => Promise.resolve({ default: SampleComponent });
describe('Loadable', () => {
it('should render the lazily loaded component', async () => {
const LoadableSampleComponent = Loadable(loadSampleComponent);
const { container } = render(
<Suspense fallback={<div>Loading...</div>}>
render(
<Suspense fallback={<div data-testid="loading">Loading...</div>}>
<LoadableSampleComponent />
</Suspense>,
);
expect(screen.getByText('Loading...')).toBeInTheDocument();
await waitForElementToBeRemoved(() => screen.queryByText('Loading...'));
expect(container.querySelector('div')).toHaveTextContent('Sample Component');
expect(screen.getByTestId('loading')).toBeInTheDocument();
await expect(
screen.findByTestId('sample-component'),
).resolves.toHaveTextContent('Sample Component');
expect(screen.queryByTestId('loading')).not.toBeInTheDocument();
});
it('should call lazy with the provided import path', () => {

View File

@@ -1,6 +1,5 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import { jest } from '@jest/globals';
import { fireEvent, waitFor } from '@testing-library/react';
import { ENVIRONMENT } from 'constants/env';
import { PANEL_TYPES } from 'constants/queryBuilder';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -171,6 +170,25 @@ describe('QueryBuilderV2 + QueryV2 - base render', () => {
jest.clearAllMocks();
});
const renderQueryV2 = (queriesCount: number): void => {
const [queryA] = (baseQBContext.currentQuery as Query).builder.queryData;
render(
<QueryBuilderV2Provider>
<QueryV2
index={0}
query={queryA}
version="v4"
isAvailableToDisable={false}
isMultiQueryAllowed
queriesCount={queriesCount}
onSignalSourceChange={jest.fn()}
signalSourceChangeEnabled={false}
savePreviousQuery={false}
/>
</QueryBuilderV2Provider>,
);
};
it('renders limit input when dataSource is logs', () => {
render(<QueryBuilderV2 panelType={PANEL_TYPES.TABLE} version="v4" />);
@@ -184,43 +202,37 @@ describe('QueryBuilderV2 + QueryV2 - base render', () => {
expect(limitInput).toHaveAttribute('data-testid', 'input-Limit');
});
it('Cmd+Enter on an input triggers handleRunQuery via container handler', async () => {
it('Cmd+Enter on the limit input triggers handleRunQuery via container handler', async () => {
const user = userEvent.setup();
render(<QueryBuilderV2 panelType={PANEL_TYPES.TABLE} version="v4" />);
const limitInput = screen.getByPlaceholderText('Enter limit');
fireEvent.keyDown(limitInput, {
key: 'Enter',
code: 'Enter',
metaKey: true,
});
screen.getByTestId('input-Limit').focus();
await user.keyboard('{Meta>}{Enter}{/Meta}');
expect(handleRunQueryMock).toHaveBeenCalled();
expect(handleRunQueryMock).toHaveBeenCalledTimes(1);
});
const legendInput = screen.getByPlaceholderText('Write legend format');
fireEvent.keyDown(legendInput, {
key: 'Enter',
code: 'Enter',
metaKey: true,
});
it('Cmd+Enter on the legend input triggers handleRunQuery via container handler', async () => {
const user = userEvent.setup();
render(<QueryBuilderV2 panelType={PANEL_TYPES.TABLE} version="v4" />);
expect(handleRunQueryMock).toHaveBeenCalled();
screen.getByPlaceholderText('Write legend format').focus();
await user.keyboard('{Meta>}{Enter}{/Meta}');
const CM_EDITOR_SELECTOR = '.cm-editor .cm-content';
// Wait for CodeMirror to initialize
await waitFor(() => {
const editor = document.querySelector(CM_EDITOR_SELECTOR);
expect(editor).toBeInTheDocument();
});
expect(handleRunQueryMock).toHaveBeenCalledTimes(1);
});
const editor = document.querySelector(CM_EDITOR_SELECTOR) as HTMLElement;
await userEvent.click(editor);
fireEvent.keyDown(editor, {
key: 'Enter',
code: 'Enter',
metaKey: true,
});
it('Cmd+Enter in the where clause editor triggers handleRunQuery via container handler', async () => {
const user = userEvent.setup();
render(<QueryBuilderV2 panelType={PANEL_TYPES.TABLE} version="v4" />);
expect(handleRunQueryMock).toHaveBeenCalled();
const editor = (
await screen.findByTestId('query-where-clause-editor')
).querySelector('.cm-content') as HTMLElement;
editor.focus();
await user.keyboard('{Meta>}{Enter}{/Meta}');
expect(handleRunQueryMock).toHaveBeenCalledTimes(1);
});
it('does not crash when builder.queryFormulas/queryTraceOperator are missing (partial/legacy query)', () => {
@@ -250,15 +262,12 @@ describe('QueryBuilderV2 + QueryV2 - base render', () => {
});
describe('query actions menu', () => {
const openQueryActions = async (): Promise<void> => {
await userEvent.click(screen.getAllByTestId('query-actions')[0]);
};
it('Clone calls cloneQuery with the query', async () => {
render(<QueryBuilderV2 panelType={PANEL_TYPES.TABLE} version="v4" />);
const user = userEvent.setup();
renderQueryV2(1);
await openQueryActions();
await userEvent.click(
await user.click(screen.getByTestId('query-actions'));
await user.click(
await screen.findByTestId('query-actions-item-clone-query'),
);
@@ -270,9 +279,10 @@ describe('QueryBuilderV2 + QueryV2 - base render', () => {
});
it('hides Delete when there is a single query', async () => {
render(<QueryBuilderV2 panelType={PANEL_TYPES.TABLE} version="v4" />);
const user = userEvent.setup();
renderQueryV2(1);
await openQueryActions();
await user.click(screen.getByTestId('query-actions'));
await screen.findByTestId('query-actions-item-clone-query');
expect(
@@ -281,39 +291,26 @@ describe('QueryBuilderV2 + QueryV2 - base render', () => {
});
it('shows Delete with more than one query and deletes on click', async () => {
const [queryA] = (baseQBContext.currentQuery as Query).builder.queryData;
const user = userEvent.setup();
const handleDeleteQuery = jest.fn();
mockedUseQueryOperations.mockReturnValue({
...mockedUseQueryOperations({} as Parameters<UseQueryOperations>[0]),
handleDeleteQuery,
});
render(
<QueryBuilderV2Provider>
<QueryV2
index={0}
query={queryA}
version="v4"
isAvailableToDisable={false}
isMultiQueryAllowed
queriesCount={2}
onSignalSourceChange={jest.fn()}
signalSourceChangeEnabled={false}
savePreviousQuery={false}
/>
</QueryBuilderV2Provider>,
);
renderQueryV2(2);
await openQueryActions();
await userEvent.click(
await user.click(screen.getByTestId('query-actions'));
await user.click(
await screen.findByTestId('query-actions-item-delete-query'),
);
expect(handleDeleteQuery).toHaveBeenCalledTimes(1);
}, 15000);
});
});
it('fx button is disabled when functions already exist', () => {
it('fx button is disabled when functions already exist', async () => {
const user = userEvent.setup();
const currentQueryBase = baseQBContext.currentQuery as Query;
const supersetQueryBase = baseQBContext.supersetQuery as Query;
@@ -359,9 +356,7 @@ describe('QueryBuilderV2 + QueryV2 - base render', () => {
'.query-function-delete-btn',
) as HTMLButtonElement;
expect(deleteButton).toBeInTheDocument();
userEvent.click(deleteButton);
waitFor(() => {
expect(fxButton).not.toBeDisabled();
});
await user.click(deleteButton);
expect(fxButton).not.toBeDisabled();
});
});

View File

@@ -195,6 +195,7 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
placeholder="Select a query"
value={queryOptions.find((f) => f.value === validQueryIndex)?.label || ''}
className="select-box"
testId="quick-filters-query-select"
/>
{open && (
<ComboboxContent>
@@ -209,6 +210,7 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
setOpen(false);
}}
isSelected={validQueryIndex === option.value}
testId={`quick-filters-query-option-${option.value}`}
>
{option.label}
</ComboboxItem>
@@ -302,6 +304,7 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
color="primary"
textPlacement="right"
value={showIP ?? true}
testId="quick-filters-show-ip"
onChange={(checked): void => {
logEvent('API Monitoring: Show IP addresses clicked', {
showIP: checked,

View File

@@ -52,6 +52,7 @@ function SortableFilter({
<Button
className="remove-filter-btn periscope-btn"
size="small"
data-testid={`quick-filters-remove-${filter.key}`}
onClick={(): void => {
onRemove(filter);
}}
@@ -103,7 +104,7 @@ function AddedFilters({
const allowRemove = addedFilters.length > 1;
return (
<div className="qf-filters added-filters">
<div className="qf-filters added-filters" data-testid="quick-filters-added">
<div className="qf-filters-header">ADDED FILTERS</div>
<div className="qf-added-filters-list">
<OverlayScrollbar>

View File

@@ -102,6 +102,7 @@ function OtherFilters({
<Button
className="add-filter-btn periscope-btn"
size="small"
data-testid={`quick-filters-add-${filter.key}`}
onClick={(): void => handleAddFilter(filter)}
>
Add
@@ -111,7 +112,7 @@ function OtherFilters({
};
return (
<div className="qf-filters other-filters">
<div className="qf-filters other-filters" data-testid="quick-filters-other">
<div className="qf-filters-header">OTHER FILTERS</div>
<div className="qf-other-filters-list">
<OverlayScrollbar>

View File

@@ -83,6 +83,7 @@ function QuickFiltersSettings({
<Button
type="default"
onClick={handleDiscardChanges}
data-testid="quick-filters-settings-discard"
icon={<X size={16} />}
>
Discard
@@ -92,6 +93,7 @@ function QuickFiltersSettings({
onClick={handleSaveChanges}
icon={<Check size={16} />}
loading={isUpdatingCustomFilters}
data-testid="quick-filters-settings-save"
>
Save changes
</Button>

View File

@@ -1,4 +1,7 @@
import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
import {
QuickfiltertypesSourceDTO,
TelemetrytypesSignalDTO,
} from 'api/generated/services/sigNoz.schemas';
import { ENVIRONMENT } from 'constants/env';
import {
ApiMonitoringParams,
@@ -15,10 +18,12 @@ import {
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { render, screen, userEvent, waitFor, within } from 'tests/test-utils';
import { TelemetryFieldKey } from 'types/api/v5/queryRange';
import '@testing-library/jest-dom';
import QuickFilters from '../QuickFilters';
import QuickFiltersSettings from '../QuickFiltersSettings/QuickFiltersSettings';
import { IQuickFiltersConfig, QuickFiltersSource } from '../types';
import { QuickFiltersConfig, QuickFiltersFieldApis } from './constants';
@@ -26,6 +31,17 @@ jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
useQueryBuilder: jest.fn(),
}));
jest.mock('container/ApiMonitoring/queryParams');
jest.mock(
'components/OverlayScrollbar/OverlayScrollbar',
() =>
function MockOverlayScrollbar({
children,
}: {
children: React.ReactNode;
}): JSX.Element {
return <div>{children}</div>;
},
);
const handleFilterVisibilityChange = jest.fn();
const redirectWithQueryBuilderData = jest.fn();
@@ -44,14 +60,27 @@ const fieldsValuesURL = `${BASE_URL}/api/v1/fields/values`;
const FILTER_OS_DESCRIPTION = 'os.description';
const FILTER_K8S_DEPLOYMENT_NAME = 'k8s.deployment.name';
const ADDED_FILTERS_LABEL = /ADDED FILTERS/i;
const OTHER_FILTERS_LABEL = /OTHER FILTERS/i;
const SAVE_CHANGES_TEXT = 'Save changes';
const DISCARD_TEXT = 'Discard';
const ADDED_FILTERS_TEST_ID = 'quick-filters-added';
const OTHER_FILTERS_TEST_ID = 'quick-filters-other';
const SAVE_TEST_ID = 'quick-filters-settings-save';
const SETTINGS_TEST_ID = 'settings-icon-container';
const REMOVE_OS_DESCRIPTION_TEST_ID =
'quick-filters-remove-resource:os.description:string';
const ADD_K8S_DEPLOYMENT_NAME_TEST_ID =
'quick-filters-add-resource:k8s.deployment.name:string';
const FILTER_SERVICE_NAME = 'Service Name';
const SETTINGS_ICON_TEST_ID = 'settings-icon';
const QUERY_NAME = 'Test Query';
const savedFilters = quickFiltersListResponse.data
.filters as TelemetryFieldKey[];
const smallFiltersListResponse = {
...quickFiltersListResponse,
data: {
...quickFiltersListResponse.data,
filters: savedFilters.slice(0, 2),
},
};
const setupServer = (): void => {
server.use(
rest.get(quickFiltersListURL, (_, res, ctx) =>
@@ -95,6 +124,24 @@ TestQuickFilters.defaultProps = {
config: QuickFiltersConfig,
};
function renderSettings(): void {
render(
<QuickFiltersSettings
savedFiltersSource={QuickfiltertypesSourceDTO.logs}
setIsSettingsOpen={jest.fn()}
customFilters={savedFilters}
refetchCustomFilters={jest.fn()}
/>,
);
}
async function openSettings(
user: ReturnType<typeof userEvent.setup>,
): Promise<void> {
await screen.findByText(FILTER_SERVICE_NAME);
await user.click(screen.getByTestId(SETTINGS_TEST_ID));
}
beforeAll(() => {
server.listen();
});
@@ -102,6 +149,7 @@ beforeAll(() => {
afterEach(() => {
server.resetHandlers();
jest.clearAllMocks();
jest.useRealTimers();
});
afterAll(() => {
@@ -139,7 +187,7 @@ describe('Quick Filters', () => {
it('should display and allow selection from query dropdown when multiple queries exist', async () => {
const setLastUsedQuery = jest.fn();
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
(useQueryBuilder as jest.Mock).mockReturnValue({
currentQuery: {
@@ -169,27 +217,28 @@ describe('Quick Filters', () => {
render(<TestQuickFilters />);
// The dropdown trigger should show the first query name
const trigger = screen.getByText('Query A');
expect(trigger).toBeInTheDocument();
const trigger = screen.getByTestId('quick-filters-query-select');
expect(trigger).toHaveTextContent('Query A');
// Click to open the dropdown
await user.click(trigger);
// All query options should be visible
await waitFor(() => {
expect(screen.getByRole('option', { name: 'Query A' })).toBeInTheDocument();
expect(screen.getByRole('option', { name: 'Query B' })).toBeInTheDocument();
expect(screen.getByRole('option', { name: 'Query C' })).toBeInTheDocument();
});
await expect(
screen.findByTestId('quick-filters-query-option-0'),
).resolves.toHaveTextContent('Query A');
expect(screen.getByTestId('quick-filters-query-option-1')).toHaveTextContent(
'Query B',
);
expect(screen.getByTestId('quick-filters-query-option-2')).toHaveTextContent(
'Query C',
);
// Select Query B
const queryBOption = screen.getByRole('option', { name: 'Query B' });
await user.click(queryBOption);
await user.click(screen.getByTestId('quick-filters-query-option-1'));
// Verify setLastUsedQuery was called with index 1
await waitFor(() => {
expect(setLastUsedQuery).toHaveBeenCalledWith(1);
});
expect(setLastUsedQuery).toHaveBeenCalledWith(1);
});
it('should not display query dropdown in ListView', () => {
@@ -235,7 +284,7 @@ describe('Quick Filters', () => {
});
it('should add filter data to query when checkbox is clicked', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<TestQuickFilters />);
@@ -267,33 +316,27 @@ describe('Quick Filters', () => {
});
});
it('toggles Show IP addresses and updates API Monitoring params', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.API_MONITORING} />,
);
// Switch should be rendered and initially checked
await expect(
screen.findByText('Show IP addresses'),
).resolves.toBeInTheDocument();
const toggle = screen.getByRole('switch');
const toggle = await screen.findByTestId('quick-filters-show-ip');
expect(screen.getByText('Show IP addresses')).toBeInTheDocument();
expect(toggle).toHaveAttribute('aria-checked', 'true');
await user.click(toggle);
await waitFor(() => {
expect(mockSetApiMonitoringParams).toHaveBeenCalledWith(
expect.objectContaining({ showIP: false }),
);
});
expect(mockSetApiMonitoringParams).toHaveBeenCalledWith(
expect.objectContaining({ showIP: false }),
);
});
});
describe('Quick Filters with custom filters', () => {
it('loads the custom filters correctly', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
);
@@ -304,28 +347,32 @@ describe('Quick Filters with custom filters', () => {
await screen.findByText(FILTER_SERVICE_NAME);
const allByText = await screen.findAllByText('otel-demo');
expect(allByText).toHaveLength(2);
});
const icon = await screen.findByTestId(SETTINGS_ICON_TEST_ID);
const settingsButton = icon.closest('button') ?? icon;
await user.click(settingsButton);
await expect(
screen.findByText('Edit quick filters'),
).resolves.toBeInTheDocument();
const addedSection = screen.getByText(ADDED_FILTERS_LABEL).parentElement!;
expect(addedSection).toContainElement(
await screen.findByText(FILTER_OS_DESCRIPTION),
it('opens the settings with the saved filters added and the rest under other filters', async () => {
const user = userEvent.setup();
server.use(
rest.get(quickFiltersListURL, (_, res, ctx) =>
res(ctx.status(200), ctx.json(smallFiltersListResponse)),
),
);
const otherSection = screen.getByText(OTHER_FILTERS_LABEL).parentElement!;
expect(otherSection).toContainElement(
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
);
await openSettings(user);
expect(screen.getByText('Edit quick filters')).toBeInTheDocument();
expect(screen.getByTestId(ADDED_FILTERS_TEST_ID)).toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
expect(screen.getByTestId(OTHER_FILTERS_TEST_ID)).toContainElement(
await screen.findByText(FILTER_K8S_DEPLOYMENT_NAME),
);
});
it('keeps same-name fields with different context as distinct entries', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.get(quickFiltersSuggestionsURL, (_req, res, ctx) =>
res(
@@ -356,153 +403,86 @@ describe('Quick Filters with custom filters', () => {
),
);
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
);
await screen.findByText(FILTER_SERVICE_NAME);
renderSettings();
const icon = await screen.findByTestId(SETTINGS_ICON_TEST_ID);
const settingsButton = icon.closest('button') ?? icon;
await user.click(settingsButton);
const otherSection = screen.getByText(OTHER_FILTERS_LABEL).parentElement!;
const otherSection = screen.getByTestId(OTHER_FILTERS_TEST_ID);
// Both `level` variants are shown despite sharing a name.
await waitFor(() =>
expect(within(otherSection).getAllByText('level')).toHaveLength(2),
const addButton = await screen.findByTestId(
'quick-filters-add-attribute:level:string',
);
expect(within(otherSection).getAllByText('level')).toHaveLength(2);
// Adding one variant removes only that one; the other stays.
const firstLevel = within(otherSection).getAllByText('level')[0];
const addButton = firstLevel.parentElement?.querySelector('button');
await user.click(addButton as HTMLButtonElement);
await user.click(addButton);
const addedSection = screen.getByText(ADDED_FILTERS_LABEL).parentElement!;
await waitFor(() => {
expect(within(addedSection).getAllByText('level')).toHaveLength(1);
expect(within(otherSection).getAllByText('level')).toHaveLength(1);
});
const addedSection = screen.getByTestId(ADDED_FILTERS_TEST_ID);
expect(within(addedSection).getAllByText('level')).toHaveLength(1);
expect(within(otherSection).getAllByText('level')).toHaveLength(1);
expect(
screen.getByTestId('quick-filters-add-span:level:string'),
).toBeInTheDocument();
});
it('adds a filter from OTHER FILTERS to ADDED FILTERS when clicked', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
renderSettings();
await user.click(await screen.findByTestId(ADD_K8S_DEPLOYMENT_NAME_TEST_ID));
expect(screen.getByTestId(ADDED_FILTERS_TEST_ID)).toHaveTextContent(
FILTER_K8S_DEPLOYMENT_NAME,
);
await screen.findByText(FILTER_SERVICE_NAME);
const icon = await screen.findByTestId(SETTINGS_ICON_TEST_ID);
const settingsButton = icon.closest('button') ?? icon;
await user.click(settingsButton);
const otherFilterItem = await screen.findByText(FILTER_K8S_DEPLOYMENT_NAME);
const addButton = otherFilterItem.parentElement?.querySelector('button');
expect(addButton).not.toBeNull();
await user.click(addButton as HTMLButtonElement);
const addedSection = screen.getByText(ADDED_FILTERS_LABEL).parentElement!;
await waitFor(() => {
expect(addedSection).toHaveTextContent(FILTER_K8S_DEPLOYMENT_NAME);
});
});
it('removes a filter from ADDED FILTERS and moves it to OTHER FILTERS', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
renderSettings();
const addedSection = screen.getByTestId(ADDED_FILTERS_TEST_ID);
const otherSection = screen.getByTestId(OTHER_FILTERS_TEST_ID);
await screen.findByTestId(ADD_K8S_DEPLOYMENT_NAME_TEST_ID);
await user.click(screen.getByTestId(REMOVE_OS_DESCRIPTION_TEST_ID));
expect(addedSection).not.toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
await screen.findByText(FILTER_SERVICE_NAME);
const icon = await screen.findByTestId(SETTINGS_ICON_TEST_ID);
const settingsButton = icon.closest('button') ?? icon;
await user.click(settingsButton);
const addedSection = screen.getByText(ADDED_FILTERS_LABEL).parentElement!;
const target = await screen.findByText(FILTER_OS_DESCRIPTION);
const removeBtn = target.parentElement?.querySelector('button');
expect(removeBtn).not.toBeNull();
await user.click(removeBtn as HTMLButtonElement);
await waitFor(() => {
expect(addedSection).not.toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
});
const otherSection = screen.getByText(OTHER_FILTERS_LABEL).parentElement!;
expect(otherSection).toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
});
it('restores original filter state on Discard', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
renderSettings();
const addedSection = screen.getByTestId(ADDED_FILTERS_TEST_ID);
const otherSection = screen.getByTestId(OTHER_FILTERS_TEST_ID);
await screen.findByTestId(ADD_K8S_DEPLOYMENT_NAME_TEST_ID);
await user.click(screen.getByTestId(REMOVE_OS_DESCRIPTION_TEST_ID));
expect(otherSection).toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
await screen.findByText(FILTER_SERVICE_NAME);
const icon = await screen.findByTestId(SETTINGS_ICON_TEST_ID);
const settingsButton = icon.closest('button') ?? icon;
await user.click(settingsButton);
await user.click(screen.getByTestId('quick-filters-settings-discard'));
const addedSection = screen.getByText(ADDED_FILTERS_LABEL).parentElement!;
const target = await screen.findByText(FILTER_OS_DESCRIPTION);
const removeBtn = target.parentElement?.querySelector('button');
expect(removeBtn).not.toBeNull();
await user.click(removeBtn as HTMLButtonElement);
const otherSection = screen.getByText(OTHER_FILTERS_LABEL).parentElement!;
await waitFor(() => {
expect(addedSection).not.toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
expect(otherSection).toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
});
const discardBtn = screen
.getByText(DISCARD_TEXT)
.closest('button') as HTMLButtonElement;
expect(discardBtn).not.toBeNull();
await user.click(discardBtn);
await waitFor(() => {
expect(addedSection).toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
expect(otherSection).not.toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
});
expect(addedSection).toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
expect(otherSection).not.toContainElement(
screen.getByText(FILTER_OS_DESCRIPTION),
);
});
it('saves the updated filters by calling PUT with correct payload', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
);
await screen.findByText(FILTER_SERVICE_NAME);
renderSettings();
const icon = await screen.findByTestId(SETTINGS_ICON_TEST_ID);
const settingsButton = icon.closest('button') ?? icon;
await user.click(settingsButton);
const target = await screen.findByText(FILTER_OS_DESCRIPTION);
const removeBtn = target.parentElement?.querySelector('button');
expect(removeBtn).not.toBeNull();
await user.click(removeBtn as HTMLButtonElement);
const saveBtn = screen
.getByText(SAVE_CHANGES_TEXT)
.closest('button') as HTMLButtonElement;
expect(saveBtn).not.toBeNull();
await user.click(saveBtn);
await user.click(screen.getByTestId(REMOVE_OS_DESCRIPTION_TEST_ID));
await user.click(screen.getByTestId(SAVE_TEST_ID));
await waitFor(() => {
expect(putHandler).toHaveBeenCalled();
@@ -516,24 +496,37 @@ describe('Quick Filters with custom filters', () => {
});
it('should render duration slider for duration_nono filter', async () => {
server.use(
rest.get(quickFiltersListURL, (_, res, ctx) =>
res(
ctx.status(200),
ctx.json({
...quickFiltersListResponse,
data: {
...quickFiltersListResponse.data,
filters: savedFilters.filter(({ name }) => name === 'duration_nano'),
},
}),
),
),
);
// Use fake timers only in this test (for debounce), and wire them to userEvent
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
pointerEventsCheck: 0,
});
const { getByTestId } = render(
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
);
await screen.findByText(FILTER_SERVICE_NAME);
await screen.findByTestId('collapse-duration');
expect(screen.getByText('Duration')).toBeInTheDocument();
// Open the duration section (use role if it’s a button/collapse)
await user.click(screen.getByText('Duration'));
const minDuration = getByTestId('min-input') as HTMLInputElement;
const maxDuration = getByTestId('max-input') as HTMLInputElement;
const minDuration = screen.getByTestId('min-input') as HTMLInputElement;
const maxDuration = screen.getByTestId('max-input') as HTMLInputElement;
expect(minDuration).toHaveValue(null);
expect(minDuration).toHaveProperty('placeholder', '0');
@@ -635,7 +628,7 @@ describe('Quick Filters refetch behavior', () => {
server.use(
rest.get(quickFiltersListURL, (_req, res, ctx) => {
getCalls += 1;
return res(ctx.status(200), ctx.json(quickFiltersListResponse));
return res(ctx.status(200), ctx.json(smallFiltersListResponse));
}),
rest.put(saveQuickFiltersURL, async (req, res, ctx) => {
putHandler(await req.json());
@@ -643,26 +636,14 @@ describe('Quick Filters refetch behavior', () => {
}),
);
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
);
await expect(
screen.findByText(FILTER_SERVICE_NAME),
).resolves.toBeInTheDocument();
const icon = await screen.findByTestId(SETTINGS_ICON_TEST_ID);
const settingsButton = icon.closest('button') ?? icon;
await user.click(settingsButton);
const target = await screen.findByText(FILTER_OS_DESCRIPTION);
const removeBtn = target.parentElement?.querySelector(
'button',
) as HTMLButtonElement;
await user.click(removeBtn);
await user.click(screen.getByText(SAVE_CHANGES_TEXT));
await openSettings(user);
await user.click(screen.getByTestId(REMOVE_OS_DESCRIPTION_TEST_ID));
await user.click(screen.getByTestId(SAVE_TEST_ID));
await waitFor(() => expect(putHandler).toHaveBeenCalled());
await waitFor(() => expect(getCalls).toBeGreaterThanOrEqual(2));
@@ -670,11 +651,11 @@ describe('Quick Filters refetch behavior', () => {
it('renders updated filters after refetch post-save', async () => {
const updatedResponse = {
...quickFiltersListResponse,
...smallFiltersListResponse,
data: {
...quickFiltersListResponse.data,
...smallFiltersListResponse.data,
filters: [
...(quickFiltersListResponse.data.filters ?? []),
...smallFiltersListResponse.data.filters,
{
name: 'new.custom.filter',
fieldDataType: 'string',
@@ -690,38 +671,26 @@ describe('Quick Filters refetch behavior', () => {
getCount += 1;
return getCount >= 2
? res(ctx.status(200), ctx.json(updatedResponse))
: res(ctx.status(200), ctx.json(quickFiltersListResponse));
: res(ctx.status(200), ctx.json(smallFiltersListResponse));
}),
rest.put(saveQuickFiltersURL, async (_req, res, ctx) =>
res(ctx.status(200), ctx.json({})),
),
);
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<TestQuickFilters quickFilterSource={QuickFiltersSource.LOGS_EXPLORER} />,
);
await expect(
screen.findByText(FILTER_SERVICE_NAME),
).resolves.toBeInTheDocument();
const icon = await screen.findByTestId(SETTINGS_ICON_TEST_ID);
const settingsButton = icon.closest('button') ?? icon;
await user.click(settingsButton);
await openSettings(user);
// Make a minimal change so Save button appears
const target = await screen.findByText(FILTER_OS_DESCRIPTION);
const removeBtn = target.parentElement?.querySelector(
'button',
) as HTMLButtonElement;
await user.click(removeBtn);
await user.click(screen.getByTestId(REMOVE_OS_DESCRIPTION_TEST_ID));
await user.click(screen.getByTestId(SAVE_TEST_ID));
await user.click(screen.getByText(SAVE_CHANGES_TEXT));
await waitFor(() => {
expect(screen.getByText('New Custom Filter')).toBeInTheDocument();
});
await expect(
screen.findByText('New Custom Filter'),
).resolves.toBeInTheDocument();
});
it('shows empty state when GET fails', async () => {

View File

@@ -44,6 +44,7 @@ function SaveErrorItem({
variant="link"
color="secondary"
aria-label="Retry"
testId="sa-error-retry-btn"
onClick={async (e): Promise<void> => {
e.stopPropagation();
setIsRetrying(true);

View File

@@ -1,3 +1,4 @@
import type { ServiceAccountRow } from 'container/ServiceAccountsSettings/utils';
import {
listRolesSuccessResponse,
managedRoles,
@@ -15,22 +16,25 @@ import {
buildSADeletePermission,
} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
import KeysTab from '../KeysTab';
import OverviewTab from '../OverviewTab';
import ServiceAccountDrawer from '../ServiceAccountDrawer';
const ROLES_ENDPOINT = '*/api/v1/roles';
const SA_KEYS_ENDPOINT = '*/api/v1/service_accounts/:id/keys';
const SA_ENDPOINT = '*/api/v1/service_accounts/sa-1';
const SA_DELETE_ENDPOINT = '*/api/v1/service_accounts/sa-1';
const SA_ROLES_ENDPOINT = '*/api/v1/service_account_roles';
const SA_ROLE_DELETE_ENDPOINT = '*/api/v1/service_account_roles/:id';
const activeAccountResponse = {
const account: ServiceAccountRow = {
id: 'sa-1',
name: 'CI Bot',
email: 'ci-bot@signoz.io',
status: 'ACTIVE',
createdAt: '2026-01-01T00:00:00Z',
updatedAt: '2026-01-02T00:00:00Z',
};
const activeAccountResponse = {
...account,
serviceAccountRoles: [
{
id: 'sar-admin-1',
@@ -41,93 +45,88 @@ const activeAccountResponse = {
],
};
function renderDrawer(
searchParams: Record<string, string> = { account: 'sa-1' },
): ReturnType<typeof render> {
function renderOverviewTab(): ReturnType<typeof render> {
return render(
<NuqsTestingAdapter searchParams={searchParams} hasMemory>
<ServiceAccountDrawer onSuccess={jest.fn()} />
</NuqsTestingAdapter>,
);
}
function setupBaseHandlers(): void {
server.use(
rest.get(ROLES_ENDPOINT, (_, res, ctx) =>
res(ctx.status(200), ctx.json(listRolesSuccessResponse)),
),
rest.get(SA_KEYS_ENDPOINT, (_, res, ctx) =>
res(ctx.status(200), ctx.json({ data: [] })),
),
rest.get(SA_ENDPOINT, (_, res, ctx) =>
res(ctx.status(200), ctx.json({ data: activeAccountResponse })),
),
rest.put(SA_ENDPOINT, (_, res, ctx) =>
res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
),
rest.delete(SA_DELETE_ENDPOINT, (_, res, ctx) =>
res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
),
rest.post(SA_ROLES_ENDPOINT, (_, res, ctx) =>
res(
ctx.status(201),
ctx.json({ status: 'success', data: { id: 'sar-new' } }),
),
),
rest.delete(SA_ROLE_DELETE_ENDPOINT, (_, res, ctx) => res(ctx.status(204))),
<OverviewTab
account={account}
localName="CI Bot"
onNameChange={jest.fn()}
localRoles={[]}
onRolesChange={jest.fn()}
isDisabled={false}
availableRoles={[]}
/>,
);
}
describe('ServiceAccountDrawer — permissions', () => {
beforeEach(() => {
jest.clearAllMocks();
setupBaseHandlers();
});
afterEach(() => {
server.resetHandlers();
});
it('shows PermissionDeniedCallout inside drawer when read permission is denied', async () => {
it('shows PermissionDeniedCallout in the Overview tab when read permission is denied', async () => {
server.use(setupAuthzDenyAll());
renderDrawer();
renderOverviewTab();
await waitFor(() => {
expect(screen.getByText(/read:serviceaccount/)).toBeInTheDocument();
});
await expect(
screen.findByTestId('permission-denied-callout'),
).resolves.toHaveTextContent('read:serviceaccount:sa-1');
});
it('shows drawer content when read permission is granted', async () => {
it('shows Overview tab content when read permission is granted', async () => {
server.use(setupAuthzAdmin());
renderDrawer();
renderOverviewTab();
await screen.findByDisplayValue('CI Bot');
expect(screen.queryByText(/serviceaccount:read/)).not.toBeInTheDocument();
expect(
screen.queryByTestId('permission-denied-callout'),
).not.toBeInTheDocument();
});
it('shows PermissionDeniedCallout in Keys tab when list-keys permission is denied', async () => {
server.use(setupAuthzDeny(APIKeyListPermission));
renderDrawer({ account: 'sa-1', tab: 'keys' });
render(
<KeysTab
keys={[]}
isLoading={false}
accountId="sa-1"
currentPage={1}
pageSize={15}
onPageChange={jest.fn()}
/>,
);
await waitFor(() => {
expect(screen.getByText(/list:factor-api-key/)).toBeInTheDocument();
});
await expect(
screen.findByTestId('permission-denied-callout'),
).resolves.toHaveTextContent('list:factor-api-key:*');
});
it('disables Delete button when delete permission is denied', async () => {
server.use(setupAuthzDeny(buildSADeletePermission('sa-1')));
renderDrawer();
await screen.findByDisplayValue('CI Bot');
const deleteBtn = screen.getByRole('button', {
name: /Delete Service Account/i,
});
await waitFor(() =>
expect(deleteBtn).toHaveAttribute('aria-disabled', 'true'),
server.use(
rest.get(ROLES_ENDPOINT, (_, res, ctx) =>
res(ctx.status(200), ctx.json(listRolesSuccessResponse)),
),
rest.get(SA_KEYS_ENDPOINT, (_, res, ctx) =>
res(ctx.status(200), ctx.json({ data: [] })),
),
rest.get(SA_ENDPOINT, (_, res, ctx) =>
res(ctx.status(200), ctx.json({ data: activeAccountResponse })),
),
setupAuthzDeny(buildSADeletePermission('sa-1')),
);
render(
<NuqsTestingAdapter searchParams={{ account: 'sa-1' }} hasMemory>
<ServiceAccountDrawer onSuccess={jest.fn()} />
</NuqsTestingAdapter>,
);
const deleteBtn = await screen.findByTestId('sa-delete-btn');
await waitFor(() =>
expect(deleteBtn).toHaveAttribute(
'data-denied-permissions',
buildSADeletePermission('sa-1'),
),
);
expect(deleteBtn).toHaveAttribute('aria-disabled', 'true');
});
});

View File

@@ -4,7 +4,7 @@ import {
} from 'mocks-server/__mockdata__/roles';
import { rest, server } from 'mocks-server/server';
import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { act, render, screen, userEvent, waitFor } from 'tests/test-utils';
import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
import ServiceAccountDrawer from '../ServiceAccountDrawer';
@@ -93,7 +93,7 @@ describe('ServiceAccountDrawer', () => {
screen.findByDisplayValue('CI Bot'),
).resolves.toBeInTheDocument();
expect(screen.getByText('ci-bot@signoz.io')).toBeInTheDocument();
expect(screen.getByRole('button', { name: /Save Changes/i })).toHaveAttribute(
expect(screen.getByTestId('sa-save-btn')).toHaveAttribute(
'aria-disabled',
'true',
);
@@ -102,7 +102,7 @@ describe('ServiceAccountDrawer', () => {
it('editing name enables Save; clicking Save sends correct payload and calls onSuccess', async () => {
const onSuccess = jest.fn();
const updateSpy = jest.fn();
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.put(SA_ENDPOINT, async (req, res, ctx) => {
@@ -121,7 +121,7 @@ describe('ServiceAccountDrawer', () => {
await user.clear(nameInput);
await user.type(nameInput, 'CI Bot Updated');
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
const saveBtn = screen.getByTestId('sa-save-btn');
await waitFor(() =>
expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
@@ -140,7 +140,7 @@ describe('ServiceAccountDrawer', () => {
it('adding a role fires POST for the new role and no DELETE for existing roles', async () => {
const roleSpy = jest.fn();
const deleteSpy = jest.fn();
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(SA_ROLES_ENDPOINT, async (req, res, ctx) => {
@@ -164,7 +164,7 @@ describe('ServiceAccountDrawer', () => {
await user.click(screen.getByLabelText('Roles'));
await user.click(await screen.findByTitle('signoz-viewer'));
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
const saveBtn = screen.getByTestId('sa-save-btn');
await waitFor(() =>
expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
@@ -184,7 +184,7 @@ describe('ServiceAccountDrawer', () => {
it('removing a role fires DELETE for the removed role and no POST', async () => {
const roleSpy = jest.fn();
const deleteSpy = jest.fn();
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(SA_ROLES_ENDPOINT, async (req, res, ctx) => {
@@ -211,7 +211,7 @@ describe('ServiceAccountDrawer', () => {
) as Element;
await user.click(removeBtn);
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
const saveBtn = screen.getByTestId('sa-save-btn');
await waitFor(() =>
expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
@@ -225,7 +225,7 @@ describe('ServiceAccountDrawer', () => {
it('"Delete Service Account" opens confirm dialog; confirming sends delete request', async () => {
const deleteSpy = jest.fn();
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.delete(SA_DELETE_ENDPOINT, (_, res, ctx) => {
@@ -238,9 +238,7 @@ describe('ServiceAccountDrawer', () => {
await screen.findByDisplayValue('CI Bot');
await user.click(
screen.getByRole('button', { name: /Delete Service Account/i }),
);
await user.click(screen.getByTestId('sa-delete-btn'));
await screen.findByTestId('delete-service-account-modal');
expect(
@@ -272,23 +270,19 @@ describe('ServiceAccountDrawer', () => {
await screen.findByText('CI Bot');
expect(
screen.queryByRole('button', { name: /Save Changes/i }),
).not.toBeInTheDocument();
expect(
screen.queryByRole('button', { name: /Delete Service Account/i }),
).not.toBeInTheDocument();
expect(screen.queryByTestId('sa-save-btn')).not.toBeInTheDocument();
expect(screen.queryByTestId('sa-delete-btn')).not.toBeInTheDocument();
expect(screen.queryByDisplayValue('CI Bot')).not.toBeInTheDocument();
});
it('switching to Keys tab shows "No keys" empty state', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
renderDrawer();
await screen.findByDisplayValue('CI Bot');
await user.click(screen.getByRole('button', { name: /Keys/i }));
await user.click(screen.getByTestId('sa-tab-button-keys'));
await expect(screen.findByText(/No keys/i)).resolves.toBeInTheDocument();
});
@@ -341,11 +335,12 @@ describe('ServiceAccountDrawer – save-error UX', () => {
});
afterEach(() => {
jest.useRealTimers();
server.resetHandlers();
});
it('name update failure shows SaveErrorItem with "Name update" context', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.put(SA_ENDPOINT, (_, res, ctx) =>
@@ -367,7 +362,7 @@ describe('ServiceAccountDrawer – save-error UX', () => {
await user.clear(nameInput);
await user.type(nameInput, 'New Name');
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
const saveBtn = screen.getByTestId('sa-save-btn');
await waitFor(() =>
expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
@@ -381,7 +376,7 @@ describe('ServiceAccountDrawer – save-error UX', () => {
});
it('role add failure shows SaveErrorItem with the role name context', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(SA_ROLES_ENDPOINT, (_, res, ctx) =>
@@ -405,7 +400,7 @@ describe('ServiceAccountDrawer – save-error UX', () => {
await user.click(screen.getByLabelText('Roles'));
await user.click(await screen.findByTitle('signoz-viewer'));
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
const saveBtn = screen.getByTestId('sa-save-btn');
await waitFor(() =>
expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
@@ -419,7 +414,11 @@ describe('ServiceAccountDrawer – save-error UX', () => {
});
it('role add retries on 429 then succeeds without showing an error', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
const onSuccess = jest.fn();
let roleAddCallCount = 0;
// First call → 429, second call → 201
@@ -436,31 +435,35 @@ describe('ServiceAccountDrawer – save-error UX', () => {
}),
);
renderDrawer();
render(
<NuqsTestingAdapter searchParams={{ account: 'sa-1' }} hasMemory>
<ServiceAccountDrawer onSuccess={onSuccess} />
</NuqsTestingAdapter>,
);
await screen.findByDisplayValue('CI Bot');
await user.click(screen.getByLabelText('Roles'));
await user.click(await screen.findByTitle('signoz-viewer'));
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
const saveBtn = screen.getByTestId('sa-save-btn');
await waitFor(() =>
expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
await user.click(saveBtn);
// Retried after 429 — at least 2 calls, no error shown
await waitFor(
() => {
expect(roleAddCallCount).toBeGreaterThanOrEqual(2);
},
{ timeout: 5000 },
await waitFor(() => expect(roleAddCallCount).toBe(1));
await act(() => jest.advanceTimersByTimeAsync(1000));
await waitFor(() =>
expect(onSuccess).toHaveBeenCalledWith({ closeDrawer: false }),
);
expect(roleAddCallCount).toBe(2);
expect(screen.queryByText(/role assign failed/i)).not.toBeInTheDocument();
expect(screen.queryByTestId('sa-error-retry-btn')).not.toBeInTheDocument();
});
it('clicking Retry on a name-update error re-triggers the request; on success the error item is removed', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
// First: PUT always fails so the error appears
server.use(
@@ -483,7 +486,7 @@ describe('ServiceAccountDrawer – save-error UX', () => {
await user.clear(nameInput);
await user.type(nameInput, 'Retry Test');
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
const saveBtn = screen.getByTestId('sa-save-btn');
await waitFor(() =>
expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
@@ -499,7 +502,7 @@ describe('ServiceAccountDrawer – save-error UX', () => {
),
);
const retryBtn = screen.getByRole('button', { name: /Retry/i });
const retryBtn = screen.getByTestId('sa-error-retry-btn');
await user.click(retryBtn);
// Error item should be removed after successful retry

View File

@@ -1,5 +1,4 @@
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { render, screen, userEvent } from 'tests/test-utils';
import TagKeyValueInput from './TagKeyValueInput';

View File

@@ -66,6 +66,10 @@ describe('useAIAssistantStore — streaming error handling', () => {
});
});
afterEach(() => {
jest.useRealTimers();
});
it('commits a manually-retryable error bubble with friendly copy and metadata', async () => {
chat.createThread.mockResolvedValue('thread-1');
chat.sendMessage.mockResolvedValue('exec-1');
@@ -135,6 +139,7 @@ describe('useAIAssistantStore — streaming error handling', () => {
});
it('silently retries auto-flagged errors, then downgrades to manual once spent', async () => {
jest.useFakeTimers();
chat.createThread.mockResolvedValue('thread-2');
chat.sendMessage.mockResolvedValue('exec');
// Always auto-retryable: 1 initial attempt + MAX_AUTO_RETRIES (2) = 3 sends.
@@ -145,7 +150,9 @@ describe('useAIAssistantStore — streaming error handling', () => {
);
useAIAssistantStore.getState().startNewConversation();
await useAIAssistantStore.getState().sendMessage('hi');
const sending = useAIAssistantStore.getState().sendMessage('hi');
await jest.runAllTimersAsync();
await sending;
expect(chat.sendMessage).toHaveBeenCalledTimes(3);
expect(lastMessage('thread-2')).toMatchObject({
@@ -154,7 +161,7 @@ describe('useAIAssistantStore — streaming error handling', () => {
// Auto budget exhausted → presented as manual so a Retry button shows.
retryAction: RetryActionDTO.manual,
});
}, 10000);
});
it('marks rate-limit errors and offers no retry', async () => {
chat.createThread.mockResolvedValue('thread-3');
@@ -184,6 +191,7 @@ describe('useAIAssistantStore — streaming error handling', () => {
});
it('recovers silently when an auto-flagged error succeeds on retry', async () => {
jest.useFakeTimers();
chat.createThread.mockResolvedValue('thread-4');
chat.sendMessage.mockResolvedValue('exec');
chat.streamEvents
@@ -205,7 +213,9 @@ describe('useAIAssistantStore — streaming error handling', () => {
);
useAIAssistantStore.getState().startNewConversation();
await useAIAssistantStore.getState().sendMessage('hi');
const sending = useAIAssistantStore.getState().sendMessage('hi');
await jest.runAllTimersAsync();
await sending;
// 1 initial attempt + 1 silent auto retry, then success — no error bubble.
expect(chat.sendMessage).toHaveBeenCalledTimes(2);
@@ -217,7 +227,7 @@ describe('useAIAssistantStore — streaming error handling', () => {
content: 'Recovered',
});
expect(conv.messages.some((m) => m.isError)).toBe(false);
}, 10000);
});
it('replays the originating action on retry for a non-send error (approve)', async () => {
chat.approveExecution.mockResolvedValue('exec-a');

View File

@@ -26,8 +26,6 @@ window.ResizeObserver =
}));
describe('BillingContainer', () => {
jest.setTimeout(30000);
beforeEach(() => {
server.use(setupAuthzAdmin());
});
@@ -39,40 +37,47 @@ describe('BillingContainer', () => {
it('Component should render', async () => {
render(<BillingContainer />);
const dataInjection = await screen.findByRole('columnheader', {
name: /data ingested/i,
});
expect(dataInjection).toBeInTheDocument();
const pricePerUnit = await screen.findByRole('columnheader', {
name: /price per unit/i,
});
expect(pricePerUnit).toBeInTheDocument();
const cost = await screen.findByRole('columnheader', {
name: /cost/i,
});
expect(cost).toBeInTheDocument();
const dayRemainingInBillingPeriod = await screen.findByText(
/Please upgrade plan now to retain your data./i,
{},
{ timeout: 5000 },
);
expect(dayRemainingInBillingPeriod).toBeInTheDocument();
expect(
screen.getByText('Data Ingested', { selector: 'th' }),
).toBeInTheDocument();
expect(
screen.getByText('Price per Unit', { selector: 'th' }),
).toBeInTheDocument();
expect(screen.getByText('Cost', { selector: 'th' })).toBeInTheDocument();
const upgradePlanButton = screen.getByTestId('upgrade-plan-button');
expect(upgradePlanButton).toBeInTheDocument();
const dollar = await screen.findByText(/\$1,278.3/i, {}, { timeout: 5000 });
expect(dollar).toBeInTheDocument();
const currentBill = await screen.findByText('billing');
expect(currentBill).toBeInTheDocument();
expect(screen.getByText(/\$1,278.3/i)).toBeInTheDocument();
expect(screen.getByText('billing')).toBeInTheDocument();
});
describe('Trial scenarios', () => {
beforeEach(() => {
jest.useFakeTimers();
jest.setSystemTime(new Date('2023-10-20'));
jest.useFakeTimers({
now: new Date('2023-10-20'),
doNotFake: [
'hrtime',
'nextTick',
'performance',
'queueMicrotask',
'requestAnimationFrame',
'cancelAnimationFrame',
'requestIdleCallback',
'cancelIdleCallback',
'setImmediate',
'clearImmediate',
'setInterval',
'clearInterval',
'setTimeout',
'clearTimeout',
],
});
});
afterEach(() => {
@@ -88,14 +93,9 @@ describe('BillingContainer', () => {
{ appContextOverrides: { trialInfo: licensesSuccessResponse.data } },
);
// If the component schedules any setTimeout on mount, flush them:
jest.runOnlyPendingTimers();
await expect(screen.findByText('Free Trial')).resolves.toBeInTheDocument();
await expect(screen.findByText('billing')).resolves.toBeInTheDocument();
await expect(
screen.findByText(/\$0/i, {}, { timeout: 5000 }),
).resolves.toBeInTheDocument();
await expect(screen.findByText(/\$0/i)).resolves.toBeInTheDocument();
await expect(
screen.findByText(
@@ -107,18 +107,20 @@ describe('BillingContainer', () => {
screen.findByText(/1 days_remaining/i),
).resolves.toBeInTheDocument();
const upgradeButtons = await screen.findAllByRole('button', {
name: /upgrade_plan/i,
});
expect(upgradeButtons).toHaveLength(2);
expect(upgradeButtons[1]).toBeInTheDocument();
expect(screen.getByTestId('header-billing-button')).toHaveTextContent(
'upgrade_plan',
);
expect(screen.getByTestId('upgrade-plan-button')).toHaveTextContent(
'upgrade_plan',
);
await expect(
screen.findByText(/checkout_plans/i),
).resolves.toBeInTheDocument();
await expect(
screen.findByRole('link', { name: /here/i }),
).resolves.toBeInTheDocument();
expect(screen.getByText('here', { selector: 'a' })).toHaveAttribute(
'href',
'https://signoz.io/pricing/',
);
await expect(
screen.findByText('Cancel your subscription', { selector: 'span' }),
@@ -141,7 +143,7 @@ describe('BillingContainer', () => {
const currentBill = await screen.findByText('billing');
expect(currentBill).toBeInTheDocument();
const dollar0 = await screen.findByText(/\$0/i, {}, { timeout: 5000 });
const dollar0 = await screen.findByText(/\$0/i);
expect(dollar0).toBeInTheDocument();
const onTrail = await screen.findByText(
@@ -154,10 +156,9 @@ describe('BillingContainer', () => {
);
expect(receivedCardDetails).toBeInTheDocument();
const manageBillingButton = await screen.findByRole('button', {
name: /manage_billing/i,
});
expect(manageBillingButton).toBeInTheDocument();
expect(screen.getByTestId('header-billing-button')).toHaveTextContent(
'manage_billing',
);
const dayRemainingInBillingPeriod =
await screen.findByText(/1 days_remaining/i);
@@ -259,27 +260,26 @@ describe('BillingContainer', () => {
billingSuccessResponse.data.billingPeriodStart,
)} to ${getFormattedDate(billingSuccessResponse.data.billingPeriodEnd)}`;
const billingPeriod = await findByText(
billingPeriodText,
{},
{ timeout: 5000 },
);
const billingPeriod = await findByText(billingPeriodText);
expect(billingPeriod).toBeInTheDocument();
const currentBill = await screen.findByText('billing');
expect(currentBill).toBeInTheDocument();
expect(screen.getByText('billing')).toBeInTheDocument();
expect(screen.getByText(/\$1,278.3/i)).toBeInTheDocument();
const dollar0 = await screen.findByText(/\$1,278.3/i);
expect(dollar0).toBeInTheDocument();
const cellTexts = (rowName: string): string[] =>
Array.from(
screen
.getByText(rowName, { selector: 'td > div' })
.closest('tr')
?.querySelectorAll('td') ?? [],
).map((cell) => cell.textContent ?? '');
const metricsRow = await screen.findByRole('row', {
name: /metrics 4012 Million 0.1 \$ 401.2/i,
});
expect(metricsRow).toBeInTheDocument();
const logRow = await screen.findByRole('row', {
name: /Logs 497 GB 0.4 \$ 198.8/i,
});
expect(logRow).toBeInTheDocument();
expect(cellTexts('Metrics')).toStrictEqual([
'Metrics',
'4012 Million',
'0.1',
'$ 401.2',
]);
expect(cellTexts('Logs')).toStrictEqual(['Logs', '497 GB', '0.4', '$ 198.8']);
});
});

View File

@@ -64,6 +64,31 @@ const multiOrgProps: ForgotPasswordRouteState = {
orgs: mockMultipleOrgs,
};
function mockForgot(): {
forgotCalls: () => number;
holdResponse: () => () => void;
} {
let calls = 0;
let pending: Promise<void> = Promise.resolve();
server.use(
rest.post(FORGOT_PASSWORD_ENDPOINT, async (_req, res, ctx) => {
calls += 1;
await pending;
return res(ctx.status(200), ctx.json({ status: 'success' }));
}),
);
return {
forgotCalls: (): number => calls,
holdResponse: (): (() => void) => {
let release: () => void = () => {};
pending = new Promise((resolve) => {
release = resolve;
});
return release;
},
};
}
describe('ForgotPassword Component', () => {
beforeEach(() => {
jest.clearAllMocks();
@@ -136,7 +161,7 @@ describe('ForgotPassword Component', () => {
});
it('enables submit button after selecting an organization', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<ForgotPassword {...multiOrgProps} />);
@@ -144,7 +169,7 @@ describe('ForgotPassword Component', () => {
expect(submitButton).toHaveAttribute('aria-disabled', 'true');
// Click on the dropdown to reveal the options
await user.click(screen.getByRole('combobox'));
await user.click(screen.getByText('Select your organization'));
await user.click(screen.getByText('Organization One'));
await waitFor(() => {
@@ -168,7 +193,7 @@ describe('ForgotPassword Component', () => {
describe('Form Submission - Success', () => {
it('successfully submits forgot password request and shows success screen', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(FORGOT_PASSWORD_ENDPOINT, (_req, res, ctx) =>
@@ -190,7 +215,7 @@ describe('ForgotPassword Component', () => {
});
it('shows back to login button on success screen', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(FORGOT_PASSWORD_ENDPOINT, (_req, res, ctx) =>
@@ -209,7 +234,7 @@ describe('ForgotPassword Component', () => {
});
it('redirects to login when clicking back to login on success screen', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(FORGOT_PASSWORD_ENDPOINT, (_req, res, ctx) =>
@@ -235,7 +260,7 @@ describe('ForgotPassword Component', () => {
describe('Form Submission - Error Handling', () => {
it('displays error message when forgot password API fails', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(
@@ -255,7 +280,7 @@ describe('ForgotPassword Component', () => {
});
it('displays error message when API returns server error', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(rest.post(FORGOT_PASSWORD_ENDPOINT, handleInternalServerError));
@@ -270,7 +295,7 @@ describe('ForgotPassword Component', () => {
});
it('clears error message on new submission attempt', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
let requestCount = 0;
server.use(
@@ -314,7 +339,7 @@ describe('ForgotPassword Component', () => {
describe('Navigation', () => {
it('redirects to login when clicking back button on form', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<ForgotPassword {...defaultProps} />);
@@ -327,13 +352,9 @@ describe('ForgotPassword Component', () => {
describe('Loading States', () => {
it('shows loading state during API call', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(FORGOT_PASSWORD_ENDPOINT, (_req, res, ctx) =>
res(ctx.delay(100), ctx.status(200), ctx.json({ status: 'success' })),
),
);
mockForgot().holdResponse();
render(<ForgotPassword {...defaultProps} />);
@@ -347,13 +368,9 @@ describe('ForgotPassword Component', () => {
});
it('disables submit button during loading', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(FORGOT_PASSWORD_ENDPOINT, (_req, res, ctx) =>
res(ctx.delay(100), ctx.status(200), ctx.json({ status: 'success' })),
),
);
mockForgot().holdResponse();
render(<ForgotPassword {...defaultProps} />);
@@ -410,23 +427,8 @@ describe('ForgotPassword Component', () => {
// The email input is disabled and Enter in the org Select opens it, so Enter
// only reaches the form through the focused submit button.
describe('Enter key submission', () => {
function mockForgot(delayMs = 0): { forgotCalls: () => number } {
let calls = 0;
server.use(
rest.post(FORGOT_PASSWORD_ENDPOINT, (_req, res, ctx) => {
calls += 1;
return res(
ctx.delay(delayMs),
ctx.status(200),
ctx.json({ status: 'success' }),
);
}),
);
return { forgotCalls: (): number => calls };
}
it('sends the reset link once on Enter on the submit button', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const { forgotCalls } = mockForgot();
render(<ForgotPassword {...defaultProps} />);
@@ -443,7 +445,7 @@ describe('ForgotPassword Component', () => {
});
it('does not send on Enter while no organization is selected', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const { forgotCalls } = mockForgot();
render(<ForgotPassword {...multiOrgProps} />);
@@ -459,8 +461,9 @@ describe('ForgotPassword Component', () => {
});
it('does not send again on Enter while the first request is loading', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const { forgotCalls } = mockForgot(1000);
const user = userEvent.setup();
const { forgotCalls, holdResponse } = mockForgot();
const releaseResponse = holdResponse();
render(<ForgotPassword {...defaultProps} />);
@@ -472,8 +475,9 @@ describe('ForgotPassword Component', () => {
expect(submitButton).toHaveAttribute('aria-disabled', 'true');
await user.keyboard('{enter}');
releaseResponse();
await expect(
screen.findByText(/check your email/i, undefined, { timeout: 2000 }),
screen.findByText(/check your email/i),
).resolves.toBeInTheDocument();
expect(forgotCalls()).toBe(1);
});

View File

@@ -644,6 +644,7 @@ function GeneralSettings({
onClick={category.save.modalOpen}
disabled={category.save.isDisabled}
loading={category.save.isLoading}
testId={`${category.type}-retention-save-button`}
>
{category.save.saveButtonText}
</Button>
@@ -671,6 +672,9 @@ function GeneralSettings({
centered
open={category.save.modal}
confirmLoading={category.save.apiLoading}
okButtonProps={{
'data-testid': `${category.type}-retention-confirm-button`,
}}
>
<p className="retention-modal-description">
{t('retention_confirmation_description', {

View File

@@ -1,6 +1,6 @@
import setRetentionApiV2 from 'api/settings/setRetentionV2';
import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
import { fireEvent, render, screen, waitFor } from 'tests/test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { IDiskType } from 'types/api/disks/getDisks';
import {
PayloadPropsLogs,
@@ -108,7 +108,8 @@ describe('GeneralSettings - S3 Logs Retention', () => {
});
describe('Test 1: S3 Enabled - Only Days in Dropdown', () => {
it('should show only Days option for S3 retention and send correct API payload', async () => {
it('should show only Days option for S3 retention', async () => {
const user = userEvent.setup();
render(
<GeneralSettings
metricsTtlValuesPayload={mockMetricsRetention}
@@ -138,7 +139,7 @@ describe('GeneralSettings - S3 Logs Retention', () => {
expect(s3Dropdown).toBeInTheDocument();
// Click the S3 dropdown to open it
fireEvent.mouseDown(s3Dropdown);
await user.click(s3Dropdown);
// Wait for dropdown options to appear and verify only "Days" is available
await waitFor(() => {
@@ -146,33 +147,34 @@ describe('GeneralSettings - S3 Logs Retention', () => {
expect(dropdownOptions).toHaveLength(1);
expect(dropdownOptions[0]).toHaveTextContent('Days');
});
});
// Close dropdown
fireEvent.click(document.body);
it('should send correct API payload for S3 retention', async () => {
const user = userEvent.setup();
render(
<GeneralSettings
metricsTtlValuesPayload={mockMetricsRetention}
tracesTtlValuesPayload={mockTracesRetention}
logsTtlValuesPayload={mockLogsRetentionWithS3}
getAvailableDiskPayload={mockDisksWithS3}
metricsTtlValuesRefetch={jest.fn()}
tracesTtlValuesRefetch={jest.fn()}
logsTtlValuesRefetch={jest.fn()}
/>,
);
const s3Input = getLogsRow().querySelectorAll('input[type="number"]')[1];
// Change S3 retention value to 5 days
fireEvent.change(s3Input, { target: { value: '5' } });
await user.clear(s3Input);
await user.type(s3Input, '5');
// Find the save button in the Logs row
const saveButton = logsRow.querySelector(
'button:not([disabled])',
) as HTMLButtonElement;
expect(saveButton).toBeInTheDocument();
const saveButton = screen.getByTestId('logs-retention-save-button');
expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
await user.click(saveButton);
// Wait for button to be enabled
await waitFor(() => {
expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
});
fireEvent.click(saveButton);
// Wait for modal to appear
const modal = await screen.findByRole('dialog');
expect(modal).toBeInTheDocument();
// Click OK button
const okButton = await screen.findByRole('button', { name: /ok/i });
fireEvent.click(okButton);
// Wait for modal to appear and click OK
await user.click(await screen.findByTestId('logs-retention-confirm-button'));
// Verify API was called with correct payload
await waitFor(() => {
@@ -208,6 +210,7 @@ describe('GeneralSettings - S3 Logs Retention', () => {
describe('Test 2: S3 Disabled - Field Hidden', () => {
it('should hide S3 retention field and send empty S3 values to API', async () => {
const user = userEvent.setup();
render(
<GeneralSettings
metricsTtlValuesPayload={mockMetricsRetention}
@@ -234,45 +237,28 @@ describe('GeneralSettings - S3 Logs Retention', () => {
const totalDropdown = logsRow.querySelector(
'.ant-select-selector',
) as HTMLElement;
fireEvent.mouseDown(totalDropdown);
// Wait for dropdown options to appear
await waitFor(() => {
const options = document.querySelectorAll('.ant-select-item');
expect(options.length).toBeGreaterThan(0);
});
await user.click(totalDropdown);
// Find and click the Days option
const options = document.querySelectorAll('.ant-select-item');
const daysOption = Array.from(options).find((opt) =>
opt.textContent?.includes('Days'),
);
expect(daysOption).toBeInTheDocument();
fireEvent.click(daysOption as HTMLElement);
const daysOption = await waitFor(() => {
const option = Array.from(
document.querySelectorAll('.ant-select-item'),
).find((opt) => opt.textContent?.includes('Days'));
expect(option).toBeInTheDocument();
return option as HTMLElement;
});
await user.click(daysOption);
// Now change the value
fireEvent.change(totalInput, { target: { value: '60' } });
await user.clear(totalInput);
await user.type(totalInput, '60');
// Find the save button
const saveButton = logsRow.querySelector(
'button:not([disabled])',
) as HTMLButtonElement;
expect(saveButton).toBeInTheDocument();
const saveButton = screen.getByTestId('logs-retention-save-button');
expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
await user.click(saveButton);
// Wait for button to be enabled
await waitFor(() => {
expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
});
// Click save button
fireEvent.click(saveButton);
// Wait for modal to appear
const okButton = await screen.findByRole('button', { name: /ok/i });
expect(okButton).toBeInTheDocument();
// Click OK button
fireEvent.click(okButton);
// Wait for modal to appear and click OK
await user.click(await screen.findByTestId('logs-retention-confirm-button'));
// Verify API was called with empty S3 values (60 days)
await waitFor(() => {
@@ -321,6 +307,7 @@ describe('GeneralSettings - S3 Logs Retention', () => {
describe('Test 4: Save Button State with S3 Disabled', () => {
it('should disable save button when cold_storage_ttl_days is -1 and no changes made', async () => {
const user = userEvent.setup();
render(
<GeneralSettings
metricsTtlValuesPayload={mockMetricsRetention}
@@ -336,12 +323,8 @@ describe('GeneralSettings - S3 Logs Retention', () => {
const logsRow = getLogsRow();
expect(logsRow).toBeInTheDocument();
// Find the save button by accessible name within the Logs row
const allSaveButtons = screen.getAllByRole('button', { name: /save/i });
const saveButton = allSaveButtons.find((btn) =>
logsRow.contains(btn),
) as HTMLButtonElement;
expect(saveButton).toBeInTheDocument();
const saveButton = screen.getByTestId('logs-retention-save-button');
expect(logsRow).toContainElement(saveButton);
// Verify save button is disabled on initial load
expect(saveButton).toHaveAttribute('aria-disabled', 'true');
@@ -351,20 +334,18 @@ describe('GeneralSettings - S3 Logs Retention', () => {
const totalInput = inputs[0] as HTMLInputElement;
// Change total retention value to trigger button enable
fireEvent.change(totalInput, { target: { value: '60' } });
await user.clear(totalInput);
await user.type(totalInput, '60');
// Button should now be enabled after change
await waitFor(() => {
expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
});
expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
// Revert to original value (30 days displays as 1 Month)
fireEvent.change(totalInput, { target: { value: '1' } });
await user.clear(totalInput);
await user.type(totalInput, '1');
// Button should be disabled again (back to original state)
await waitFor(() => {
expect(saveButton).toHaveAttribute('aria-disabled', 'true');
});
expect(saveButton).toHaveAttribute('aria-disabled', 'true');
});
});
@@ -421,8 +402,11 @@ describe('GeneralSettings - S3 Logs Retention', () => {
).not.toBeInTheDocument();
// Save buttons should be visible for non-cloud users (these are from retentions)
const saveButtons = screen.getAllByRole('button', { name: /save/i });
expect(saveButtons.length).toBeGreaterThan(0);
['metrics', 'traces', 'logs'].forEach((type) => {
expect(
screen.getByTestId(`${type}-retention-save-button`),
).toHaveTextContent('retention_save_button.success');
});
});
});
});

View File

@@ -426,7 +426,7 @@ describe('K8sBaseList', () => {
});
// Find pagination navigation and page 2 button
const nav = screen.getByRole('navigation');
const nav = document.querySelector('nav') as HTMLElement;
const page2Button = Array.from(nav.querySelectorAll('button')).find(
(btn) => btn.textContent?.trim() === '2',
);
@@ -446,13 +446,16 @@ describe('K8sBaseList', () => {
});
it('should open row in new tab when ctrl+click on row', async () => {
const user = userEvent.setup();
await waitFor(() => {
expect(screen.getByText(`PodId:${itemId}`)).toBeInTheDocument();
});
const firstRow = screen.getByText(`PodId:${itemId}`);
// Ctrl+click to open in new tab
fireEvent.click(firstRow, { ctrlKey: true });
await user.keyboard('{Control>}');
await user.click(firstRow);
await user.keyboard('{/Control}');
await waitFor(() => {
expect(openInNewTabMock).toHaveBeenCalledTimes(1);
@@ -463,13 +466,16 @@ describe('K8sBaseList', () => {
});
it('should open row in new tab when meta+click (cmd on Mac) on row', async () => {
const user = userEvent.setup();
await waitFor(() => {
expect(screen.getByText(`PodId:${itemId}`)).toBeInTheDocument();
});
const firstRow = screen.getByText(`PodId:${itemId}`);
// Meta+click (cmd on Mac) to open in new tab
fireEvent.click(firstRow, { metaKey: true });
await user.keyboard('{Meta>}');
await user.click(firstRow);
await user.keyboard('{/Meta}');
await waitFor(() => {
expect(openInNewTabMock).toHaveBeenCalledTimes(1);
@@ -536,7 +542,7 @@ describe('K8sBaseList', () => {
expect(screen.getByText('namespace-default')).toBeInTheDocument();
});
const expandButtons = screen.getAllByRole('button');
const expandButtons = document.querySelectorAll('button');
expect(expandButtons.length).toBeGreaterThan(0);
});
@@ -604,7 +610,7 @@ describe('K8sBaseList', () => {
expect(screen.getByText('namespace-default')).toBeInTheDocument();
});
const expandButtons = screen.getAllByRole('button');
const expandButtons = document.querySelectorAll('button');
expect(expandButtons.length).toBeGreaterThan(0);
});
@@ -940,12 +946,8 @@ describe('K8sBaseList', () => {
});
// All columns should be visible
expect(
screen.getByRole('columnheader', { name: /id/i }),
).toBeInTheDocument();
expect(
screen.getByRole('columnheader', { name: /name/i }),
).toBeInTheDocument();
expect(screen.getByTitle('Id').closest('th')).toBeInTheDocument();
expect(screen.getByTitle('Name').closest('th')).toBeInTheDocument();
});
});
@@ -988,9 +990,7 @@ describe('K8sBaseList', () => {
});
// Columns should be visible
expect(
screen.getByRole('columnheader', { name: /id/i }),
).toBeInTheDocument();
expect(screen.getByTitle('Id').closest('th')).toBeInTheDocument();
});
it('should show columns when grouped', async () => {
@@ -1014,9 +1014,7 @@ describe('K8sBaseList', () => {
});
// Id should be visible
expect(
screen.getByRole('columnheader', { name: /id/i }),
).toBeInTheDocument();
expect(screen.getByTitle('Id').closest('th')).toBeInTheDocument();
});
});
@@ -1096,12 +1094,8 @@ describe('K8sBaseList', () => {
});
// All columns should be visible
expect(
screen.getByRole('columnheader', { name: /id/i }),
).toBeInTheDocument();
expect(
screen.getByRole('columnheader', { name: /^name$/i }),
).toBeInTheDocument();
expect(screen.getByTitle('Id').closest('th')).toBeInTheDocument();
expect(screen.getByTitle('Name').closest('th')).toBeInTheDocument();
});
it('should render data in cells correctly', async () => {
@@ -1211,6 +1205,7 @@ describe('K8sBaseList', () => {
});
it('should include cluster and namespace params in new tab URL on ctrl+click', async () => {
const user = userEvent.setup();
renderComponent<TestItemWithTitle, SelectedItemParams>({
onUrlUpdate: onUrlUpdateMock,
entity: InfraMonitoringEntity.PODS,
@@ -1225,7 +1220,9 @@ describe('K8sBaseList', () => {
});
const firstRow = await screen.findByText(`PodId:${itemId}`);
fireEvent.click(firstRow, { ctrlKey: true });
await user.keyboard('{Control>}');
await user.click(firstRow);
await user.keyboard('{/Control}');
await waitFor(() => {
expect(openInNewTabMock).toHaveBeenCalledTimes(1);
@@ -1237,6 +1234,7 @@ describe('K8sBaseList', () => {
});
it('should omit null cluster/namespace params in new tab URL', async () => {
const user = userEvent.setup();
renderComponent<TestItemWithTitle, SelectedItemParams>({
onUrlUpdate: onUrlUpdateMock,
entity: InfraMonitoringEntity.PODS,
@@ -1251,7 +1249,9 @@ describe('K8sBaseList', () => {
});
const firstRow = await screen.findByText(`PodId:${itemId}`);
fireEvent.click(firstRow, { ctrlKey: true });
await user.keyboard('{Control>}');
await user.click(firstRow);
await user.keyboard('{/Control}');
await waitFor(() => {
expect(openInNewTabMock).toHaveBeenCalledTimes(1);

View File

@@ -1,6 +1,6 @@
import logEvent from 'api/common/logEvent';
import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
import { act, screen, userEvent, within } from 'tests/test-utils';
import { act, screen, userEvent } from 'tests/test-utils';
import { renderEntityTraces } from './testUtils';
import { mockQueryRangeV5WithTracesResponse } from '__tests__/query_range_v5.util';
@@ -31,15 +31,13 @@ describe('EntityTraces - Table Rendering', () => {
it('should render table with all column headers', async () => {
mockQueryRangeV5WithTracesResponse({ pageSize: 3 });
act(() => {
renderEntityTraces();
});
const { container } = renderEntityTraces();
await expect(screen.findByText('Service Name')).resolves.toBeInTheDocument();
const headerTexts = within(screen.getByRole('table'))
.getAllByRole('columnheader')
.map((header) => header.textContent);
const headerTexts = Array.from(
container.querySelectorAll('table thead th'),
).map((header) => header.textContent);
expect(headerTexts).toStrictEqual(
expect.arrayContaining([
@@ -152,13 +150,11 @@ describe('EntityTraces - Table Rendering', () => {
customTraces: [{ serviceName: 'frontend' }],
});
act(() => {
renderEntityTraces();
});
const { container } = renderEntityTraces();
await expect(screen.findByTestId('serviceName')).resolves.toBeInTheDocument();
const links = within(screen.getByRole('table')).getAllByRole('link');
const links = container.querySelectorAll('table a[href]');
expect(links.length).toBeGreaterThan(0);
links.forEach((link) => {

View File

@@ -1141,6 +1141,7 @@ function MultiIngestionSettings(): JSX.Element {
icon
color="secondary"
aria-label={`Edit ${signalName} limit`}
testId={`edit-limit-btn-${signalName}`}
disabled={
!!(activeAPIKey?.id === APIKey?.id && activeSignal)
}
@@ -1637,6 +1638,7 @@ function MultiIngestionSettings(): JSX.Element {
target="_blank"
className="learn-more"
rel="noreferrer"
data-testid="ingestion-keys-learn-more"
>
Learn more <ArrowUpRight size={14} />
</a>

View File

@@ -1,13 +1,7 @@
import { GatewaytypesGettableIngestionKeysDTO } from 'api/generated/services/sigNoz.schemas';
import { QueryParams } from 'constants/query';
import { rest, server } from 'mocks-server/server';
import {
fireEvent,
render,
screen,
userEvent,
waitFor,
} from 'tests/test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import MultiIngestionSettings from '../MultiIngestionSettings';
@@ -48,6 +42,7 @@ describe('MultiIngestionSettings Page', () => {
});
afterEach(() => {
jest.useRealTimers();
jest.clearAllMocks();
});
@@ -62,7 +57,8 @@ describe('MultiIngestionSettings Page', () => {
screen.getByText('Create and manage ingestion keys for the SigNoz Cloud'),
).toBeInTheDocument();
const aboutKeyslink = screen.getByRole('link', { name: /Learn more/i });
const aboutKeyslink = screen.getByTestId('ingestion-keys-learn-more');
expect(aboutKeyslink).toHaveTextContent('Learn more');
expect(aboutKeyslink).toHaveAttribute(
'href',
'https://signoz.io/docs/ingestion/signoz-cloud/keys/',
@@ -73,6 +69,7 @@ describe('MultiIngestionSettings Page', () => {
});
it('navigates to create alert with metrics count threshold', async () => {
const user = userEvent.setup();
const response: TestGatewayIngestionKeysResponse = {
status: 'success',
data: {
@@ -111,13 +108,10 @@ describe('MultiIngestionSettings Page', () => {
render(<MultiIngestionSettings />, undefined, {
initialRoute: INGESTION_SETTINGS_ROUTE,
});
await screen.findByText('Key One');
fireEvent.click(screen.getByRole('button', { name: /right Key One/i }));
await user.click(await screen.findByText('Key One'));
await screen.findByText('LIMITS');
fireEvent.click(
(await screen.findByTestId('set-alert-btn-metrics')) as HTMLButtonElement,
);
await user.click(await screen.findByTestId('set-alert-btn-metrics'));
await waitFor(() => {
expect(mockNavigate).toHaveBeenCalledTimes(1);
@@ -151,6 +145,7 @@ describe('MultiIngestionSettings Page', () => {
});
it('navigates to create alert for logs with GiB threshold and bytes yAxisUnit', async () => {
const user = userEvent.setup();
const GIB = 1073741824;
const sizeInBytes = 400 * GIB;
@@ -192,13 +187,10 @@ describe('MultiIngestionSettings Page', () => {
render(<MultiIngestionSettings />, undefined, {
initialRoute: INGESTION_SETTINGS_ROUTE,
});
await screen.findByText('Key Logs');
fireEvent.click(screen.getByRole('button', { name: /right Key Logs/i }));
await user.click(await screen.findByText('Key Logs'));
await screen.findByText('LIMITS');
fireEvent.click(
(await screen.findByTestId('set-alert-btn-logs')) as HTMLButtonElement,
);
await user.click(await screen.findByTestId('set-alert-btn-logs'));
await waitFor(() => {
expect(mockNavigate).toHaveBeenCalledTimes(1);
@@ -231,6 +223,7 @@ describe('MultiIngestionSettings Page', () => {
});
it('shows alert CTAs in view mode and helper text in edit mode for configured limits', async () => {
const user = userEvent.setup();
const KEY_NAME = 'Key With Limits';
const response: TestGatewayIngestionKeysResponse = {
status: 'success',
@@ -276,22 +269,22 @@ describe('MultiIngestionSettings Page', () => {
initialRoute: INGESTION_SETTINGS_ROUTE,
});
await screen.findByText(KEY_NAME);
fireEvent.click(
screen.getByRole('button', { name: new RegExp(`right ${KEY_NAME}`, 'i') }),
);
await user.click(await screen.findByText(KEY_NAME));
await screen.findByText('LIMITS');
expect(screen.getAllByText('Set alert').length).toBeGreaterThan(0);
fireEvent.click(screen.getByRole('button', { name: 'Edit logs limit' }));
await user.click(screen.getByTestId('edit-limit-btn-logs'));
expect(
screen.getByText('You can set up an alert after saving'),
).toBeInTheDocument();
});
it('switches to search API when search text is entered', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
const getResponse: TestGatewayIngestionKeysResponse = {
status: 'success',

View File

@@ -101,7 +101,7 @@ function S3BucketsSelector({
}
return (
<div className="s3-buckets-selector">
<div className="s3-buckets-selector" data-testid="s3-buckets-selector">
<div className="s3-buckets-selector-title">Select S3 Buckets by Region</div>
<div className="s3-buckets-selector-content">
{allRegions.map((region) => {
@@ -120,6 +120,7 @@ function S3BucketsSelector({
</div>
<div className="s3-buckets-selector-region-select">
<Select
data-testid={`s3-buckets-select-${region}`}
mode="tags"
placeholder={`Enter S3 bucket names for ${region}`}
value={bucketsByRegion[region] || []}

View File

@@ -1,5 +1,5 @@
import { ComponentProps } from 'react';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { render, screen, userEvent, waitFor, within } from 'tests/test-utils';
import { rest, server } from 'mocks-server/server';
import { RestRequest } from 'msw';
import type logEvent from '../../../../../api/common/logEvent';
@@ -14,9 +14,6 @@ jest.mock('../../../../../api/common/logEvent', () => ({
default: jest.fn() as jest.MockedFunction<typeof logEvent>,
}));
// The form flow drives antd selects and typing, which outruns the 5s default on CI.
jest.setTimeout(15_000);
type OnClose = ComponentProps<typeof CloudAccountSetupModal>['onClose'];
const mockOnClose = (): jest.MockedFunction<OnClose> =>
@@ -84,26 +81,28 @@ const mockApi = ({ failFirstPoll = false } = {}): {
return api;
};
type User = ReturnType<typeof userEvent.setup>;
const generateCommand = async (user: User): Promise<void> => {
const select = await screen.findByTestId('aws-deployment-region-select');
await user.click(within(select).getByRole('combobox', { hidden: true }));
await user.click(await screen.findByText('US East (N. Virginia)'));
await user.click(screen.getByTestId('aws-region-us-east-1'));
await user.click(screen.getByTestId('aws-generate-command-btn'));
await screen.findByTestId('aws-agent-command');
};
describe('AWS CloudAccountSetupModal', () => {
it('creates the account and shows its setup command', async () => {
const api = mockApi();
const openSpy = jest.spyOn(window, 'open').mockImplementation(() => null);
const user = userEvent.setup();
const onClose = mockOnClose();
render(<CloudAccountSetupModal onClose={onClose} />);
render(<CloudAccountSetupModal onClose={mockOnClose()} />);
await user.click(await screen.findByRole('combobox'));
await user.click(await screen.findByText('US East (N. Virginia)'));
await user.click(await screen.findByRole('checkbox', { name: /us-east-1/i }));
await user.click(screen.getByTestId('aws-generate-command-btn'));
await waitFor(() => {
expect(screen.getByTestId('aws-agent-command')).toHaveTextContent(
cliCommand,
);
});
await generateCommand(user);
expect(screen.getByTestId('aws-agent-command')).toHaveTextContent(cliCommand);
expect(api.createAccountPayload).toStrictEqual({
config: { aws: { deploymentRegion: 'us-east-1', regions: ['us-east-1'] } },
credentials,
@@ -111,11 +110,25 @@ describe('AWS CloudAccountSetupModal', () => {
expect(
screen.queryByTestId('aws-generate-command-btn'),
).not.toBeInTheDocument();
expect(screen.queryAllByRole('combobox')).toHaveLength(0);
expect(screen.getByText(/waiting for connection/i)).toBeInTheDocument();
expect(
screen.queryByTestId('aws-deployment-region-select'),
).not.toBeInTheDocument();
expect(screen.getByTestId('cloud-connect-waiting')).toHaveTextContent(
/waiting for connection/i,
);
expect(openSpy).not.toHaveBeenCalled();
openSpy.mockRestore();
});
it('asks before closing once a setup command exists', async () => {
mockApi();
const user = userEvent.setup();
const onClose = mockOnClose();
render(<CloudAccountSetupModal onClose={onClose} />);
await generateCommand(user);
await user.click(screen.getByTestId('aws-cancel-btn'));
await user.click(await screen.findByTestId('aws-continue-setup-btn'));
@@ -150,16 +163,15 @@ describe('AWS CloudAccountSetupModal', () => {
render(<CloudAccountSetupModal onClose={mockOnClose()} />);
await user.click(await screen.findByRole('combobox'));
await user.click(await screen.findByText('US East (N. Virginia)'));
await user.click(await screen.findByRole('checkbox', { name: /us-east-1/i }));
await user.click(screen.getByTestId('aws-generate-command-btn'));
await generateCommand(user);
await user.click(await screen.findByTestId('aws-check-connection-btn'));
await waitFor(() => expect(api.pollCount()).toBe(2));
await screen.findByText(/waiting for connection/i);
await expect(
screen.findByTestId('cloud-connect-waiting'),
).resolves.toHaveTextContent(/waiting for connection/i);
expect(
screen.queryByTestId('aws-check-connection-btn'),
).not.toBeInTheDocument();

View File

@@ -1,6 +1,6 @@
import { fireEvent, screen, waitFor } from '@testing-library/react';
import { server } from 'mocks-server/server';
import { rest, RestRequest } from 'msw';
import { screen, userEvent, waitFor, within } from 'tests/test-utils';
import {
accountsResponse,
@@ -11,19 +11,10 @@ import {
import {
assertGenericModalElements,
assertS3SyncSpecificElements,
bucketSelectInput,
renderServiceDetails,
} from './utils';
// --- RESIZE OBSERVER (required by @radix-ui in Tabs/Switch) ---
class ResizeObserverMock {
observe(): void {}
unobserve(): void {}
disconnect(): void {}
}
global.ResizeObserver = ResizeObserverMock as unknown as typeof ResizeObserver;
// --- MOCKS ---
jest.mock('components/MarkdownRenderer/MarkdownRenderer', () => ({
MarkdownRenderer: (): JSX.Element => <div data-testid="markdown-renderer" />,
@@ -36,27 +27,22 @@ jest.mock(
}),
);
let testServiceId = 's3sync';
let testInitialBuckets: Record<string, string[]> = {};
const mockGet = jest.fn((param: string) => {
if (param === 'cloudAccountId') {
return CLOUD_ACCOUNT_ID;
}
if (param === 'service') {
return testServiceId;
}
return null;
});
jest.mock('hooks/useUrlQuery', () => ({
__esModule: true,
default: (): { get: (param: string) => string | null } => ({ get: mockGet }),
}));
const addBucket = async (
user: ReturnType<typeof userEvent.setup>,
bucketName: string,
): Promise<void> => {
await screen.findByTestId('s3-buckets-select-ap-south-1');
await user.click(bucketSelectInput('ap-south-1'));
// antd reads the legacy keyCode on Enter, which user-event leaves at 0, so
// commit the tag with the select's comma separator instead.
await user.paste(`${bucketName},`);
};
// --- TEST SUITE ---
describe('ServiceDetails for S3 Sync service', () => {
jest.setTimeout(10000);
beforeEach(() => {
testServiceId = 's3sync';
testInitialBuckets = {};
server.use(
rest.get(
@@ -79,41 +65,34 @@ describe('ServiceDetails for S3 Sync service', () => {
});
it('should render with logs collection switch and bucket selectors (no buckets initially selected)', async () => {
renderServiceDetails({}); // No initial S3 buckets, defaults to 's3sync' serviceId
renderServiceDetails();
await assertGenericModalElements();
await assertS3SyncSpecificElements({});
});
it('should render with logs collection switch and bucket selectors (some buckets initially selected)', async () => {
testInitialBuckets = initialBuckets;
renderServiceDetails(initialBuckets);
renderServiceDetails();
await assertGenericModalElements();
await assertS3SyncSpecificElements(initialBuckets);
});
it('should enable save button after adding a new bucket via combobox', async () => {
const user = userEvent.setup();
testInitialBuckets = initialBuckets;
renderServiceDetails(initialBuckets);
await assertGenericModalElements();
await assertS3SyncSpecificElements(initialBuckets);
renderServiceDetails();
const targetCombobox = screen.getAllByRole('combobox')[0];
const newBucketName = 'a-newly-added-bucket';
await addBucket(user, newBucketName);
fireEvent.change(targetCombobox, { target: { value: newBucketName } });
fireEvent.keyDown(targetCombobox, {
key: 'Enter',
code: 'Enter',
keyCode: 13,
});
await waitFor(() => {
expect(screen.getByLabelText(newBucketName)).toBeInTheDocument();
expect(screen.getByRole('button', { name: /save/i })).not.toHaveAttribute(
'aria-disabled',
'true',
);
});
expect(
within(screen.getByTestId('s3-buckets-select-ap-south-1')).getByTitle(
newBucketName,
),
).toHaveTextContent(newBucketName);
await expect(
screen.findByTestId('cloud-service-save-btn'),
).resolves.not.toHaveAttribute('aria-disabled', 'true');
});
it('should send updated bucket configuration on save', async () => {
@@ -127,29 +106,13 @@ describe('ServiceDetails for S3 Sync service', () => {
return res(ctx.status(200), ctx.json({ message: 'Config updated' }));
}),
);
const user = userEvent.setup();
testInitialBuckets = initialBuckets;
renderServiceDetails(initialBuckets);
await assertGenericModalElements();
await assertS3SyncSpecificElements(initialBuckets);
renderServiceDetails();
const newBucketName = 'another-new-bucket';
const targetCombobox = screen.getAllByRole('combobox')[0];
fireEvent.change(targetCombobox, { target: { value: newBucketName } });
fireEvent.keyDown(targetCombobox, {
key: 'Enter',
code: 'Enter',
keyCode: 13,
});
await waitFor(() => {
expect(screen.getByLabelText(newBucketName)).toBeInTheDocument();
expect(screen.getByRole('button', { name: /save/i })).not.toHaveAttribute(
'aria-disabled',
'true',
);
});
fireEvent.click(screen.getByRole('button', { name: /save/i }));
await addBucket(user, newBucketName);
await user.click(await screen.findByTestId('cloud-service-save-btn'));
await waitFor(() => {
expect(capturedPayload).not.toBeNull();
@@ -172,13 +135,8 @@ describe('ServiceDetails for S3 Sync service', () => {
});
it('should not render S3 bucket region selector UI for services other than s3sync', async () => {
testServiceId = 'ec2';
testInitialBuckets = {};
renderServiceDetails({}, 'ec2');
await waitFor(() => {
expect(
screen.queryByText(/select s3 buckets by region/i),
).not.toBeInTheDocument();
});
renderServiceDetails('ec2');
await screen.findByTestId('markdown-renderer');
expect(screen.queryByTestId('s3-buckets-selector')).not.toBeInTheDocument();
});
});

View File

@@ -1,58 +1,66 @@
import { render, RenderResult, screen, waitFor } from '@testing-library/react';
import { render, RenderResult, screen, within } from 'tests/test-utils';
import { IntegrationType } from 'container/Integrations/types';
import MockQueryClientProvider from 'providers/test/MockQueryClientProvider';
import ServiceDetails from '../ServiceDetails/ServiceDetails';
import { accountsResponse } from './mockData';
import { accountsResponse, CLOUD_ACCOUNT_ID } from './mockData';
/**
* Renders ServiceDetails (inline config form). Tests must register MSW handlers
* for GET accounts and GET service details, and mock useUrlQuery (cloudAccountId, service).
* Renders ServiceDetails (inline config form) for the account and service in the
* URL. Tests must register MSW handlers for GET accounts and GET service details.
*/
const renderServiceDetails = (
_initialConfigLogsS3Buckets: Record<string, string[]> = {},
_serviceId = 's3sync',
serviceId = 's3sync',
type: IntegrationType = IntegrationType.AWS_SERVICES,
): RenderResult =>
render(
<MockQueryClientProvider>
<ServiceDetails type={type} />
</MockQueryClientProvider>,
);
render(<ServiceDetails type={type} />, undefined, {
initialRoute: `/?cloudAccountId=${CLOUD_ACCOUNT_ID}&service=${serviceId}`,
});
/**
* Asserts generic UI elements of the ServiceDetails config form (Overview tab).
*/
const assertGenericModalElements = async (): Promise<void> => {
await waitFor(() => {
expect(screen.getByRole('switch')).toBeInTheDocument();
expect(screen.getByText(/log collection/i)).toBeInTheDocument();
});
await expect(
screen.findByTestId('cloud-service-logs-switch'),
).resolves.toBeInTheDocument();
expect(screen.getByText(/log collection/i)).toBeInTheDocument();
};
/**
* Asserts S3 bucket selector section: title, region labels, and one combobox per region.
* Does not assert placeholder text (antd Select may not expose it as placeholder attribute).
* Asserts S3 bucket selector section: title, a select per account region, and
* the buckets already selected in each region.
*/
const assertS3SyncSpecificElements = async (
_expectedBucketsByRegion: Record<string, string[]> = {},
expectedBucketsByRegion: Record<string, string[]> = {},
): Promise<void> => {
const regions = accountsResponse.data.accounts[0]?.config?.aws?.regions || [];
await waitFor(() => {
expect(screen.getByText(/select s3 buckets by region/i)).toBeInTheDocument();
const selector = await screen.findByTestId('s3-buckets-selector');
expect(selector).toHaveTextContent(/select s3 buckets by region/i);
regions.forEach((region) => {
expect(screen.getByText(region)).toBeInTheDocument();
regions.forEach((region) => {
expect(selector).toHaveTextContent(region);
expect(screen.getByTestId(`s3-buckets-select-${region}`)).toBeInTheDocument();
});
Object.entries(expectedBucketsByRegion).forEach(([region, buckets]) => {
buckets.forEach((bucket) => {
expect(screen.getByTestId(`s3-buckets-select-${region}`)).toHaveTextContent(
bucket,
);
});
const comboboxes = screen.getAllByRole('combobox');
expect(comboboxes.length).toBeGreaterThanOrEqual(regions.length);
});
};
const bucketSelectInput = (region: string): HTMLElement =>
within(screen.getByTestId(`s3-buckets-select-${region}`)).getByRole(
'combobox',
{ hidden: true },
);
export {
assertGenericModalElements,
assertS3SyncSpecificElements,
bucketSelectInput,
renderServiceDetails,
};

View File

@@ -243,6 +243,7 @@ function CloudAccountSetupModal({
className="cloud-account-setup-form__form-item"
>
<Select
data-testid="azure-deployment-region-select"
placeholder="e.g. East US"
options={AZURE_REGIONS.map((region) => ({
label: `${region.label} (${region.value})`,
@@ -273,6 +274,7 @@ function CloudAccountSetupModal({
className="cloud-account-setup-form__form-item"
>
<Select
data-testid="azure-resource-groups-select"
mode="tags"
placeholder="e.g. prod-platform-rg"
tokenSeparators={[',']}

View File

@@ -1,5 +1,5 @@
import { ComponentProps } from 'react';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { render, screen, userEvent, waitFor, within } from 'tests/test-utils';
import { rest, server } from 'mocks-server/server';
import { RestRequest } from 'msw';
import type logEvent from '../../../../../api/common/logEvent';
@@ -14,9 +14,6 @@ jest.mock('../../../../../api/common/logEvent', () => ({
default: jest.fn() as jest.MockedFunction<typeof logEvent>,
}));
// The form flow drives antd selects and typing, which outruns the 5s default on CI.
jest.setTimeout(15_000);
type OnClose = ComponentProps<typeof CloudAccountSetupModal>['onClose'];
const mockOnClose = (): jest.MockedFunction<OnClose> =>
@@ -84,26 +81,35 @@ const mockApi = ({ failFirstPoll = false } = {}): {
return api;
};
type User = ReturnType<typeof userEvent.setup>;
const antdSelectInput = (testId: string): HTMLElement =>
within(screen.getByTestId(testId)).getByRole('combobox', { hidden: true });
const generateCommand = async (user: User): Promise<void> => {
await screen.findByTestId('azure-deployment-region-select');
await user.click(antdSelectInput('azure-deployment-region-select'));
await user.click(await screen.findByText('Australia East (australiaeast)'));
await user.click(antdSelectInput('azure-resource-groups-select'));
// antd reads the legacy keyCode on Enter, which user-event leaves at 0, so
// commit the tag with the select's comma separator instead.
await user.paste('prod-platform-rg,');
await user.click(screen.getByTestId('azure-generate-command-btn'));
await screen.findByTestId('azure-agent-command');
};
describe('Azure CloudAccountSetupModal', () => {
it('creates the account and shows its setup command', async () => {
const api = mockApi();
const user = userEvent.setup();
const onClose = mockOnClose();
render(<CloudAccountSetupModal onClose={onClose} />);
render(<CloudAccountSetupModal onClose={mockOnClose()} />);
const [region, resourceGroups] = await screen.findAllByRole('combobox');
await user.click(region);
await user.click(await screen.findByText('Australia East (australiaeast)'));
await user.type(resourceGroups, 'prod-platform-rg{Enter}');
await user.click(screen.getByTestId('azure-generate-command-btn'));
await waitFor(() => {
expect(screen.getByTestId('azure-agent-command')).toHaveTextContent(
cliCommand,
);
});
await generateCommand(user);
expect(screen.getByTestId('azure-agent-command')).toHaveTextContent(
cliCommand,
);
expect(api.createAccountPayload).toStrictEqual({
config: {
azure: {
@@ -116,10 +122,25 @@ describe('Azure CloudAccountSetupModal', () => {
expect(
screen.queryByTestId('azure-generate-command-btn'),
).not.toBeInTheDocument();
expect(screen.queryAllByRole('combobox')).toHaveLength(0);
expect(
screen.queryByTestId('azure-deployment-region-select'),
).not.toBeInTheDocument();
expect(
screen.queryByTestId('azure-resource-groups-select'),
).not.toBeInTheDocument();
expect(
screen.getByText(/waiting for azure account connection/i),
).toBeInTheDocument();
});
it('asks before closing once a setup command exists', async () => {
mockApi();
const user = userEvent.setup();
const onClose = mockOnClose();
render(<CloudAccountSetupModal onClose={onClose} />);
await generateCommand(user);
await user.click(screen.getByTestId('azure-cancel-btn'));
await user.click(await screen.findByTestId('azure-continue-setup-btn'));
@@ -154,11 +175,7 @@ describe('Azure CloudAccountSetupModal', () => {
render(<CloudAccountSetupModal onClose={mockOnClose()} />);
const [region, resourceGroups] = await screen.findAllByRole('combobox');
await user.click(region);
await user.click(await screen.findByText('Australia East (australiaeast)'));
await user.type(resourceGroups, 'prod-platform-rg{Enter}');
await user.click(screen.getByTestId('azure-generate-command-btn'));
await generateCommand(user);
await user.click(await screen.findByTestId('azure-check-connection-btn'));

View File

@@ -52,12 +52,13 @@ export const fillAgentForm = async (
user: ReturnType<typeof userEvent.setup>,
): Promise<void> => {
await waitFor(() => {
expect(screen.getByTestId('gcp-generate-command-btn')).toBeEnabled();
expect(screen.getByTestId('gcp-generate-command-btn')).not.toHaveAttribute(
'aria-disabled',
'true',
);
});
await user.type(
screen.getByTestId('gcp-deployment-project-id-input'),
DEPLOYMENT_PROJECT_ID,
);
await user.click(screen.getByTestId('gcp-deployment-project-id-input'));
await user.paste(DEPLOYMENT_PROJECT_ID);
await user.click(screen.getByTestId('gcp-deployment-region-select'));
await user.click(await screen.findByText('Mumbai (asia-south1)'));
};

View File

@@ -31,6 +31,7 @@ function ConnectionMethodSelector({
<RadioGroup
color="primary"
textOverflow="wrap"
testId="gcp-connection-method"
value={value}
onChange={(next): void =>
onChange(next as CloudintegrationtypesGCPConnectionMethodDTO)

View File

@@ -30,19 +30,6 @@ jest.mock('@signozhq/ui/sonner', () => ({
},
}));
// jsdom has no layout, and Floating UI's getComputedStyle walk over every
// popover ancestor costs ~1 s per open here, enough to time out under load.
jest.mock('@floating-ui/dom', () => ({
...jest.requireActual('@floating-ui/dom'),
autoUpdate: (): (() => void) => (): void => {},
computePosition: (
_reference: unknown,
_floating: unknown,
{ placement = 'bottom', strategy = 'absolute' } = {},
): Promise<unknown> =>
Promise.resolve({ x: 0, y: 0, placement, strategy, middlewareData: {} }),
}));
type AccountSettingsDrawerProps = ComponentProps<typeof AccountSettingsDrawer>;
const onClose = jest.fn() as jest.MockedFunction<

View File

@@ -107,11 +107,15 @@ describe('GCP CloudAccountSetupDrawer', () => {
});
it('creates the account, checks the agent in, and closes the drawer', async () => {
// A slow check-in keeps the connection in flight long enough to observe it.
let releaseCheckIn = (): void => {};
const checkInHeld = new Promise<void>((resolve) => {
releaseCheckIn = resolve;
});
server.use(
rest.post(GCP_CHECK_IN_URL, async (req: RestRequest, res, ctx) => {
checkInPayload = await req.json();
return res(ctx.delay(300), ctx.status(200), ctx.json(checkInResponse));
await checkInHeld;
return res(ctx.status(200), ctx.json(checkInResponse));
}),
);
const user = userEvent.setup();
@@ -141,7 +145,7 @@ describe('GCP CloudAccountSetupDrawer', () => {
// Switching away mid-request would let its success close the other form.
await waitFor(() => {
expect(screen.getByRole('radiogroup')).toHaveAttribute(
expect(screen.getByTestId('gcp-connection-method')).toHaveAttribute(
'aria-disabled',
'true',
);
@@ -171,11 +175,14 @@ describe('GCP CloudAccountSetupDrawer', () => {
data: {},
});
});
expect(onClose).not.toHaveBeenCalled();
releaseCheckIn();
await waitFor(() => {
expect(onClose).toHaveBeenCalledTimes(1);
});
}, 15000);
});
it('shows the backend error inline when account creation fails', async () => {
server.use(
@@ -218,5 +225,5 @@ describe('GCP CloudAccountSetupDrawer', () => {
});
expect(checkInPayload).toBeNull();
expect(onClose).not.toHaveBeenCalled();
}, 15000);
});
});

View File

@@ -20,7 +20,11 @@ function AttributeMappingsTab({
return (
<div data-testid="attribute-mappings-tab">
{editor.isError ? (
<div className={styles.pageError} role="alert">
<div
className={styles.pageError}
role="alert"
data-testid="mapping-groups-error"
>
Failed to load mapping groups. Please try again.
</div>
) : (

View File

@@ -129,7 +129,7 @@ describe('AttributeMappingsTab (integration)', () => {
await waitFor(() =>
expect(screen.getByTestId('group-name-group-1')).toBeInTheDocument(),
);
expect(screen.queryByRole('alert')).not.toBeInTheDocument();
expect(screen.queryByTestId('mapping-groups-error')).not.toBeInTheDocument();
});
it('shows an error banner when the groups request fails', async () => {
@@ -138,7 +138,9 @@ describe('AttributeMappingsTab (integration)', () => {
);
render(<AttributeMappingsTabWithStore />);
await expect(screen.findByRole('alert')).resolves.toHaveTextContent(
await expect(
screen.findByTestId('mapping-groups-error'),
).resolves.toHaveTextContent(
'Failed to load mapping groups. Please try again.',
);
});
@@ -177,7 +179,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it("stages a toggle of the group's enabled state via the header switch", async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
render(<AttributeMappingsTabWithStore />);
@@ -189,7 +191,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('invokes onAddGroup from the toolbar button', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const onAddGroup = jest.fn();
setupGroups();
render(<AttributeMappingsTabWithStore onAddGroup={onAddGroup} />);
@@ -201,14 +203,16 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('invokes onEditGroup with the group when Edit is chosen from the actions menu', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const onEditGroup = jest.fn();
setupGroups();
render(<AttributeMappingsTabWithStore onEditGroup={onEditGroup} />);
await screen.findByTestId('group-name-group-1');
await openGroupActionsMenu(user, 'group-1');
await user.click(await screen.findByRole('menuitem', { name: 'Edit' }));
await user.click(
await screen.findByTestId('group-actions-group-1-item-edit'),
);
expect(onEditGroup).toHaveBeenCalledTimes(1);
expect(onEditGroup.mock.calls[0][0]).toMatchObject({
@@ -218,13 +222,15 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('stages a group removal when Delete is chosen from the actions menu', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
render(<AttributeMappingsTabWithStore />);
await screen.findByTestId('group-name-group-1');
await openGroupActionsMenu(user, 'group-1');
await user.click(await screen.findByRole('menuitem', { name: 'Delete' }));
await user.click(
await screen.findByTestId('group-actions-group-1-item-delete'),
);
await waitFor(() =>
expect(screen.queryByTestId('group-name-group-1')).not.toBeInTheDocument(),
@@ -233,7 +239,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it("reveals a group's mappers on expand and hides them on collapse", async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
setupMappers([makeMapper({ id: 'mapper-1' })]);
render(<AttributeMappingsTabWithStore />);
@@ -261,7 +267,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it("lazily fetches and renders a group's mappers on first expand", async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
setupMappers([
makeMapper({ id: 'mapper-1', name: 'gen_ai.request.model', enabled: true }),
@@ -290,7 +296,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('shows the mappers error state when the mappers request fails', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
server.use(
rest.get(mappersEndpoint('group-1'), (_req, res, ctx) =>
@@ -308,7 +314,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('shows the mappers empty state when a group has no mappers', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
setupMappers([]);
render(<AttributeMappingsTabWithStore />);
@@ -322,7 +328,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('collapses extra mapper sources into a "+N more" label beyond the visible cap', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
setupMappers([
makeMapper({
@@ -347,7 +353,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('shows a muted placeholder when a mapper has no sources', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
setupMappers([makeMapper({ id: 'mapper-1', config: { sources: [] } })]);
render(<AttributeMappingsTabWithStore />);
@@ -361,7 +367,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it("re-fetches an open group's mappers on save instead of showing stale rows", async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
let mappers = mockMappers;
@@ -394,7 +400,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('warns and keeps the working copy when the post-save refresh fails', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
(toast.success as jest.Mock).mockClear();
(toast.warning as jest.Mock).mockClear();
@@ -438,7 +444,7 @@ describe('AttributeMappingsTab (integration)', () => {
}
it('opens the add-mapping drawer from a group\'s "Add mapping" button', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
await openGroupWithMapper(user);
expect(screen.queryByTestId('mapper-form-drawer')).not.toBeInTheDocument();
@@ -451,11 +457,13 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('opens the edit drawer prefilled and locks the target attribute', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
await openGroupWithMapper(user);
await user.click(screen.getByRole('button', { name: 'Mapping actions' }));
await user.click(await screen.findByRole('menuitem', { name: 'Edit' }));
await user.click(screen.getByTestId('mapper-actions-mapper-1'));
await user.click(
await screen.findByTestId('mapper-actions-mapper-1-item-edit'),
);
await expect(
screen.findByTestId('mapper-form-drawer'),
@@ -467,7 +475,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it("toggles a mapper's enabled state through the store", async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
await openGroupWithMapper(user);
const toggle = screen.getByTestId('mapper-enabled-mapper-1');
@@ -481,11 +489,13 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('removes a mapper via the row action menu', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
await openGroupWithMapper(user);
await user.click(screen.getByRole('button', { name: 'Mapping actions' }));
await user.click(await screen.findByRole('menuitem', { name: 'Delete' }));
await user.click(screen.getByTestId('mapper-actions-mapper-1'));
await user.click(
await screen.findByTestId('mapper-actions-mapper-1-item-delete'),
);
await waitFor(() =>
expect(
@@ -496,7 +506,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('creates a new mapping through the drawer and appends it to the group', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
await openGroupWithMapper(user);
await user.click(screen.getByTestId('add-mapper-group-1'));
@@ -507,11 +517,10 @@ describe('AttributeMappingsTab (integration)', () => {
'true',
);
await user.type(
screen.getByTestId('mapper-form-target'),
'gen_ai.response.model',
);
await user.type(screen.getByTestId('mapper-form-source-0'), 'raw.model');
await user.click(screen.getByTestId('mapper-form-target'));
await user.paste('gen_ai.response.model');
await user.click(screen.getByTestId('mapper-form-source-0'));
await user.paste('raw.model');
const create = screen.getByTestId('mapper-form-save');
await waitFor(() =>
@@ -558,7 +567,7 @@ describe('AttributeMappingsTab (integration)', () => {
});
it('renders mappers read-only: no "Add mapping" button or row actions', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
setupGroups();
setupMappers([makeMapper({ id: 'mapper-1', name: 'gen_ai.request.model' })]);
render(<AttributeMappingsTabWithStore />);
@@ -574,7 +583,7 @@ describe('AttributeMappingsTab (integration)', () => {
screen.queryByTestId('mapper-enabled-mapper-1'),
).not.toBeInTheDocument();
expect(
screen.queryByRole('button', { name: 'Mapping actions' }),
screen.queryByTestId('mapper-actions-mapper-1'),
).not.toBeInTheDocument();
});
});

View File

@@ -38,7 +38,13 @@ function GroupActionsMenu({
);
return (
<Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Dropdown
items={menuItems}
nativeButton
align="end"
side="bottom"
testId={`group-actions-${group.localId}`}
>
<Button
variant="ghost"
color="secondary"

View File

@@ -38,7 +38,13 @@ function MapperActionsMenu({
);
return (
<Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Dropdown
items={menuItems}
nativeButton
align="end"
side="bottom"
testId={`mapper-actions-${mapper.localId}`}
>
<Button
variant="ghost"
color="secondary"

View File

@@ -5,7 +5,7 @@ import set from 'api/browser/localstorage/set';
import { LOCALSTORAGE } from 'constants/localStorage';
import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
import { mockUseAuthZGrantAll } from 'lib/authz/utils/authz-test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { act, render, screen, userEvent, waitFor } from 'tests/test-utils';
jest.mock('@monaco-editor/react', () => ({
__esModule: true,
@@ -28,8 +28,10 @@ jest.mock('@monaco-editor/react', () => ({
jest.mock('lib/authz/hooks/useAuthZ/useAuthZ');
const mockedUseAuthZ = useAuthZ as jest.MockedFunction<typeof useAuthZ>;
import LLMObservabilityAttributeMapping from '../../LLMObservabilityAttributeMapping';
import { useAttributeMappingEditor } from '../../hooks/useAttributeMappingEditor';
import { SAMPLE_SPAN_JSON } from '../spanInputStorage';
import TestTab from '../TestTab';
import { useTestSpanMapper } from '../useTestSpanMapper';
import {
GROUPS_ENDPOINT,
makeGroupsResponse,
@@ -85,6 +87,12 @@ const EXTRA_KEY_RESULT_SPAN = {
const SPAN_INPUT_KEY = LOCALSTORAGE.LLM_ATTRIBUTE_MAPPING_TEST_SPAN;
function TestTabWithEditor(): JSX.Element {
const editor = useAttributeMappingEditor();
const spanTest = useTestSpanMapper(editor.snapshot, editor.groups);
return <TestTab spanTest={spanTest} />;
}
describe('TestTab — sample-span flow', () => {
beforeEach(() => {
window.history.pushState(null, '', '/');
@@ -97,17 +105,20 @@ describe('TestTab — sample-span flow', () => {
mockedUseAuthZ.mockImplementation(mockUseAuthZGrantAll);
});
afterEach(() => {
jest.useRealTimers();
});
it('runs the sample span through the mappers and renders the populated result', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(TEST_ENDPOINT, (_req, res, ctx) =>
res(ctx.status(200), ctx.json(makeTestResponse([RESULT_SPAN]))),
),
);
render(<LLMObservabilityAttributeMapping />);
render(<TestTabWithEditor />);
await user.click(screen.getByRole('tab', { name: 'Test' }));
const runBtn = await screen.findByTestId('run-test-button');
expect(screen.getByTestId('test-results-placeholder')).toBeInTheDocument();
@@ -125,7 +136,7 @@ describe('TestTab — sample-span flow', () => {
});
it('trims extra top-level keys and sends only the envelope', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
let body: { spans?: { attributes?: Record<string, unknown> }[] } | undefined;
server.use(
rest.post(TEST_ENDPOINT, async (req, res, ctx) => {
@@ -137,9 +148,8 @@ describe('TestTab — sample-span flow', () => {
}),
);
render(<LLMObservabilityAttributeMapping />);
render(<TestTabWithEditor />);
await user.click(screen.getByRole('tab', { name: 'Test' }));
const runBtn = await screen.findByTestId('run-test-button');
await user.clear(screen.getByTestId('monaco'));
@@ -166,7 +176,7 @@ describe('TestTab — sample-span flow', () => {
});
it('surfaces a backend error and renders no results', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(TEST_ENDPOINT, (_req, res, ctx) =>
res(
@@ -176,9 +186,8 @@ describe('TestTab — sample-span flow', () => {
),
);
render(<LLMObservabilityAttributeMapping />);
render(<TestTabWithEditor />);
await user.click(screen.getByRole('tab', { name: 'Test' }));
await user.click(await screen.findByTestId('run-test-button'));
await expect(screen.findByTestId('test-error')).resolves.toHaveTextContent(
@@ -188,37 +197,38 @@ describe('TestTab — sample-span flow', () => {
});
it('persists an edited span to local storage and restores it on remount', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const { unmount } = render(<LLMObservabilityAttributeMapping />);
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
const { unmount } = render(<TestTabWithEditor />);
await user.click(screen.getByRole('tab', { name: 'Test' }));
await screen.findByTestId('run-test-button');
const editor = screen.getByTestId('monaco');
const editor = await screen.findByTestId('monaco');
expect(editor).toHaveValue(SAMPLE_SPAN_JSON);
await user.clear(editor);
await user.paste(EDITED_SPAN_JSON);
expect(get(SPAN_INPUT_KEY)).toBeFalsy();
await waitFor(() => expect(get(SPAN_INPUT_KEY)).toBe(EDITED_SPAN_JSON), {
timeout: 2000,
act(() => {
jest.advanceTimersByTime(500);
});
expect(get(SPAN_INPUT_KEY)).toBe(EDITED_SPAN_JSON);
unmount();
render(<LLMObservabilityAttributeMapping />);
render(<TestTabWithEditor />);
await user.click(screen.getByRole('tab', { name: 'Test' }));
await screen.findByTestId('run-test-button');
expect(screen.getByTestId('monaco')).toHaveValue(EDITED_SPAN_JSON);
await expect(screen.findByTestId('monaco')).resolves.toHaveValue(
EDITED_SPAN_JSON,
);
});
it('resets to the sample span and clears the persisted input', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
set(SPAN_INPUT_KEY, EDITED_SPAN_JSON);
render(<LLMObservabilityAttributeMapping />);
render(<TestTabWithEditor />);
await user.click(screen.getByRole('tab', { name: 'Test' }));
const resetBtn = await screen.findByTestId('reset-template-button');
expect(screen.getByTestId('monaco')).toHaveValue(EDITED_SPAN_JSON);

View File

@@ -75,7 +75,7 @@ describe('AI observability Explorer', () => {
});
it('clears the url columns of the panel being left', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const traceColumns = [{ name: 'span_count' }];
localStorage.setItem(
LOCALSTORAGE.AI_OBSERVABILITY_PANEL_COLUMNS,
@@ -104,5 +104,5 @@ describe('AI observability Explorer', () => {
...defaultOptionsQuery,
selectColumns: [],
});
}, 15_000);
});
});

View File

@@ -1,65 +1,64 @@
import userEvent from '@testing-library/user-event';
import { logEventMock } from '__tests__/logEventMock';
import { safeNavigateMock } from '__tests__/safeNavigateMock';
import { ActionsMenu } from 'container/ListAlertRules/components';
import type { AlertRule } from 'container/ListAlertRules/types';
import { useAlertRulesHandlers } from 'container/ListAlertRules/useAlertRulesHandlers';
import { server } from 'mocks-server/server';
import { alertRulesFixture } from 'mocks-server/__mockdata__/alert_rules';
import { rest } from 'msw';
import { screen, waitFor } from 'tests/test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { findAlertRow, renderListAlertRules } from './_helpers';
const [HIGH_CPU_RULE, , , DISABLED_RULE] = alertRulesFixture;
async function openActionsMenu(row: HTMLElement): Promise<void> {
const trigger = row.querySelector(
'[data-testid="alert-actions"]',
) as HTMLElement | null;
expect(trigger).not.toBeNull();
const user = userEvent.setup({ delay: null });
await user.click(trigger as HTMLElement);
// Radix renders the menu items in a portal once the trigger is activated.
await screen.findByRole('menu');
function ActionsMenuWithHandlers({ rule }: { rule: AlertRule }): JSX.Element {
const { handleEdit } = useAlertRulesHandlers(alertRulesFixture.length);
return <ActionsMenu rule={rule} onEdit={handleEdit} />;
}
async function clickMenuItem(label: string): Promise<void> {
const user = userEvent.setup({ delay: null });
const item = await screen.findByRole('menuitem', { name: label });
await user.click(item);
async function openActionsMenu(
user: ReturnType<typeof userEvent.setup>,
rule: AlertRule = HIGH_CPU_RULE,
): Promise<void> {
render(<ActionsMenuWithHandlers rule={rule} />);
await user.click(screen.getByTestId('alert-actions'));
await screen.findByTestId('alert-actions-item-edit');
}
describe('ListAlertRules — actions menu', () => {
beforeEach(() => {
jest.setSystemTime(new Date('2023-10-20T12:00:00Z'));
});
it('renders Enable/Disable/Edit/Edit in New Tab/Clone/Delete items after opening the menu', async () => {
renderListAlertRules();
const row = await findAlertRow('High CPU Alert');
const user = userEvent.setup();
render(<ActionsMenuWithHandlers rule={HIGH_CPU_RULE} />);
expect(screen.queryByRole('menu')).not.toBeInTheDocument();
expect(
screen.queryByTestId('alert-actions-item-edit'),
).not.toBeInTheDocument();
await openActionsMenu(row);
await user.click(screen.getByTestId('alert-actions'));
const items = screen.getAllByRole('menuitem');
const labels = items.map((it) => it.textContent);
expect(labels).toStrictEqual(
expect.arrayContaining([
'Edit',
'Edit in New Tab',
'Clone',
'Delete',
'Disable',
]),
await expect(
screen.findByTestId('alert-actions-item-toggle'),
).resolves.toHaveTextContent(/^Disable$/);
expect(screen.getByTestId('alert-actions-item-edit')).toHaveTextContent(
/^Edit$/,
);
expect(
screen.getByTestId('alert-actions-item-edit-new-tab'),
).toHaveTextContent(/^Edit in New Tab$/);
expect(screen.getByTestId('alert-actions-item-clone')).toHaveTextContent(
/^Clone$/,
);
expect(screen.getByTestId('alert-actions-item-delete')).toHaveTextContent(
/^Delete$/,
);
});
it('disabled rule (rule-4) shows "Enable" instead of "Disable"', async () => {
renderListAlertRules();
const row = await findAlertRow('Disabled Alert');
await openActionsMenu(row);
const user = userEvent.setup();
await openActionsMenu(user, DISABLED_RULE);
const items = screen.getAllByRole('menuitem');
const labels = items.map((it) => it.textContent);
expect(labels).toContain('Enable');
expect(labels).not.toContain('Disable');
expect(screen.getByTestId('alert-actions-item-toggle')).toHaveTextContent(
/^Enable$/,
);
});
it('toggle action: clicking Disable sends PATCH with disabled:true', async () => {
@@ -73,10 +72,9 @@ describe('ListAlertRules — actions menu', () => {
}),
);
renderListAlertRules();
const row = await findAlertRow('High CPU Alert');
await openActionsMenu(row);
await clickMenuItem('Disable');
const user = userEvent.setup();
await openActionsMenu(user);
await user.click(screen.getByTestId('alert-actions-item-toggle'));
await waitFor(() => {
expect(capturedBody).toStrictEqual(
@@ -92,10 +90,9 @@ describe('ListAlertRules — actions menu', () => {
});
it('edit action: clicking Edit navigates via safeNavigate and logs event', async () => {
renderListAlertRules();
const row = await findAlertRow('High CPU Alert');
await openActionsMenu(row);
await clickMenuItem('Edit');
const user = userEvent.setup();
await openActionsMenu(user);
await user.click(screen.getByTestId('alert-actions-item-edit'));
await waitFor(() => {
expect(safeNavigateMock).toHaveBeenCalled();
@@ -109,10 +106,9 @@ describe('ListAlertRules — actions menu', () => {
});
it('edit in new tab action: clicking opens with newTab:true', async () => {
renderListAlertRules();
const row = await findAlertRow('High CPU Alert');
await openActionsMenu(row);
await clickMenuItem('Edit in New Tab');
const user = userEvent.setup();
await openActionsMenu(user);
await user.click(screen.getByTestId('alert-actions-item-edit-new-tab'));
await waitFor(() => {
expect(safeNavigateMock).toHaveBeenCalled();
@@ -133,7 +129,7 @@ describe('ListAlertRules — actions menu', () => {
ctx.status(201),
ctx.json({
data: {
...alertRulesFixture[0],
...HIGH_CPU_RULE,
id: 'cloned-from-server',
alert: 'High CPU Alert - Copy',
},
@@ -144,10 +140,9 @@ describe('ListAlertRules — actions menu', () => {
),
);
renderListAlertRules();
const row = await findAlertRow('High CPU Alert');
await openActionsMenu(row);
await clickMenuItem('Clone');
const user = userEvent.setup();
await openActionsMenu(user);
await user.click(screen.getByTestId('alert-actions-item-clone'));
await waitFor(() => {
expect(capturedRuleId).toBe('rule-1');
@@ -177,10 +172,9 @@ describe('ListAlertRules — actions menu', () => {
}),
);
renderListAlertRules();
const row = await findAlertRow('High CPU Alert');
await openActionsMenu(row);
await clickMenuItem('Delete');
const user = userEvent.setup();
await openActionsMenu(user);
await user.click(screen.getByTestId('alert-actions-item-delete'));
await waitFor(() => {
expect(deletedId).toBe('rule-1');
@@ -201,10 +195,9 @@ describe('ListAlertRules — actions menu', () => {
}),
);
renderListAlertRules();
const row = await findAlertRow('High CPU Alert');
await openActionsMenu(row);
await clickMenuItem('Disable');
const user = userEvent.setup();
await openActionsMenu(user);
await user.click(screen.getByTestId('alert-actions-item-toggle'));
await waitFor(() => {
expect(patchAttempted).toBe(true);

View File

@@ -1,4 +1,4 @@
import { screen, waitFor } from 'tests/test-utils';
import { screen } from 'tests/test-utils';
import { renderListAlertRules } from './_helpers';
@@ -27,9 +27,7 @@ describe('ListAlertRules — list rendering', () => {
it('renders state badges via STATE_CONFIG mapping', async () => {
renderListAlertRules();
await waitFor(() =>
expect(screen.getByTestId('alert-row-rule-1-state')).toBeInTheDocument(),
);
await screen.findByTestId('alert-row-rule-1-state');
expect(screen.getByTestId('alert-row-rule-1-state')).toHaveTextContent(
'Firing',
@@ -47,9 +45,7 @@ describe('ListAlertRules — list rendering', () => {
it('renders state badges with semantic colors', async () => {
renderListAlertRules();
await waitFor(() =>
expect(screen.getByTestId('alert-row-rule-1-state')).toBeInTheDocument(),
);
await screen.findByTestId('alert-row-rule-1-state');
expect(screen.getByTestId('alert-row-rule-1-state')).toHaveAttribute(
'data-color',
@@ -72,9 +68,7 @@ describe('ListAlertRules — list rendering', () => {
it('renders severity badges for rules with severity', async () => {
renderListAlertRules();
await waitFor(() =>
expect(screen.getByTestId('alert-row-rule-1-severity')).toBeInTheDocument(),
);
await screen.findByTestId('alert-row-rule-1-severity');
expect(screen.getByTestId('alert-row-rule-1-severity')).toHaveTextContent(
'critical',
@@ -104,9 +98,7 @@ describe('ListAlertRules — list rendering', () => {
it('renders header controls (search, states, columns, new alert)', async () => {
renderListAlertRules();
await waitFor(() =>
expect(screen.getByTestId('alert-row-rule-1-name')).toBeInTheDocument(),
);
await screen.findByTestId('alert-row-rule-1-name');
expect(screen.getByTestId('alert-rules-list-search')).toBeInTheDocument();
expect(
@@ -114,11 +106,8 @@ describe('ListAlertRules — list rendering', () => {
).toBeInTheDocument();
expect(screen.getByTestId('alert-rules-filter-states')).toBeInTheDocument();
expect(screen.getByTestId('alert-columns-button')).toBeInTheDocument();
expect(
screen.getByTestId('list-alerts-new-alert-button'),
).toBeInTheDocument();
expect(
screen.getByRole('button', { name: /new alert/i }),
).toBeInTheDocument();
expect(screen.getByTestId('list-alerts-new-alert-button')).toHaveTextContent(
'New Alert',
);
});
});

View File

@@ -1,27 +1,29 @@
import { logEventMock } from '__tests__/logEventMock';
import { safeNavigateMock } from '__tests__/safeNavigateMock';
import userEvent from '@testing-library/user-event';
import ROUTES from 'constants/routes';
import { screen, waitFor } from 'tests/test-utils';
import AlertRulesHeaderActions from 'container/ListAlertRules/components/AlertRulesHeaderActions';
import { useAlertRulesHandlers } from 'container/ListAlertRules/useAlertRulesHandlers';
import { alertRulesFixture } from 'mocks-server/__mockdata__/alert_rules';
import { render, screen, userEvent } from 'tests/test-utils';
import { renderListAlertRules } from './_helpers';
function HeaderActionsWithHandlers(): JSX.Element {
const { handleNewAlert } = useAlertRulesHandlers(alertRulesFixture.length);
return (
<AlertRulesHeaderActions
columns={[]}
canAddAlert
onNewAlert={handleNewAlert}
/>
);
}
describe('ListAlertRules — new alert button', () => {
beforeEach(() => {
jest.setSystemTime(new Date('2023-10-20T12:00:00Z'));
});
it('plain click navigates to ALERTS_NEW with newTab:false', async () => {
const user = userEvent.setup({ delay: null });
renderListAlertRules();
const user = userEvent.setup();
render(<HeaderActionsWithHandlers />);
await screen.findByText('High CPU Alert');
await user.click(screen.getByTestId('list-alerts-new-alert-button'));
await user.click(screen.getByRole('button', { name: /new alert/i }));
await waitFor(() => {
expect(safeNavigateMock).toHaveBeenCalled();
});
expect(safeNavigateMock).toHaveBeenCalledWith(
ROUTES.ALERTS_NEW,
expect.objectContaining({ newTab: false }),
@@ -29,34 +31,28 @@ describe('ListAlertRules — new alert button', () => {
});
it('logs Alert: New alert button clicked', async () => {
const user = userEvent.setup({ delay: null });
renderListAlertRules();
const user = userEvent.setup();
render(<HeaderActionsWithHandlers />);
await screen.findByText('High CPU Alert');
await user.click(screen.getByTestId('list-alerts-new-alert-button'));
await user.click(screen.getByRole('button', { name: /new alert/i }));
await waitFor(() => {
expect(logEventMock).toHaveBeenCalledWith(
'Alert: New alert button clicked',
expect.objectContaining({ layout: 'new' }),
);
});
expect(logEventMock).toHaveBeenCalledWith(
'Alert: New alert button clicked',
expect.objectContaining({
layout: 'new',
number: alertRulesFixture.length,
}),
);
});
it('ctrl+click on New Alert opens in a new tab (newTab:true)', async () => {
const user = userEvent.setup({ delay: null });
renderListAlertRules();
await screen.findByText('High CPU Alert');
const user = userEvent.setup();
render(<HeaderActionsWithHandlers />);
await user.keyboard('{Control>}');
await user.click(screen.getByRole('button', { name: /new alert/i }));
await user.click(screen.getByTestId('list-alerts-new-alert-button'));
await user.keyboard('{/Control}');
await waitFor(() => {
expect(safeNavigateMock).toHaveBeenCalled();
});
expect(safeNavigateMock).toHaveBeenCalledWith(
ROUTES.ALERTS_NEW,
expect.objectContaining({ newTab: true }),

View File

@@ -1,8 +1,15 @@
import { screen, waitFor } from 'tests/test-utils';
import { alertRulesFixture } from 'mocks-server/__mockdata__/alert_rules';
import { screen } from 'tests/test-utils';
import { USER_ROLES } from 'types/roles';
import { renderListAlertRules } from './_helpers';
function headerTexts(): string[] {
return Array.from(document.querySelectorAll('th')).map(
(h) => h.textContent ?? '',
);
}
describe('ListAlertRules — permissions', () => {
beforeEach(() => {
jest.setSystemTime(new Date('2023-10-20T12:00:00Z'));
@@ -11,61 +18,29 @@ describe('ListAlertRules — permissions', () => {
it('VIEWER role hides "New Alert" button and "Actions" column', async () => {
renderListAlertRules({ role: USER_ROLES.VIEWER });
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
expect(
screen.queryByTestId('list-alerts-new-alert-button'),
).not.toBeInTheDocument();
expect(
screen.queryByRole('button', { name: /new alert/i }),
).not.toBeInTheDocument();
expect(screen.queryByText('New Alert')).not.toBeInTheDocument();
const headers = Array.from(document.querySelectorAll('th')).map(
(h) => h.textContent ?? '',
);
expect(headers.some((t) => t.includes('Actions'))).toBe(false);
expect(headerTexts().some((t) => t.includes('Actions'))).toBe(false);
expect(screen.queryByTestId('alert-actions')).not.toBeInTheDocument();
});
it('ADMIN role shows "New Alert" button and "Actions" column', async () => {
renderListAlertRules({ role: USER_ROLES.ADMIN });
it.each([USER_ROLES.ADMIN, USER_ROLES.EDITOR])(
'%s role shows "New Alert" button and "Actions" column',
async (role) => {
renderListAlertRules({ role });
await screen.findByText('High CPU Alert');
expect(
screen.getByTestId('list-alerts-new-alert-button'),
).toBeInTheDocument();
expect(
screen.getByRole('button', { name: /new alert/i }),
).toBeInTheDocument();
await waitFor(() => {
const headers = Array.from(document.querySelectorAll('th')).map(
(h) => h.textContent ?? '',
await expect(screen.findAllByTestId('alert-actions')).resolves.toHaveLength(
alertRulesFixture.length,
);
expect(headers.some((t) => t.includes('Actions'))).toBe(true);
});
expect(screen.getAllByTestId('alert-actions').length).toBeGreaterThan(0);
});
it('EDITOR role behaves like ADMIN (New Alert + Actions visible)', async () => {
renderListAlertRules({ role: USER_ROLES.EDITOR });
await screen.findByText('High CPU Alert');
expect(
screen.getByTestId('list-alerts-new-alert-button'),
).toBeInTheDocument();
expect(
screen.getByRole('button', { name: /new alert/i }),
).toBeInTheDocument();
await waitFor(() => {
const headers = Array.from(document.querySelectorAll('th')).map(
(h) => h.textContent ?? '',
expect(screen.getByTestId('list-alerts-new-alert-button')).toHaveTextContent(
'New Alert',
);
expect(headers.some((t) => t.includes('Actions'))).toBe(true);
});
expect(screen.getAllByTestId('alert-actions').length).toBeGreaterThan(0);
});
expect(headerTexts().some((t) => t.includes('Actions'))).toBe(true);
},
);
});

View File

@@ -41,10 +41,10 @@ describe('ListAlertRules — search', () => {
});
it('sends the draft query only when Run is clicked', async () => {
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
setSearchDraft(QUERY);
@@ -68,10 +68,10 @@ describe('ListAlertRules — search', () => {
});
it('runs the draft on Mod-Enter', async () => {
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
setSearchDraft(QUERY);
const content = screen
@@ -89,10 +89,10 @@ describe('ListAlertRules — search', () => {
});
it('trims the submitted query', async () => {
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
await runSearchQuery(user, ` ${QUERY} `);
@@ -107,14 +107,14 @@ describe('ListAlertRules — search', () => {
initialRoute: `/?query=${encodeURIComponent(QUERY)}`,
});
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
expect(getSearchDraft()).toBe(QUERY);
expect(requests[0].get('query')).toBe(QUERY);
});
it('resets page to 1 when a query is run', async () => {
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
renderListAlertRules({ initialRoute: '/?page=2' });
await screen.findByTestId('alert-rules-list-search');
@@ -130,23 +130,22 @@ describe('ListAlertRules — search', () => {
});
it('sends the selected states once, as repeated states= params, when the dropdown closes', async () => {
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
await user.click(
within(screen.getByTestId('alert-rules-filter-states')).getByRole(
'combobox',
),
screen
.getByTestId('alert-rules-filter-states')
.querySelector('input') as HTMLInputElement,
);
await user.click(
await screen.findByTestId('alert-rules-filter-states-option-firing'),
);
await user.click(
screen.getByTestId('alert-rules-filter-states-option-disabled'),
);
const dropdown = await waitFor(() => {
const element = document.querySelector<HTMLElement>('.ant-select-dropdown');
expect(element).not.toBeNull();
return element as HTMLElement;
});
await user.click(within(dropdown).getByText('Firing'));
await user.click(within(dropdown).getByText('Disabled'));
expect(requests.some((r) => r.has('states'))).toBe(false);
expect(getCurrentNuqsSearchParams().has('states')).toBe(false);
@@ -164,15 +163,15 @@ describe('ListAlertRules — search', () => {
await waitFor(() => {
expect(getCurrentNuqsSearchParams().get('states')).toBe('firing,disabled');
});
}, 15_000);
});
it('Clear empties the query and the states', async () => {
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
renderListAlertRules({
initialRoute: `/?query=${encodeURIComponent(QUERY)}&states=firing`,
});
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
expect(lastRequest(requests).get('query')).toBe(QUERY);
await user.click(screen.getByTestId('alert-rules-filter-clear'));
@@ -196,7 +195,7 @@ describe('ListAlertRules — search', () => {
it.each(['rule_list_filter_invalid', 'rule_list_invalid'])(
'shows the backend message and no-results state for %s',
async (code) => {
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
server.use(
rest.get('http://localhost/api/v3/rules', (req, res, ctx) => {
if (req.url.searchParams.has('query')) {
@@ -214,7 +213,7 @@ describe('ListAlertRules — search', () => {
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
await runSearchQuery(user, "nme = 'x'");

View File

@@ -18,23 +18,17 @@ import {
import { renderListAlertRules, runSearchQuery } from './_helpers';
// jsdom has no layout, and Floating UI's getComputedStyle walk over every
// popover ancestor costs ~1 s per open here, enough to time out under load.
jest.mock('@floating-ui/dom', () => ({
...jest.requireActual('@floating-ui/dom'),
autoUpdate: (): (() => void) => (): void => {},
computePosition: (
_reference: unknown,
_floating: unknown,
{ placement = 'bottom', strategy = 'absolute' } = {},
): Promise<unknown> =>
Promise.resolve({ x: 0, y: 0, placement, strategy, middlewareData: {} }),
}));
jest.setTimeout(15_000);
const VIEW_1_ORDER_BY = JSON.stringify({ columnName: 'name', order: 'asc' });
const VIEW_1_QUERY = "severity = 'critical'";
const VIEW_2_QUERY = "team = 'infra'";
const VIEW_1_ROUTE = `/?view=view-1&query=${encodeURIComponent(
VIEW_1_QUERY,
)}&states=firing&orderBy=${encodeURIComponent(VIEW_1_ORDER_BY)}`;
const VIEW_1_EDITED_ROUTE = `/?view=view-1&query=foo&states=firing&orderBy=${encodeURIComponent(
VIEW_1_ORDER_BY,
)}`;
const VIEW_2_ROUTE = `/?view=view-2&query=${encodeURIComponent(VIEW_2_QUERY)}`;
type Body = Record<string, unknown>;
type User = ReturnType<typeof userEvent.setup>;
@@ -138,7 +132,7 @@ describe('ListAlertRules — saved views rail', () => {
it('renders the builtin views with All active by default', async () => {
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
expect(viewItem('mine')).toHaveTextContent('My alert rules');
expect(viewItem('all')).toHaveTextContent('All alert rules');
expect(viewItem('firing')).toHaveTextContent('Firing');
@@ -156,10 +150,10 @@ describe('ListAlertRules — saved views rail', () => {
['firing', 'Firing'],
['disabled', 'Disabled'],
])('%s sends states=%s', async (id, label) => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const requests = captureRulesRequests();
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
await selectView(user, id);
@@ -175,11 +169,11 @@ describe('ListAlertRules — saved views rail', () => {
});
it('My alert rules filters by the current user as creator', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const requests = captureRulesRequests();
const { email } = getAppContextMock('ADMIN').user;
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
await selectView(user, 'mine');
@@ -192,22 +186,27 @@ describe('ListAlertRules — saved views rail', () => {
expect(activeHeading()).toHaveTextContent('My alert rules');
});
it('editing a builtin view filter offers save as new view, which POSTs', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const captured = captureViewWrites();
it('editing a builtin view filter offers save as new view only', async () => {
const user = userEvent.setup();
renderListAlertRules();
await screen.findByText('High CPU Alert');
await screen.findByTestId('alert-row-rule-1-name');
await runSearchQuery(user, 'foo');
await user.click(await screen.findByTestId('alert-rules-view-save-as-new'));
await screen.findByTestId('alert-rules-view-save-as-new');
expect(
screen.queryByTestId('alert-rules-view-save-changes'),
).not.toBeInTheDocument();
await user.type(
await screen.findByTestId('save-alert-rule-view-name'),
'Foo alerts',
);
});
it('save as new view from an edited builtin view POSTs', async () => {
const user = userEvent.setup();
const captured = captureViewWrites();
renderListAlertRules({ initialRoute: '/?query=foo' });
await user.click(await screen.findByTestId('alert-rules-view-save-as-new'));
await user.click(await screen.findByTestId('save-alert-rule-view-name'));
await user.paste('Foo alerts');
await user.click(screen.getByTestId('save-alert-rule-view-confirm'));
await waitFor(() => expect(captured.posts).toHaveLength(1));
@@ -227,7 +226,7 @@ describe('ListAlertRules — saved views rail', () => {
describe('saved views', () => {
it('lists saved views and applies the selected one', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const requests = captureRulesRequests();
renderListAlertRules({ initialRoute: '/?page=2' });
@@ -259,9 +258,9 @@ describe('ListAlertRules — saved views rail', () => {
});
it('shows the unsaved-changes panel after editing an applied view filter', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
renderListAlertRules();
await selectView(user, 'view-1');
const user = userEvent.setup();
renderListAlertRules({ initialRoute: VIEW_1_ROUTE });
await screen.findByTestId('alert-rules-view-view-1');
await runSearchQuery(user, 'foo');
@@ -274,11 +273,9 @@ describe('ListAlertRules — saved views rail', () => {
});
it('Save PUTs the full current filter and the unchanged name', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const captured = captureViewWrites();
renderListAlertRules();
await selectView(user, 'view-1');
await runSearchQuery(user, 'foo');
renderListAlertRules({ initialRoute: VIEW_1_EDITED_ROUTE });
await user.click(await screen.findByTestId('alert-rules-view-save-changes'));
@@ -304,17 +301,13 @@ describe('ListAlertRules — saved views rail', () => {
});
it('Save as POSTs a new view and activates it', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const captured = captureViewWrites();
renderListAlertRules();
await selectView(user, 'view-1');
await runSearchQuery(user, 'foo');
renderListAlertRules({ initialRoute: VIEW_1_EDITED_ROUTE });
await user.click(await screen.findByTestId('alert-rules-view-save-as'));
await user.type(
await screen.findByTestId('save-alert-rule-view-name'),
'My view',
);
await user.click(await screen.findByTestId('save-alert-rule-view-name'));
await user.paste('My view');
await user.click(screen.getByTestId('save-alert-rule-view-confirm'));
await waitFor(() => expect(captured.posts).toHaveLength(1));
@@ -333,14 +326,14 @@ describe('ListAlertRules — saved views rail', () => {
});
it('caps a view name at 64 characters', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const captured = captureViewWrites();
renderListAlertRules();
await screen.findByText('High CPU Alert');
await user.click(screen.getByLabelText('Save current filters as a view'));
await user.click(await screen.findByTestId('alert-rules-view-save-trigger'));
const input = await screen.findByTestId('save-alert-rule-view-name');
await user.type(input, 'x'.repeat(70));
await user.click(input);
await user.paste('x'.repeat(70));
expect(input).toHaveValue('x'.repeat(64));
await user.click(screen.getByTestId('save-alert-rule-view-confirm'));
@@ -350,11 +343,8 @@ describe('ListAlertRules — saved views rail', () => {
});
it('Reset restores the active view filter', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
renderListAlertRules();
await selectView(user, 'view-1');
await runSearchQuery(user, 'foo');
await waitFor(() => expect(urlParam('query')).toBe('foo'));
const user = userEvent.setup();
renderListAlertRules({ initialRoute: VIEW_1_EDITED_ROUTE });
await user.click(await screen.findByTestId('alert-rules-view-reset'));
@@ -370,19 +360,16 @@ describe('ListAlertRules — saved views rail', () => {
});
it('rename PUTs the new name and keeps the stored filter', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const captured = captureViewWrites();
renderListAlertRules();
await selectView(user, 'view-2');
await runSearchQuery(user, 'foo');
renderListAlertRules({ initialRoute: '/?view=view-2&query=foo' });
await screen.findByTestId('alert-rules-view-save-changes');
const row = viewItem('view-1').parentElement as HTMLElement;
await user.click(within(row).getByLabelText('Rename view'));
await user.click(screen.getByTestId('alert-rules-view-rename-view-1'));
const input = await screen.findByTestId('rename-alert-rule-view-name');
expect(input).toHaveValue('Critical firing');
await user.clear(input);
await user.type(input, 'Renamed');
await user.paste('Renamed');
await user.click(screen.getByTestId('rename-alert-rule-view-confirm'));
await waitFor(() => expect(captured.puts).toHaveLength(1));
@@ -403,12 +390,13 @@ describe('ListAlertRules — saved views rail', () => {
});
it('delete asks for confirmation and sends DELETE', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const captured = captureViewWrites();
renderListAlertRules();
await selectView(user, 'view-1');
renderListAlertRules({ initialRoute: VIEW_1_ROUTE });
await user.click(screen.getByTestId('alert-rules-view-delete-view-2'));
await user.click(
await screen.findByTestId('alert-rules-view-delete-view-2'),
);
await expect(
screen.findByText(/Views are shared across your organization/),
@@ -421,13 +409,13 @@ describe('ListAlertRules — saved views rail', () => {
});
it('deleting the active view falls back to All', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
const captured = captureViewWrites();
renderListAlertRules();
await selectView(user, 'view-1');
await waitFor(() => expect(urlParam('query')).toBe(VIEW_1_QUERY));
renderListAlertRules({ initialRoute: VIEW_1_ROUTE });
await user.click(screen.getByTestId('alert-rules-view-delete-view-1'));
await user.click(
await screen.findByTestId('alert-rules-view-delete-view-1'),
);
await user.click(await findConfirmDelete());
await waitFor(() => expect(captured.deletes).toStrictEqual(['view-1']));
@@ -440,12 +428,10 @@ describe('ListAlertRules — saved views rail', () => {
});
it('All alert rules clears the view and its filters', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
renderListAlertRules();
await selectView(user, 'view-1');
await waitFor(() => expect(urlParam('query')).not.toBeNull());
const user = userEvent.setup();
renderListAlertRules({ initialRoute: VIEW_1_ROUTE });
await user.click(viewItem('all'));
await user.click(await screen.findByTestId('alert-rules-view-all'));
await waitFor(() => {
expect(urlParam('view')).toBeNull();
@@ -482,9 +468,9 @@ describe('ListAlertRules — saved views rail', () => {
});
it('marks a cleared view filter in the URL', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
renderListAlertRules();
await selectView(user, 'view-2');
const user = userEvent.setup();
renderListAlertRules({ initialRoute: VIEW_2_ROUTE });
await screen.findByTestId('alert-rules-view-view-2');
await user.click(screen.getByTestId('alert-rules-filter-clear'));
@@ -504,24 +490,27 @@ describe('ListAlertRules — saved views rail', () => {
});
it('keeps a query run while the linked views are still loading', async () => {
let releaseViews = (): void => {};
const viewsReleased = new Promise<void>((resolve) => {
releaseViews = resolve;
});
server.use(
rest.get('http://localhost/api/v2/rule_views', (_, res, ctx) =>
res(
ctx.delay(300),
rest.get('http://localhost/api/v2/rule_views', async (_, res, ctx) => {
await viewsReleased;
return res(
ctx.status(200),
ctx.json({ data: { views: ruleViewsFixture }, status: 'success' }),
),
),
);
}),
);
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
renderListAlertRules({ initialRoute: '/?view=view-1' });
await runSearchQuery(user, 'foo');
await screen.findByTestId(
'alert-rules-view-save-changes',
{},
{ timeout: 5000 },
);
await waitFor(() => expect(urlParam('query')).toBe('foo'));
releaseViews();
await screen.findByTestId('alert-rules-view-save-changes');
await urlSettled();
expect(urlParam('query')).toBe('foo');
expect(urlParam('states')).toBeNull();
@@ -530,7 +519,7 @@ describe('ListAlertRules — saved views rail', () => {
describe('rail chrome', () => {
it('filters views by name', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
renderListAlertRules();
await screen.findByTestId('alert-rules-view-view-2');
@@ -550,11 +539,10 @@ describe('ListAlertRules — saved views rail', () => {
});
it('collapses the rail from the status bar and persists it', async () => {
const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
const user = userEvent.setup();
renderListAlertRules();
await screen.findByText('High CPU Alert');
const toggle = screen.getByTestId('alert-rules-rail-toggle');
const toggle = await screen.findByTestId('alert-rules-rail-toggle');
expect(toggle).toHaveTextContent('Collapse');
await user.click(toggle);

View File

@@ -160,7 +160,13 @@ function ActionsMenu({ rule, onEdit }: ActionsMenuProps): JSX.Element {
return (
// eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
<div onClick={handleClick}>
<Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Dropdown
items={menuItems}
nativeButton
align="end"
side="bottom"
testId="alert-actions"
>
<Button
aria-label="Action"
variant="outlined"

View File

@@ -127,6 +127,13 @@ jest.mock(
return <div>MockQueryBuilderSearchV2</div>;
},
);
jest.mock(
'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch',
() =>
function MockQuerySearch(): JSX.Element {
return <div>MockQuerySearch</div>;
},
);
jest.mock(
'components/QuickFilters/QuickFilters',
() =>
@@ -472,21 +479,16 @@ describe('Logs Explorer -> stage and run query', () => {
{ initialRoute: '/logs' },
);
await waitFor(() => {
expect(
screen.queryByText('pending_data_placeholder'),
).not.toBeInTheDocument();
});
await screen.findByTestId('logs-list-virtuoso');
expect(
screen.queryByText('pending_data_placeholder'),
).not.toBeInTheDocument();
// check for no data state to not be present
await waitFor(() => {
expect(screen.queryByText(/No logs yet/)).not.toBeInTheDocument();
});
expect(screen.queryByText(/No logs yet/)).not.toBeInTheDocument();
// Wait for the initial API calls to be made (component may make multiple calls during initialization)
await waitFor(() => {
expect(capturedPayloads.length).toBeGreaterThan(0);
});
expect(capturedPayloads.length).toBeGreaterThan(0);
// Store the initial payload timestamps (use the last one as the baseline)
const initialPayload = capturedPayloads[capturedPayloads.length - 1];
@@ -494,20 +496,13 @@ describe('Logs Explorer -> stage and run query', () => {
const initialEnd = initialPayload.end;
// Click the Run Query button
const user = userEvent.setup({ pointerEventsCheck: 0 });
await user.click(
screen.getByRole('button', {
name: /run query/i,
}),
);
const user = userEvent.setup();
await user.click(screen.getByTestId('explorer-run-query-btn'));
// Wait for additional API calls to be made after clicking Run Query
await waitFor(
() => {
expect(capturedPayloads.length).toBeGreaterThan(1);
},
{ timeout: 5000 },
);
await waitFor(() => {
expect(capturedPayloads.length).toBeGreaterThan(1);
});
// Verify that the IDs have changed
expect(currentStagedQuery.id).not.toBe(initialStagedQueryId);
@@ -528,5 +523,5 @@ describe('Logs Explorer -> stage and run query', () => {
// Verify that the IDs have changed (this confirms the Stage & Run Query button worked)
expect(currentStagedQuery.id).not.toBe(initialStagedQueryId);
expect(currentCurrentQuery.id).not.toBe(initialCurrentQueryId);
}, 15000);
});
});

View File

@@ -141,6 +141,7 @@ export function AboutSigNozQuestions({
<AntdInput.TextArea
className="discover-signoz-input"
data-testid="discover-signoz-input"
placeholder="e.g., I asked ChatGPT for Datadog alternatives, searched Google for “OpenTelemetry tools,” saw a Reddit or LinkedIn post, or heard about it from a colleague."
value={discoverSignoz}
autoFocus
@@ -157,6 +158,7 @@ export function AboutSigNozQuestions({
<Checkbox
color="primary"
id={`checkbox-${option}`}
testId={`interest-${option}`}
value={interestInSignoz.includes(option)}
onChange={createInterestChangeHandler(option)}
>
@@ -169,6 +171,7 @@ export function AboutSigNozQuestions({
<Checkbox
color="primary"
id="others-checkbox"
testId="interest-Others"
value={interestInSignoz.includes('Others')}
onChange={createInterestChangeHandler('Others')}
>
@@ -179,6 +182,7 @@ export function AboutSigNozQuestions({
type="text"
className="onboarding-questionaire-other-input"
placeholder="What got you interested in SigNoz?"
testId="other-interest-input"
value={otherInterestInSignoz}
autoFocus
onChange={(e): void => setOtherInterestInSignoz(e.target.value)}
@@ -199,6 +203,7 @@ export function AboutSigNozQuestions({
disabled={isNextDisabled}
disabledTooltip={getNextDisabledReason()}
suffix={<ArrowRight size={12} />}
testId="about-signoz-next"
>
Next
</Button>

View File

@@ -210,6 +210,7 @@ function OptimiseSignozNeeds({
min={0}
max={100}
value={sliderValues.logsPerDay}
testId="logs-per-day-slider"
marks={marks}
onChange={(value): void =>
handleSliderChange('logsPerDay', value as number)
@@ -237,6 +238,7 @@ function OptimiseSignozNeeds({
min={0}
max={100}
value={sliderValues.hostsPerDay}
testId="hosts-per-day-slider"
marks={hostMarks}
onChange={(value): void =>
handleSliderChange('hostsPerDay', value as number)
@@ -264,6 +266,7 @@ function OptimiseSignozNeeds({
min={0}
max={100}
value={sliderValues.services}
testId="services-slider"
marks={serviceMarks}
onChange={(value): void =>
handleSliderChange('services', value as number)
@@ -293,6 +296,7 @@ function OptimiseSignozNeeds({
disabled={isNextDisabled}
disabledTooltip="Set at least one of the values above"
suffix={<ArrowRight size={12} />}
testId="optimise-needs-next"
>
Next
</Button>
@@ -303,6 +307,7 @@ function OptimiseSignozNeeds({
width="100%"
onClick={handleWillDoLater}
loading={isUpdatingProfile}
testId="optimise-needs-do-later"
>
I&apos;ll do this later
</Button>

View File

@@ -156,6 +156,7 @@ function OrgQuestions({ orgDetails, onNext }: OrgQuestionsProps): JSX.Element {
<RadioGroup
color="primary"
textOverflow="visible"
testId="observability-tool"
value={observabilityTool}
onChange={handleObservabilityToolChange}
items={Object.entries(observabilityTools).map(([tool, label]) => ({
@@ -166,6 +167,7 @@ function OrgQuestions({ orgDetails, onNext }: OrgQuestionsProps): JSX.Element {
type="text"
className="onboarding-questionaire-other-input"
placeholder="What tool do you currently use?"
testId="other-tool-input"
value={otherTool || ''}
autoFocus
style={{ userSelect: 'text' }}
@@ -186,6 +188,7 @@ function OrgQuestions({ orgDetails, onNext }: OrgQuestionsProps): JSX.Element {
</div>
<RadioGroup
color="primary"
testId="migration-timeline"
value={migrationTimeline}
onChange={setMigrationTimeline}
items={Object.entries(migrationTimelineOptions).map(([key, label]) => ({
@@ -200,6 +203,7 @@ function OrgQuestions({ orgDetails, onNext }: OrgQuestionsProps): JSX.Element {
<div className="question">Do you already use OpenTelemetry?</div>
<RadioGroup
color="primary"
testId="uses-otel"
value={usesOtel === true ? 'yes' : usesOtel === false ? 'no' : null}
onChange={handleOtelChange}
items={[
@@ -219,6 +223,7 @@ function OrgQuestions({ orgDetails, onNext }: OrgQuestionsProps): JSX.Element {
disabled={isNextDisabled}
disabledTooltip={getNextDisabledReason()}
suffix={<ArrowRight size={12} />}
testId="org-questions-next"
>
Next
</Button>

View File

@@ -63,6 +63,7 @@ function DomainMappingList({
color="secondary"
onClick={(): void => remove(field.name)}
aria-label="Remove mapping"
testId="domain-mapping-remove"
icon
>
<Trash2 size={12} />

View File

@@ -1,4 +1,4 @@
import { fireEvent, render, screen, waitFor } from 'tests/test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { rest, server } from 'mocks-server/server';
import CreateEdit from '../CreateEdit/CreateEdit';
@@ -23,6 +23,7 @@ jest.mock('@signozhq/ui/button', () => ({
'aria-label': ariaLabel,
prefix,
suffix,
testId,
}: {
children?: React.ReactNode;
onClick?: React.MouseEventHandler<HTMLButtonElement>;
@@ -31,12 +32,14 @@ jest.mock('@signozhq/ui/button', () => ({
'aria-label'?: string;
prefix?: React.ReactNode;
suffix?: React.ReactNode;
testId?: string;
}) => (
<button
type="button"
onClick={onClick}
disabled={disabled || loading}
aria-label={ariaLabel}
data-testid={testId}
>
{prefix}
{children}
@@ -45,20 +48,21 @@ jest.mock('@signozhq/ui/button', () => ({
),
}));
function capturePayload(): { get: () => unknown } {
let payload: unknown = null;
server.use(
rest.put(AUTH_DOMAINS_UPDATE_ENDPOINT, async (req, res, ctx) => {
payload = await req.json();
return res(ctx.status(200), ctx.json(mockUpdateSuccessResponse));
}),
);
return { get: (): unknown => payload };
}
describe('CreateEdit — save payload correctness', () => {
afterEach(() => {
server.resetHandlers();
});
it('sends groupMappings: {} when all group mappings are deleted', async () => {
let capturedPayload: unknown = null;
server.use(
rest.put(AUTH_DOMAINS_UPDATE_ENDPOINT, async (req, res, ctx) => {
capturedPayload = await req.json();
return res(ctx.status(200), ctx.json(mockUpdateSuccessResponse));
}),
);
const user = userEvent.setup();
const payload = capturePayload();
render(
<CreateEdit
@@ -68,63 +72,26 @@ describe('CreateEdit — save payload correctness', () => {
/>,
);
// Open the Role Mapping collapse (Ant Design Collapse responds to click events)
fireEvent.click(screen.getByText(/role mapping \(advanced\)/i));
await user.click(screen.getByTestId('role-mapping-header'));
// Wait for the 3 group mapping rows to appear
await waitFor(() =>
expect(
screen.getAllByRole('button', { name: /remove mapping/i }),
).toHaveLength(3),
);
const removeButtons = await screen.findAllByTestId('role-mapping-remove');
expect(removeButtons).toHaveLength(3);
for (let i = 0; i < removeButtons.length; i += 1) {
await user.click(screen.getAllByTestId('role-mapping-remove')[0]);
}
expect(screen.queryAllByTestId('role-mapping-remove')).toHaveLength(0);
// Delete each row; re-query after each removal
fireEvent.click(
screen.getAllByRole('button', { name: /remove mapping/i })[0],
);
await waitFor(() =>
expect(
screen.getAllByRole('button', { name: /remove mapping/i }),
).toHaveLength(2),
);
await user.click(screen.getByTestId('auth-domain-save'));
fireEvent.click(
screen.getAllByRole('button', { name: /remove mapping/i })[0],
);
await waitFor(() =>
expect(
screen.getAllByRole('button', { name: /remove mapping/i }),
).toHaveLength(1),
);
fireEvent.click(
screen.getAllByRole('button', { name: /remove mapping/i })[0],
);
await waitFor(() =>
expect(
screen.queryAllByRole('button', { name: /remove mapping/i }),
).toHaveLength(0),
);
// Submit — MSW intercepts the PUT request
fireEvent.click(screen.getByRole('button', { name: /save changes/i }));
await waitFor(() => expect(capturedPayload).not.toBeNull());
expect(capturedPayload).toMatchObject({
await waitFor(() => expect(payload.get()).not.toBeNull());
expect(payload.get()).toMatchObject({
roleMapping: expect.objectContaining({ groupMappings: {} }),
});
});
it('sends domainToAdminEmail: {} when all domain mappings are deleted', async () => {
let capturedPayload: unknown = null;
server.use(
rest.put(AUTH_DOMAINS_UPDATE_ENDPOINT, async (req, res, ctx) => {
capturedPayload = await req.json();
return res(ctx.status(200), ctx.json(mockUpdateSuccessResponse));
}),
);
const user = userEvent.setup();
const payload = capturePayload();
render(
<CreateEdit
@@ -134,30 +101,14 @@ describe('CreateEdit — save payload correctness', () => {
/>,
);
// Open the Google Workspace Groups collapse
fireEvent.click(screen.getByText(/google workspace groups/i));
await user.click(screen.getByTestId('google-auth-workspace-groups-header'));
await user.click(await screen.findByTestId('domain-mapping-remove'));
expect(screen.queryByTestId('domain-mapping-remove')).not.toBeInTheDocument();
// Wait for the single domain mapping row
await waitFor(() =>
expect(
screen.getByRole('button', { name: /remove mapping/i }),
).toBeInTheDocument(),
);
await user.click(screen.getByTestId('auth-domain-save'));
// Delete the row
fireEvent.click(screen.getByRole('button', { name: /remove mapping/i }));
await waitFor(() =>
expect(
screen.queryAllByRole('button', { name: /remove mapping/i }),
).toHaveLength(0),
);
// Submit
fireEvent.click(screen.getByRole('button', { name: /save changes/i }));
await waitFor(() => expect(capturedPayload).not.toBeNull());
expect(capturedPayload).toMatchObject({
await waitFor(() => expect(payload.get()).not.toBeNull());
expect(payload.get()).toMatchObject({
config: expect.objectContaining({
spec: expect.objectContaining({
domainToAdminEmail: {},

View File

@@ -6,7 +6,10 @@ import {
managedRoles,
} from 'mocks-server/__mockdata__/roles';
import { Form } from 'antd';
import CreateEdit from '../CreateEdit/CreateEdit';
import RoleMappingSection from '../CreateEdit/Providers/components/RoleMappingSection';
import {
AUTH_DOMAINS_UPDATE_ENDPOINT,
mockDomainWithDirectRoleAttribute,
@@ -29,6 +32,7 @@ jest.mock('@signozhq/ui/button', () => ({
'aria-label': ariaLabel,
prefix,
suffix,
testId,
}: {
children?: React.ReactNode;
onClick?: React.MouseEventHandler<HTMLButtonElement>;
@@ -37,12 +41,14 @@ jest.mock('@signozhq/ui/button', () => ({
'aria-label'?: string;
prefix?: React.ReactNode;
suffix?: React.ReactNode;
testId?: string;
}) => (
<button
type="button"
onClick={onClick}
disabled={disabled || loading}
aria-label={ariaLabel}
data-testid={testId}
>
{prefix}
{children}
@@ -51,20 +57,11 @@ jest.mock('@signozhq/ui/button', () => ({
),
}));
// These are heavy real-timer integration tests (antd Select dropdown render +
// form.validateFields() + a react-query mutation, all driven through userEvent).
// Under a CPU-saturated parallel `jest` run the wall-clock roughly triples, which
// pushes the longest tests past the 5000ms default and makes them flaky. Give the
// whole file a wider budget (matches LogsPanelComponent.test.tsx).
jest.setTimeout(20000);
const ROLES_ENDPOINT = '*/api/v1/roles';
type User = ReturnType<typeof userEvent.setup>;
// antd renders pointer-events:none on parts of its Select, so disable the
// userEvent pointer-events guard (mirrors CreateEdit.test.tsx).
const setupUser = (): User => userEvent.setup({ pointerEventsCheck: 0 });
const setupUser = (): User => userEvent.setup();
function getRole(name: string): (typeof managedRoles)[number] {
const role = managedRoles.find((r) => r.name === name);
@@ -103,13 +100,23 @@ function captureUpdatePayload(): { get: () => any } {
}
const expandRoleMapping = (user: User): Promise<void> =>
user.click(screen.getByText(/role mapping \(advanced\)/i));
user.click(screen.getByTestId('role-mapping-header'));
const openDefaultRoleSelect = (user: User): Promise<void> =>
user.click(screen.getByLabelText(/default role/i));
function renderExpandedRoleMappingSection(
onValuesChange?: (changed: unknown) => void,
): void {
render(
<Form onValuesChange={onValuesChange}>
<RoleMappingSection fieldNamePrefix={['roleMapping']} isExpanded />
</Form>,
);
}
const saveChanges = (user: User): Promise<void> =>
user.click(screen.getByRole('button', { name: /save changes/i }));
user.click(screen.getByTestId('auth-domain-save'));
describe('CreateEdit — role mapping uses API roles', () => {
afterEach(() => {
@@ -134,17 +141,7 @@ describe('CreateEdit — role mapping uses API roles', () => {
const user = setupUser();
mockRoles();
// mockSamlAuthDomain has no stored defaultRole, so nothing stale (e.g.
// "VIEWER") is rendered as a selected tag to pollute the title lookups.
render(
<CreateEdit
isCreate={false}
record={mockSamlAuthDomain}
onClose={jest.fn()}
/>,
);
await expandRoleMapping(user);
renderExpandedRoleMappingSection();
// Open the Select and wait for the async roles fetch to populate it.
await openDefaultRoleSelect(user);
@@ -164,32 +161,21 @@ describe('CreateEdit — role mapping uses API roles', () => {
expect(screen.queryByTitle('ADMIN')).not.toBeInTheDocument();
});
it('submits the selected role name (not the role id) as defaultRole', async () => {
it('stores the selected role name (not the role id) as defaultRole', async () => {
const user = setupUser();
mockRoles();
const payload = captureUpdatePayload();
const onValuesChange = jest.fn();
render(
<CreateEdit
isCreate={false}
record={mockDomainWithDirectRoleAttribute}
onClose={jest.fn()}
/>,
);
await expandRoleMapping(user);
renderExpandedRoleMappingSection(onValuesChange);
await openDefaultRoleSelect(user);
await user.click(await screen.findByTitle(editorRole.name));
await saveChanges(user);
await waitFor(() => expect(payload.get()).not.toBeNull());
// SSO role mapping matches roles by name, so the payload carries the
// role *name*, not the opaque id.
expect(payload.get().roleMapping.defaultRole).toBe(editorRole.name);
expect(payload.get().roleMapping.defaultRole).not.toBe(editorRole.id);
expect(onValuesChange).toHaveBeenLastCalledWith(
{ roleMapping: { defaultRole: editorRole.name } },
expect.anything(),
);
expect(editorRole.name).not.toBe(editorRole.id);
});
it('defaults a fresh role mapping to the signoz-viewer role name', async () => {
@@ -295,15 +281,7 @@ describe('CreateEdit — role mapping uses API roles', () => {
500,
);
render(
<CreateEdit
isCreate={false}
record={mockSamlAuthDomain}
onClose={jest.fn()}
/>,
);
await expandRoleMapping(user);
renderExpandedRoleMappingSection();
// Open the select and confirm the error UI (with retry) is surfaced
// instead of crashing the form. The error message comes straight from

View File

@@ -1,4 +1,4 @@
import { fireEvent, render, screen, waitFor } from 'tests/test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { rest, server } from 'mocks-server/server';
import {
AuthtypesAuthDomainConfigGoogleDTO,
@@ -27,6 +27,7 @@ jest.mock('@signozhq/ui/button', () => ({
'aria-label': ariaLabel,
prefix,
suffix,
testId,
}: {
children?: React.ReactNode;
onClick?: React.MouseEventHandler<HTMLButtonElement>;
@@ -35,12 +36,14 @@ jest.mock('@signozhq/ui/button', () => ({
'aria-label'?: string;
prefix?: React.ReactNode;
suffix?: React.ReactNode;
testId?: string;
}) => (
<button
type="button"
onClick={onClick}
disabled={disabled || loading}
aria-label={ariaLabel}
data-testid={testId}
>
{prefix}
{children}
@@ -60,6 +63,7 @@ type SavedPayload = {
async function submitForm(
record: AuthtypesGettableAuthDomainDTO,
): Promise<SavedPayload> {
const user = userEvent.setup();
const requests: SavedPayload[] = [];
server.use(
@@ -70,7 +74,7 @@ async function submitForm(
);
render(<CreateEdit isCreate={false} record={record} onClose={jest.fn()} />);
fireEvent.click(screen.getByRole('button', { name: /save changes/i }));
await user.click(screen.getByTestId('auth-domain-save'));
await waitFor(() => expect(requests).toHaveLength(1));
return requests[0];

View File

@@ -1,10 +1,4 @@
import {
fireEvent,
render,
screen,
userEvent,
waitFor,
} from 'tests/test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import CreateEdit from '../CreateEdit/CreateEdit';
import {
@@ -37,21 +31,17 @@ describe('CreateEdit Modal', () => {
});
it('returns to provider selection when back button is clicked', async () => {
const user = userEvent.setup();
render(<CreateEdit isCreate onClose={mockOnClose} />);
const configureButtons = await screen.findAllByRole('button', {
name: /configure/i,
});
// Use fireEvent to skip userEvent's pointer simulation and the Antd
// Tooltip mouseEnterDelay timers it triggers on the Configure button.
fireEvent.click(configureButtons[0]);
await user.click(screen.getByTestId('authn-provider-configure-google'));
await expect(
screen.findByText(/edit google authentication/i),
).resolves.toBeInTheDocument();
const backButton = screen.getByRole('button', { name: /back/i });
fireEvent.click(backButton);
await user.click(screen.getByTestId('auth-domain-back'));
await expect(
screen.findByText(/configure authentication method/i),
@@ -110,45 +100,33 @@ describe('CreateEdit Modal', () => {
/>,
);
expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument();
expect(
screen.queryByRole('button', { name: /back/i }),
).not.toBeInTheDocument();
expect(screen.getByTestId('auth-domain-cancel')).toHaveTextContent('Cancel');
expect(screen.queryByTestId('auth-domain-back')).not.toBeInTheDocument();
});
});
describe('Form Validation', () => {
it('shows validation error when submitting without required fields', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<CreateEdit isCreate onClose={mockOnClose} />);
const configureButtons = await screen.findAllByRole('button', {
name: /configure/i,
});
fireEvent.click(configureButtons[0]);
await user.click(screen.getByTestId('authn-provider-configure-google'));
await user.click(await screen.findByTestId('auth-domain-save'));
const saveButton = await screen.findByRole('button', {
name: /save changes/i,
});
await user.click(saveButton);
await waitFor(() => {
expect(screen.getByText(/domain is required/i)).toBeInTheDocument();
});
}, 15000);
await expect(
screen.findByText(/domain is required/i),
).resolves.toBeInTheDocument();
});
});
describe('Google Auth Provider', () => {
it('shows Google Auth form fields', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<CreateEdit isCreate onClose={mockOnClose} />);
const configureButtons = await screen.findAllByRole('button', {
name: /configure/i,
});
await user.click(configureButtons[0]);
await user.click(screen.getByTestId('authn-provider-configure-google'));
await waitFor(() => {
expect(screen.getByText(/edit google authentication/i)).toBeInTheDocument();
@@ -160,7 +138,7 @@ describe('CreateEdit Modal', () => {
});
it('shows workspace groups section when expanded', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<CreateEdit
@@ -170,8 +148,7 @@ describe('CreateEdit Modal', () => {
/>,
);
const workspaceHeader = screen.getByText(/google workspace groups/i);
await user.click(workspaceHeader);
await user.click(screen.getByTestId('google-auth-workspace-groups-header'));
await waitFor(() => {
expect(screen.getByText(/fetch groups/i)).toBeInTheDocument();
@@ -198,7 +175,7 @@ describe('CreateEdit Modal', () => {
});
it('shows attribute mapping section for SAML', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<CreateEdit
@@ -239,7 +216,7 @@ describe('CreateEdit Modal', () => {
});
it('shows claim mapping section for OIDC', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<CreateEdit
@@ -278,22 +255,19 @@ describe('CreateEdit Modal', () => {
describe('Role Mapping', () => {
it('shows role mapping section in provider forms', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<CreateEdit isCreate onClose={mockOnClose} />);
const configureButtons = await screen.findAllByRole('button', {
name: /configure/i,
});
await user.click(configureButtons[0]);
await user.click(screen.getByTestId('authn-provider-configure-google'));
await waitFor(() => {
expect(screen.getByText(/role mapping \(advanced\)/i)).toBeInTheDocument();
});
await expect(
screen.findByText(/role mapping \(advanced\)/i),
).resolves.toBeInTheDocument();
});
it('expands role mapping section to show default role selector', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<CreateEdit
@@ -303,8 +277,7 @@ describe('CreateEdit Modal', () => {
/>,
);
const roleMappingHeader = screen.getByText(/role mapping \(advanced\)/i);
await user.click(roleMappingHeader);
await user.click(screen.getByTestId('role-mapping-header'));
await waitFor(() => {
expect(screen.getByText(/default role/i)).toBeInTheDocument();
@@ -315,7 +288,7 @@ describe('CreateEdit Modal', () => {
});
it('shows group mappings section when useRoleAttribute is false', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<CreateEdit
@@ -325,20 +298,21 @@ describe('CreateEdit Modal', () => {
/>,
);
const roleMappingHeader = screen.getByText(/role mapping \(advanced\)/i);
await user.click(roleMappingHeader);
await user.click(screen.getByTestId('role-mapping-header'));
await waitFor(() => {
expect(screen.getByText(/group to role mappings/i)).toBeInTheDocument();
expect(
screen.getByRole('button', { name: /add group mapping/i }),
).toBeInTheDocument();
});
await expect(
screen.findByText(/group to role mappings/i),
).resolves.toBeInTheDocument();
expect(screen.getByTestId('role-mapping-add')).toHaveTextContent(
'Add Group Mapping',
);
});
});
describe('Modal Actions', () => {
it('calls onClose when cancel button is clicked', () => {
it('calls onClose when cancel button is clicked', async () => {
const user = userEvent.setup();
render(
<CreateEdit
isCreate={false}
@@ -347,8 +321,7 @@ describe('CreateEdit Modal', () => {
/>,
);
const cancelButton = screen.getByRole('button', { name: /cancel/i });
fireEvent.click(cancelButton);
await user.click(screen.getByTestId('auth-domain-cancel'));
expect(mockOnClose).toHaveBeenCalled();
});

View File

@@ -63,6 +63,7 @@ function JsonFlattening({
<Switch
color="primary"
textPlacement="right"
testId="enable-paths-switch"
value={!!enablePaths}
onChange={handleEnablePathsChange}
/>
@@ -76,7 +77,7 @@ function JsonFlattening({
label="Path Prefix"
initialValue={selectedProcessorData?.path_prefix}
>
<Input placeholder="Path Prefix" />
<Input placeholder="Path Prefix" testId="path-prefix-input" />
</Form.Item>
)}

View File

@@ -96,6 +96,7 @@ function ProcessorFieldInput({
<Switch
color="primary"
textPlacement="right"
testId="enable-flattening-switch"
value={form.getFieldValue('enable_flattening')}
onChange={(checked: boolean): void => {
form.setFieldValue('enable_flattening', checked);

View File

@@ -1,5 +1,9 @@
import { fireEvent, screen, waitFor } from '@testing-library/react';
import { render as customRender } from 'tests/test-utils';
import {
render as customRender,
screen,
userEvent,
waitFor,
} from 'tests/test-utils';
import { ProcessorData } from 'types/api/pipeline/def';
import { pipelineMockData } from '../mocks/pipeline';
@@ -22,7 +26,7 @@ const selectedProcessorData = {
// Constants for repeated text
const ENABLE_PATHS_TEXT = 'Enable Paths';
const ENABLE_MAPPING_TEXT = 'Enable Mapping';
const PATH_PREFIX_LABEL = 'Path Prefix';
const PATH_PREFIX_TEST_ID = 'path-prefix-input';
// Helper function to render AddNewProcessor with JSON parser type
const renderJsonProcessor = ({
@@ -71,17 +75,11 @@ describe('JSON Flattening Processor Tests', () => {
expect(screen.queryByText(ENABLE_MAPPING_TEXT)).not.toBeInTheDocument();
});
it('should display the form when enable flattening switch is toggled on', async () => {
const user = userEvent.setup();
renderJsonProcessor({});
// Wait for the component to render and find the enable flattening switch
await waitFor(() => {
expect(screen.getByRole('switch')).toBeInTheDocument();
});
// Find the enable flattening switch
const enableFlatteningSwitch = screen.getByRole('switch');
// Turn on the switch
fireEvent.click(enableFlatteningSwitch);
// Turn on the enable flattening switch
await user.click(await screen.findByTestId('enable-flattening-switch'));
// Verify the JSON flattening form is displayed
await waitFor(() => {
@@ -90,6 +88,7 @@ describe('JSON Flattening Processor Tests', () => {
});
});
it('should hide the form when enable flattening switch is toggled off', async () => {
const user = userEvent.setup();
renderJsonProcessor({
selectedProcessorData: {
...selectedProcessorData,
@@ -97,15 +96,8 @@ describe('JSON Flattening Processor Tests', () => {
},
});
// Wait for the component to render and find the switches
await waitFor(() => {
expect(screen.getAllByRole('switch')[0]).toBeInTheDocument();
});
// Find the enable flattening switch
const enableFlatteningSwitch = screen.getAllByRole('switch')[0];
// Turn off the switch
fireEvent.click(enableFlatteningSwitch);
// Turn off the enable flattening switch
await user.click(await screen.findByTestId('enable-flattening-switch'));
await waitFor(() => {
expect(screen.queryByText(ENABLE_PATHS_TEXT)).not.toBeInTheDocument();
expect(screen.queryByText(ENABLE_MAPPING_TEXT)).not.toBeInTheDocument();
@@ -115,6 +107,7 @@ describe('JSON Flattening Processor Tests', () => {
describe('Enable/Disable Paths', () => {
it('should toggle path prefix visibility when enable paths switch is toggled', async () => {
const user = userEvent.setup();
renderJsonProcessor({
selectedProcessorData: {
...selectedProcessorData,
@@ -123,34 +116,30 @@ describe('JSON Flattening Processor Tests', () => {
},
});
// Wait for the component to render and find the switches
await waitFor(() => {
expect(screen.getAllByRole('switch')[1]).toBeInTheDocument();
});
// In add mode, enable_paths is always true initially, so the path prefix should be visible
await waitFor(() => {
expect(screen.getByLabelText(PATH_PREFIX_LABEL)).toBeInTheDocument();
});
await expect(
screen.findByTestId(PATH_PREFIX_TEST_ID),
).resolves.toBeInTheDocument();
// Find the enable paths switch (second switch in the form) and turn it off
const enablePathsSwitch = screen.getAllByRole('switch')[1];
fireEvent.click(enablePathsSwitch);
// Turn the enable paths switch off
const enablePathsSwitch = screen.getByTestId('enable-paths-switch');
await user.click(enablePathsSwitch);
// Verify the path prefix field is now hidden
await waitFor(() => {
expect(screen.queryByLabelText(PATH_PREFIX_LABEL)).not.toBeInTheDocument();
expect(screen.queryByTestId(PATH_PREFIX_TEST_ID)).not.toBeInTheDocument();
});
// Turn the paths switch back on
fireEvent.click(enablePathsSwitch);
await user.click(enablePathsSwitch);
// Verify the path prefix field is displayed again
await waitFor(() => {
expect(screen.getByLabelText(PATH_PREFIX_LABEL)).toBeInTheDocument();
});
await expect(
screen.findByTestId(PATH_PREFIX_TEST_ID),
).resolves.toBeInTheDocument();
});
it('should hide path prefix when enable paths switch is turned off', async () => {
const user = userEvent.setup();
renderJsonProcessor({
selectedProcessorData: {
...selectedProcessorData,
@@ -159,23 +148,17 @@ describe('JSON Flattening Processor Tests', () => {
},
});
// Wait for the component to render and find the switches
await waitFor(() => {
expect(screen.getAllByRole('switch')[1]).toBeInTheDocument();
});
// Verify the path prefix is initially visible
await waitFor(() => {
expect(screen.getByLabelText(PATH_PREFIX_LABEL)).toBeInTheDocument();
});
await expect(
screen.findByTestId(PATH_PREFIX_TEST_ID),
).resolves.toBeInTheDocument();
// Find the enable paths switch and turn it off
const enablePathsSwitch = screen.getAllByRole('switch')[1];
fireEvent.click(enablePathsSwitch);
// Turn the enable paths switch off
await user.click(screen.getByTestId('enable-paths-switch'));
// Verify the path prefix field is now hidden
await waitFor(() => {
expect(screen.queryByLabelText(PATH_PREFIX_LABEL)).not.toBeInTheDocument();
expect(screen.queryByTestId(PATH_PREFIX_TEST_ID)).not.toBeInTheDocument();
});
});
});
@@ -226,17 +209,15 @@ describe('JSON Flattening Processor Tests', () => {
});
// Verify the form is displayed with existing data
await waitFor(() => {
expect(screen.getByDisplayValue('existing.prefix')).toBeInTheDocument();
});
await expect(screen.findByTestId(PATH_PREFIX_TEST_ID)).resolves.toHaveValue(
'existing.prefix',
);
// Verify flattening is enabled
const enableFlatteningSwitch = screen.getAllByRole('switch')[0];
expect(enableFlatteningSwitch).toBeChecked();
expect(screen.getByTestId('enable-flattening-switch')).toBeChecked();
// Verify paths is enabled
const enablePathsSwitch = screen.getAllByRole('switch')[1];
expect(enablePathsSwitch).toBeChecked();
expect(screen.getByTestId('enable-paths-switch')).toBeChecked();
});
});
});

View File

@@ -1,17 +1,19 @@
import { screen, within } from '@testing-library/react';
import { Form } from 'antd';
import { ENVIRONMENT } from 'constants/env';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { PreferenceContextProvider } from 'providers/preferences/context/PreferenceContextProvider';
import {
findByText,
fireEvent,
render,
screen,
userEvent,
waitFor,
} from 'tests/test-utils';
import { PipelineData } from 'types/api/pipeline/def';
import { pipelineApiResponseMockData } from '../mocks/pipeline';
import AddNewPipeline from '../PipelineListsView/AddNewPipeline';
import PipelineListsView from '../PipelineListsView';
// Mock useUrlQuery hook
@@ -83,6 +85,21 @@ jest.mock('providers/preferences/sync/usePreferenceSync', () => ({
}),
}));
function EditPipelineForm(): JSX.Element {
const [form] = Form.useForm<PipelineData>();
return (
<AddNewPipeline
form={form}
isActionType="edit-pipeline"
setActionType={jest.fn()}
selectedPipelineData={pipelineApiResponseMockData.pipelines[0]}
setShowSaveButton={jest.fn()}
setCurrPipelineData={jest.fn()}
currPipelineData={pipelineApiResponseMockData.pipelines}
/>
);
}
const BASE_URL = ENVIRONMENT.baseURL;
const fieldKeysURL = `${BASE_URL}/api/v1/fields/keys`;
@@ -127,6 +144,7 @@ describe('PipelinePage container test', () => {
});
it('should render expanded content and edit mode correctly', async () => {
const user = userEvent.setup();
const { getByText } = render(
<PreferenceContextProvider>
<PipelineListsView
@@ -152,7 +170,7 @@ describe('PipelinePage container test', () => {
);
expect(expandIcon).toHaveLength(2);
await fireEvent.click(expandIcon[0]);
await user.click(expandIcon[0]);
// assert expanded view
expect(
@@ -164,6 +182,7 @@ describe('PipelinePage container test', () => {
});
it('should be able to perform actions and edit on expanded view content', async () => {
const user = userEvent.setup();
render(
<PreferenceContextProvider>
<PipelineListsView
@@ -187,14 +206,14 @@ describe('PipelinePage container test', () => {
'[data-testid="pipeline-row-expand"]',
);
expect(expandIcon).toHaveLength(2);
await fireEvent.click(expandIcon[0]);
await user.click(expandIcon[0]);
const switchToggle = document.querySelector(
'.ant-table-expanded-row [role="switch"]',
);
expect(switchToggle).toBeChecked();
await fireEvent.click(switchToggle as HTMLElement);
await user.click(switchToggle as HTMLElement);
expect(switchToggle).not.toBeChecked();
const deleteBtns = document.querySelectorAll(
@@ -204,7 +223,7 @@ describe('PipelinePage container test', () => {
expect(deleteBtns).toHaveLength(3);
// delete pipeline
await fireEvent.click(deleteBtns[0] as HTMLElement);
await user.click(deleteBtns[0] as HTMLElement);
let deleteConfirmationModal;
@@ -213,7 +232,7 @@ describe('PipelinePage container test', () => {
expect(deleteConfirmationModal).toBeInTheDocument();
});
await fireEvent.click(
await user.click(
(deleteConfirmationModal as unknown as HTMLElement)?.querySelector(
'.ant-modal-confirm-btns .ant-btn-primary',
) as HTMLElement,
@@ -227,6 +246,7 @@ describe('PipelinePage container test', () => {
});
it('should be able to toggle and delete pipeline', async () => {
const user = userEvent.setup();
const { getByText } = render(
<PreferenceContextProvider>
<PipelineListsView
@@ -246,14 +266,14 @@ describe('PipelinePage container test', () => {
const switchToggle = document.querySelectorAll('[role="switch"]');
expect(switchToggle[0]).not.toBeChecked();
await fireEvent.click(switchToggle[0] as HTMLElement);
await user.click(switchToggle[0] as HTMLElement);
expect(switchToggle[0]).toBeChecked();
// view pipeline
const viewBtn = document.querySelectorAll(
'[data-testid="pipeline-preview-action"]',
);
await fireEvent.click(viewBtn[0] as HTMLElement);
await user.click(viewBtn[0] as HTMLElement);
const viewPipelineModal = document.querySelector('.ant-modal-wrap');
expect(viewPipelineModal).toBeInTheDocument();
@@ -265,7 +285,7 @@ describe('PipelinePage container test', () => {
),
).resolves.toBeInTheDocument();
await fireEvent.click(
await user.click(
viewPipelineModal?.querySelector(
'button[class*="ant-modal-close"]',
) as HTMLElement,
@@ -276,7 +296,7 @@ describe('PipelinePage container test', () => {
);
// delete pipeline
await fireEvent.click(deleteBtns[0] as HTMLElement);
await user.click(deleteBtns[0] as HTMLElement);
await waitFor(() =>
expect(document.querySelector('.delete-pipeline')).toBeInTheDocument(),
@@ -288,7 +308,7 @@ describe('PipelinePage container test', () => {
).toBeInTheDocument(),
);
await fireEvent.click(
await user.click(
document.querySelector('.delete-pipeline-ok-text') as HTMLElement,
);
@@ -298,11 +318,11 @@ describe('PipelinePage container test', () => {
const saveBtn = getByText('save_configuration');
expect(saveBtn).toBeInTheDocument();
await fireEvent.click(saveBtn);
await user.click(saveBtn);
});
it('should have populated form fields when edit pipeline is clicked', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(
<PreferenceContextProvider>
<PipelineListsView
@@ -316,27 +336,17 @@ describe('PipelinePage container test', () => {
</PreferenceContextProvider>,
);
// content assertion
expect(
document.querySelectorAll('[data-testid="pipeline-edit-action"]'),
).toHaveLength(2);
// expand action
const expandIcon = document.querySelectorAll(
'[data-testid="pipeline-row-expand"]',
);
expect(expandIcon).toHaveLength(2);
await fireEvent.click(expandIcon[0]);
const editBtn = document.querySelectorAll(
'[data-testid="pipeline-edit-action"]',
);
const editBtn = screen.getAllByTestId('pipeline-edit-action');
expect(editBtn).toHaveLength(2);
// click on edit btn
await fireEvent.click(editBtn[0] as HTMLElement);
await user.click(editBtn[0]);
// to have length 2
expect(screen.queryAllByText('source = nginx')).toHaveLength(2);
});
it('should suggest attribute keys in the filter of the pipeline form', async () => {
const user = userEvent.setup();
server.use(
rest.get(fieldKeysURL, (_req, res, ctx) =>
res(
@@ -378,17 +388,15 @@ describe('PipelinePage container test', () => {
),
),
);
render(<EditPipelineForm />);
// Open Filter input and type to trigger suggestions
// Open Filter input to trigger suggestions
const filterSelect = screen.getByTestId('qb-search-select');
const input = within(filterSelect).getByRole('combobox') as HTMLInputElement;
await user.click(filterSelect.querySelector('input') as HTMLInputElement);
await user.click(input);
await waitFor(() =>
expect(screen.getByText('otelServiceName')).toBeInTheDocument(),
);
const serviceNameOccurences = await screen.findAllByText('service.name');
expect(serviceNameOccurences.length).toBeGreaterThanOrEqual(2);
await expect(
screen.findByText('otelServiceName'),
).resolves.toBeInTheDocument();
expect(screen.getAllByText('service.name').length).toBeGreaterThanOrEqual(2);
});
});

View File

@@ -46,7 +46,13 @@ function PlannedDowntimeActionsMenu({
className={styles.actions}
onClick={(event): void => event.stopPropagation()}
>
<Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Dropdown
items={menuItems}
nativeButton
align="end"
side="bottom"
testId={`downtime-actions-${downtime.id}`}
>
<Button
variant="outlined"
color="secondary"

View File

@@ -48,6 +48,7 @@ export function PlannedDowntimeDeleteModal(
onClick={onDeleteHandler}
className="delete-btn"
disabled={isDeleteLoading}
data-testid="planned-downtime-delete-confirm"
>
Delete Schedule
</Button>,

View File

@@ -470,6 +470,7 @@ export function PlannedDowntimeForm(
>
<RadioGroup
color="primary"
testId="planned-downtime-alert-scope"
items={[
{ value: 'all', label: 'All alert rules' },
{ value: 'specific', label: 'Specific alert rules' },

View File

@@ -1,6 +1,5 @@
import { UseQueryResult } from 'react-query';
import { VirtuosoMockContext } from 'react-virtuoso';
import { fireEvent, screen } from '@testing-library/react';
import type {
ListDowntimeSchedules200,
RenderErrorResponseDTO,
@@ -12,7 +11,7 @@ import {
} from 'api/generated/services/sigNoz.schemas';
import type { ErrorType } from 'api/generatedAPIInstance';
import { mockAppLocation, mockNavigate } from 'tests/router-mocks';
import { render, userEvent } from 'tests/test-utils';
import { render, screen, userEvent } from 'tests/test-utils';
import { USER_ROLES } from 'types/roles';
import { PlannedDowntime } from '../PlannedDowntime';
@@ -107,13 +106,6 @@ jest.mock('hooks/useUrlQuery', () => ({
default: (): URLSearchParams => mockUrlQuery,
}));
const mockSafeNavigate = jest.fn();
jest.mock('hooks/useSafeNavigate', () => ({
useSafeNavigate: (): { safeNavigate: jest.MockedFunction<() => void> } => ({
safeNavigate: mockSafeNavigate,
}),
}));
jest.mock('api/generated/services/downtimeschedules', () => ({
useListDowntimeSchedules: (): DowntimeQueryResult =>
mockDowntimeQueryResult as DowntimeQueryResult,
@@ -240,15 +232,14 @@ describe('PlannedDowntime Component', () => {
});
it('should filter downtime schedules by name when searching', async () => {
const user = userEvent.setup();
renderPage();
await expect(
screen.findByText(MOCK_DOWNTIME_1_NAME),
).resolves.toBeInTheDocument();
fireEvent.change(screen.getByTestId(SEARCH_TEST_ID), {
target: { value: MOCK_DOWNTIME_1_NAME },
});
await user.type(screen.getByTestId(SEARCH_TEST_ID), MOCK_DOWNTIME_1_NAME);
await expect(
screen.findByText(MOCK_DOWNTIME_1_NAME),
@@ -258,15 +249,14 @@ describe('PlannedDowntime Component', () => {
});
it('should filter downtime schedules with partial name match', async () => {
const user = userEvent.setup();
renderPage();
await expect(
screen.findByText(MOCK_DOWNTIME_1_NAME),
).resolves.toBeInTheDocument();
fireEvent.change(screen.getByTestId(SEARCH_TEST_ID), {
target: { value: '2' },
});
await user.type(screen.getByTestId(SEARCH_TEST_ID), '2');
await expect(
screen.findByText(MOCK_DOWNTIME_2_NAME),
@@ -276,11 +266,10 @@ describe('PlannedDowntime Component', () => {
});
it('should show no results when search term matches nothing', async () => {
const user = userEvent.setup();
renderPage();
fireEvent.change(screen.getByTestId(SEARCH_TEST_ID), {
target: { value: 'NonExistentDowntime' },
});
await user.type(screen.getByTestId(SEARCH_TEST_ID), 'NonExistentDowntime');
await expect(
screen.findByTestId('no-results-empty-state'),
@@ -289,14 +278,18 @@ describe('PlannedDowntime Component', () => {
});
it('opens the delete confirmation from the row actions', async () => {
const user = userEvent.setup();
renderPage();
await userEvent.click(await screen.findByTestId('downtime-actions-1'));
await userEvent.click(await screen.findByText('Delete'));
await user.click(await screen.findByTestId('downtime-actions-1'));
await user.click(await screen.findByTestId('downtime-actions-1-item-delete'));
await expect(
screen.findByRole('button', { name: 'Delete Schedule' }),
).resolves.toBeInTheDocument();
screen.findByTestId('planned-downtime-delete-confirm'),
).resolves.toHaveTextContent('Delete Schedule');
expect(
screen.getByText(/delete - Mock Downtime 1 schedule\?/),
).toBeInTheDocument();
});
it('hides row actions for viewers', async () => {
@@ -308,6 +301,9 @@ describe('PlannedDowntime Component', () => {
it('preserves existing query parameters such as sort and pagination when typing in search (Bug 54)', async () => {
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
mockAppLocation({
pathname: '/alerts',
search:
@@ -317,9 +313,7 @@ describe('PlannedDowntime Component', () => {
renderPage();
fireEvent.change(screen.getByTestId(SEARCH_TEST_ID), {
target: { value: 'query' },
});
await user.type(screen.getByTestId(SEARCH_TEST_ID), 'query');
jest.advanceTimersByTime(350);

View File

@@ -16,6 +16,12 @@ const ALERT_OPTIONS = [
];
const RULE_PICKER_PLACEHOLDER = 'Search for alert rules or groups...';
const ALL_SCOPE_TEST_ID = 'planned-downtime-alert-scope-item-all';
const SPECIFIC_SCOPE_TEST_ID = 'planned-downtime-alert-scope-item-specific';
function scopeLabel(testId: string): HTMLElement | null {
return screen.getByTestId(testId).closest('label');
}
function FormHarness({
initialValues,
@@ -50,12 +56,12 @@ describe('PlannedDowntimeForm alert rule scope', () => {
/>,
);
await expect(
screen.findByRole('radio', { name: 'All alert rules' }),
).resolves.toBeChecked();
expect(
screen.getByRole('radio', { name: 'Specific alert rules' }),
).not.toBeChecked();
await expect(screen.findByTestId(ALL_SCOPE_TEST_ID)).resolves.toBeChecked();
expect(scopeLabel(ALL_SCOPE_TEST_ID)).toHaveTextContent('All alert rules');
expect(screen.getByTestId(SPECIFIC_SCOPE_TEST_ID)).not.toBeChecked();
expect(scopeLabel(SPECIFIC_SCOPE_TEST_ID)).toHaveTextContent(
'Specific alert rules',
);
expect(screen.queryByText(RULE_PICKER_PLACEHOLDER)).not.toBeInTheDocument();
});
@@ -71,13 +77,9 @@ describe('PlannedDowntimeForm alert rule scope', () => {
/>,
);
await user.click(
await screen.findByRole('radio', { name: 'Specific alert rules' }),
);
await user.click(await screen.findByTestId(SPECIFIC_SCOPE_TEST_ID));
expect(
screen.getByRole('radio', { name: 'Specific alert rules' }),
).toBeChecked();
expect(screen.getByTestId(SPECIFIC_SCOPE_TEST_ID)).toBeChecked();
expect(screen.getByText(RULE_PICKER_PLACEHOLDER)).toBeInTheDocument();
});
@@ -93,7 +95,7 @@ describe('PlannedDowntimeForm alert rule scope', () => {
);
await expect(
screen.findByRole('radio', { name: 'Specific alert rules' }),
screen.findByTestId(SPECIFIC_SCOPE_TEST_ID),
).resolves.toBeChecked();
expect(screen.getByText('High CPU')).toBeInTheDocument();
});

View File

@@ -32,6 +32,45 @@ const RESET_PASSWORD_ENDPOINT = '*/api/v2/factor_password/reset';
const mockNavigate = navigate as jest.MockedFunction<typeof navigate>;
type User = ReturnType<typeof userEvent.setup>;
async function enterPassword(
user: User,
testId: 'password' | 'confirmPassword',
value: string,
): Promise<void> {
await user.click(screen.getByTestId(testId));
await user.paste(value);
}
function mockReset(): {
resetCalls: () => number;
holdResponse: () => () => void;
} {
let calls = 0;
let pending: Promise<void> = Promise.resolve();
server.use(
rest.post(RESET_PASSWORD_ENDPOINT, async (_req, res, ctx) => {
calls += 1;
await pending;
return res(
ctx.status(200),
ctx.json({ status: 'success', message: 'Password reset successfully' }),
);
}),
);
return {
resetCalls: (): number => calls,
holdResponse: (): (() => void) => {
let release: () => void = () => {};
pending = new Promise((resolve) => {
release = resolve;
});
return release;
},
};
}
describe('ResetPassword Component', () => {
beforeEach(() => {
jest.clearAllMocks();
@@ -53,33 +92,27 @@ describe('ResetPassword Component', () => {
expect(screen.getByText(/reset your password/i)).toBeInTheDocument();
expect(screen.getByTestId('password')).toBeInTheDocument();
expect(screen.getByTestId('confirmPassword')).toBeInTheDocument();
expect(
screen.getByRole('button', { name: /reset password/i }),
).toBeInTheDocument();
expect(screen.getByTestId('reset-password-submit')).toHaveTextContent(
/reset password/i,
);
expect(screen.getByText(/signoz 1\.0\.0/i)).toBeInTheDocument();
});
});
describe('Form Validation', () => {
it('disables submit button when passwords do not match', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<ResetPassword version="1.0.0" />, undefined, {
initialRoute: '/password-reset?token=reset-token-123',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /reset password/i,
});
const submitButton = screen.getByTestId('reset-password-submit');
expect(submitButton).toHaveAttribute('aria-disabled', 'true');
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password456');
await enterPassword(user, 'password', 'password123');
await enterPassword(user, 'confirmPassword', 'password456');
await user.tab(); // Blur the confirm password field to trigger validation
await waitFor(() => {
@@ -89,22 +122,16 @@ describe('ResetPassword Component', () => {
});
it('enables submit button when passwords match', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<ResetPassword version="1.0.0" />, undefined, {
initialRoute: '/password-reset?token=reset-token-123',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /reset password/i,
});
const submitButton = screen.getByTestId('reset-password-submit');
await user.type(passwordInput, 'newPassword123');
await user.type(confirmPasswordInput, 'newPassword123');
await enterPassword(user, 'password', 'newPassword123');
await enterPassword(user, 'confirmPassword', 'newPassword123');
// Wait for debounced validation
await waitFor(
@@ -116,27 +143,22 @@ describe('ResetPassword Component', () => {
});
it('clears password mismatch error when passwords match', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<ResetPassword version="1.0.0" />, undefined, {
initialRoute: '/password-reset?token=reset-token-123',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password456');
await enterPassword(user, 'password', 'password123');
await enterPassword(user, 'confirmPassword', 'password456');
await user.tab(); // Blur the confirm password field to trigger validation
await waitFor(() => {
expect(screen.getByText(/passwords don't match/i)).toBeInTheDocument();
});
await user.clear(confirmPasswordInput);
await user.type(confirmPasswordInput, 'password123');
await user.clear(screen.getByTestId('confirmPassword'));
await user.paste('password123');
await user.tab(); // Blur again to trigger validation
await waitFor(
@@ -150,29 +172,23 @@ describe('ResetPassword Component', () => {
});
it('clears password mismatch error when confirm password is emptied', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<ResetPassword version="1.0.0" />, undefined, {
initialRoute: '/password-reset?token=reset-token-123',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /reset password/i,
});
const submitButton = screen.getByTestId('reset-password-submit');
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password456');
await enterPassword(user, 'password', 'password123');
await enterPassword(user, 'confirmPassword', 'password456');
await user.tab();
await waitFor(() => {
expect(screen.getByText(/passwords don't match/i)).toBeInTheDocument();
});
await user.clear(confirmPasswordInput);
await user.clear(screen.getByTestId('confirmPassword'));
await waitFor(() => {
expect(
@@ -185,7 +201,7 @@ describe('ResetPassword Component', () => {
describe('Successful Password Reset', () => {
it('successfully resets password and redirects to login', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(RESET_PASSWORD_ENDPOINT, (_req, res, ctx) =>
@@ -203,16 +219,10 @@ describe('ResetPassword Component', () => {
initialRoute: '/password-reset?token=reset-token-123',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /reset password/i,
});
const submitButton = screen.getByTestId('reset-password-submit');
await user.type(passwordInput, 'newPassword123');
await user.type(confirmPasswordInput, 'newPassword123');
await enterPassword(user, 'password', 'newPassword123');
await enterPassword(user, 'confirmPassword', 'newPassword123');
await waitFor(
() => {
@@ -232,7 +242,7 @@ describe('ResetPassword Component', () => {
describe('Error Handling', () => {
it('displays error message when reset password API fails', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(RESET_PASSWORD_ENDPOINT, (_req, res, ctx) =>
@@ -252,16 +262,10 @@ describe('ResetPassword Component', () => {
initialRoute: '/password-reset?token=invalid-token',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /reset password/i,
});
const submitButton = screen.getByTestId('reset-password-submit');
await user.type(passwordInput, 'newPassword123');
await user.type(confirmPasswordInput, 'newPassword123');
await enterPassword(user, 'password', 'newPassword123');
await enterPassword(user, 'confirmPassword', 'newPassword123');
await waitFor(
() => {
@@ -272,15 +276,13 @@ describe('ResetPassword Component', () => {
await user.click(submitButton);
await waitFor(() => {
expect(
screen.getByText(/invalid or expired reset token/i),
).toBeInTheDocument();
});
await expect(
screen.findByText(/invalid or expired reset token/i),
).resolves.toBeInTheDocument();
});
it('does not show API error when password mismatch error is shown', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(RESET_PASSWORD_ENDPOINT, (_req, res, ctx) =>
@@ -300,13 +302,8 @@ describe('ResetPassword Component', () => {
initialRoute: '/password-reset?token=reset-token-123',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password456');
await enterPassword(user, 'password', 'password123');
await enterPassword(user, 'confirmPassword', 'password456');
await user.tab(); // Blur the confirm password field to trigger validation
await waitFor(() => {
@@ -316,7 +313,7 @@ describe('ResetPassword Component', () => {
});
it('clears API error when the user edits the password', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(RESET_PASSWORD_ENDPOINT, (_req, res, ctx) =>
@@ -336,16 +333,10 @@ describe('ResetPassword Component', () => {
initialRoute: '/password-reset?token=reset-token-123',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /reset password/i,
});
const submitButton = screen.getByTestId('reset-password-submit');
await user.type(passwordInput, 'weak');
await user.type(confirmPasswordInput, 'weak');
await enterPassword(user, 'password', 'weak');
await enterPassword(user, 'confirmPassword', 'weak');
await waitFor(() => {
expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
@@ -353,13 +344,11 @@ describe('ResetPassword Component', () => {
await user.click(submitButton);
await waitFor(() => {
expect(
screen.getByText(/password must be at least 8 characters long/i),
).toBeInTheDocument();
});
await expect(
screen.findByText(/password must be at least 8 characters long/i),
).resolves.toBeInTheDocument();
await user.type(passwordInput, 'Er1!');
await user.type(screen.getByTestId('password'), 'Er1!');
await waitFor(() => {
expect(
@@ -367,7 +356,7 @@ describe('ResetPassword Component', () => {
).not.toBeInTheDocument();
});
await user.type(confirmPasswordInput, 'Er1!');
await user.type(screen.getByTestId('confirmPassword'), 'Er1!');
await waitFor(() => {
expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
@@ -377,35 +366,18 @@ describe('ResetPassword Component', () => {
describe('Loading States', () => {
it('disables submit button during password reset', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(RESET_PASSWORD_ENDPOINT, (_req, res, ctx) =>
res(
ctx.delay(100),
ctx.status(200),
ctx.json({
status: 'success',
message: 'Password reset successfully',
}),
),
),
);
mockReset().holdResponse();
render(<ResetPassword version="1.0.0" />, undefined, {
initialRoute: '/password-reset?token=reset-token-123',
});
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /reset password/i,
});
const submitButton = screen.getByTestId('reset-password-submit');
await user.type(passwordInput, 'newPassword123');
await user.type(confirmPasswordInput, 'newPassword123');
await enterPassword(user, 'password', 'newPassword123');
await enterPassword(user, 'confirmPassword', 'newPassword123');
await waitFor(
() => {
@@ -424,50 +396,27 @@ describe('ResetPassword Component', () => {
});
describe('Enter key submission', () => {
function mockReset(delayMs = 0): { resetCalls: () => number } {
let calls = 0;
server.use(
rest.post(RESET_PASSWORD_ENDPOINT, (_req, res, ctx) => {
calls += 1;
return res(
ctx.delay(delayMs),
ctx.status(200),
ctx.json({ status: 'success', message: 'Password reset successfully' }),
);
}),
);
return { resetCalls: (): number => calls };
}
async function typeMatchingPasswords(
user: ReturnType<typeof userEvent.setup>,
): Promise<HTMLElement> {
await user.type(
screen.getByPlaceholderText(/enter new password/i),
'newPassword123',
);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
await user.type(confirmPasswordInput, 'newPassword123');
async function typeMatchingPasswords(user: User): Promise<void> {
await enterPassword(user, 'password', 'newPassword123');
await enterPassword(user, 'confirmPassword', 'newPassword123');
await waitFor(() => {
expect(
screen.getByRole('button', { name: /reset password/i }),
).not.toHaveAttribute('aria-disabled', 'true');
expect(screen.getByTestId('reset-password-submit')).not.toHaveAttribute(
'aria-disabled',
'true',
);
});
return confirmPasswordInput;
}
it('resets once on Enter in the confirm password field', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const { resetCalls } = mockReset();
render(<ResetPassword version="1.0.0" />, undefined, {
initialRoute: '/password-reset?token=reset-token-123',
});
const confirmPasswordInput = await typeMatchingPasswords(user);
await user.type(confirmPasswordInput, '{enter}');
await typeMatchingPasswords(user);
await user.keyboard('{enter}');
await waitFor(() => {
expect(mockNavigate).toHaveBeenCalledWith(ROUTES.LOGIN);
@@ -476,24 +425,20 @@ describe('ResetPassword Component', () => {
});
it('does not reset on Enter while the passwords do not match', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const { resetCalls } = mockReset();
render(<ResetPassword version="1.0.0" />, undefined, {
initialRoute: '/password-reset?token=reset-token-123',
});
await user.type(
screen.getByPlaceholderText(/enter new password/i),
'password123',
await enterPassword(user, 'password', 'password123');
await enterPassword(user, 'confirmPassword', 'password456');
await user.keyboard('{enter}');
expect(screen.getByTestId('reset-password-submit')).toHaveAttribute(
'aria-disabled',
'true',
);
await user.type(
screen.getByPlaceholderText(/confirm your new password/i),
'password456{enter}',
);
expect(
screen.getByRole('button', { name: /reset password/i }),
).toHaveAttribute('aria-disabled', 'true');
// Give a wrongly sent request time to land before asserting it never did.
await new Promise((resolve) => setTimeout(resolve, 150));
@@ -501,29 +446,29 @@ describe('ResetPassword Component', () => {
});
it('does not reset again on Enter while the first reset is loading', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const { resetCalls } = mockReset(1000);
const user = userEvent.setup();
const { resetCalls, holdResponse } = mockReset();
const releaseResponse = holdResponse();
render(<ResetPassword version="1.0.0" />, undefined, {
initialRoute: '/password-reset?token=reset-token-123',
});
const confirmPasswordInput = await typeMatchingPasswords(user);
await user.type(confirmPasswordInput, '{enter}');
await typeMatchingPasswords(user);
await user.keyboard('{enter}');
await waitFor(() => {
expect(
screen.getByRole('button', { name: /reset password/i }),
).toHaveAttribute('aria-disabled', 'true');
expect(screen.getByTestId('reset-password-submit')).toHaveAttribute(
'aria-disabled',
'true',
);
});
await user.type(confirmPasswordInput, '{enter}');
await user.keyboard('{enter}');
await waitFor(
() => {
expect(mockNavigate).toHaveBeenCalledWith(ROUTES.LOGIN);
},
{ timeout: 2000 },
);
releaseResponse();
await waitFor(() => {
expect(mockNavigate).toHaveBeenCalledWith(ROUTES.LOGIN);
});
expect(resetCalls()).toBe(1);
});
});

View File

@@ -4,7 +4,34 @@ import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
import { expandResourceCard, renderCreateRolePage } from './testUtils';
jest.setTimeout(15_000);
type User = ReturnType<typeof userEvent.setup>;
const getScopeButton = (scope: 'none' | 'all' | 'only_selected'): HTMLElement =>
screen.getByTestId(`action-toggle-scope-factor-api-key-read-button-${scope}`);
async function chooseOnlySelected(user: User): Promise<void> {
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await user.click(getScopeButton('only_selected'));
}
async function addItems(user: User, text: string): Promise<void> {
await user.click(
screen.getByTestId('item-input-selector-input-factor-api-key-read'),
);
await user.paste(text);
await user.keyboard('{enter}');
}
function getBadgeCloseButton(index: number): HTMLElement {
const closeButton = screen
.getByTestId(`item-badge-factor-api-key-read-${index}`)
.querySelector<HTMLElement>('[data-slot="pill-close"]');
if (!closeButton) {
throw new Error(`badge ${index} has no close button`);
}
return closeButton;
}
beforeEach(() => {
server.use(setupAuthzAdmin());
@@ -146,17 +173,8 @@ describe('PermissionEditor', () => {
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
const scopeToggle = within(createToggle).getByTestId(
'action-toggle-scope-factor-api-key-read',
);
expect(
within(scopeToggle).getByRole('button', { name: 'None' }),
).toHaveAttribute('aria-pressed', 'true');
expect(getScopeButton('none')).toHaveTextContent('None');
expect(getScopeButton('none')).toHaveAttribute('aria-pressed', 'true');
});
it('changes scope to All when clicked', async () => {
@@ -164,20 +182,10 @@ describe('PermissionEditor', () => {
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(getScopeButton('all'));
const allBtn = await within(createToggle).findByText('All');
await user.click(allBtn);
const scopeToggle = within(createToggle).getByTestId(
'action-toggle-scope-factor-api-key-read',
);
expect(
within(scopeToggle).getByRole('button', { name: 'All' }),
).toHaveAttribute('aria-pressed', 'true');
expect(getScopeButton('all')).toHaveTextContent('All');
expect(getScopeButton('all')).toHaveAttribute('aria-pressed', 'true');
});
it('updates granted count when scope changed', async () => {
@@ -186,11 +194,7 @@ describe('PermissionEditor', () => {
await expandResourceCard('factor-api-key');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('All'));
await user.click(getScopeButton('all'));
await expect(
within(apiKeyCard).findByText(/1 \/ \d+ granted/),
@@ -201,17 +205,7 @@ describe('PermissionEditor', () => {
describe('Only Selected scope', () => {
it('shows item input selector when Only Selected is chosen', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
const onlySelectedBtn =
await within(createToggle).findByText('Only selected');
await user.click(onlySelectedBtn);
await chooseOnlySelected(user);
expect(
screen.getByTestId('item-input-selector-factor-api-key-read'),
@@ -220,40 +214,21 @@ describe('PermissionEditor', () => {
it('adds item when typed and Enter pressed', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'api-key-001{enter}');
await addItems(user, 'api-key-001');
await expect(screen.findByText('api-key-001')).resolves.toBeInTheDocument();
});
it('adds item when Add button clicked', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
await user.click(
screen.getByTestId('item-input-selector-input-factor-api-key-read'),
);
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'api-key-002');
await user.paste('api-key-002');
const addBtn = screen.getByTestId(
'item-input-selector-add-btn-factor-api-key-read',
@@ -265,20 +240,9 @@ describe('PermissionEditor', () => {
it('adds multiple items separated by comma', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'key-a, key-b, key-c{enter}');
await addItems(user, 'key-a, key-b, key-c');
await expect(screen.findByText('key-a')).resolves.toBeInTheDocument();
await expect(screen.findByText('key-b')).resolves.toBeInTheDocument();
@@ -287,20 +251,9 @@ describe('PermissionEditor', () => {
it('adds multiple items separated by space', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'key-x key-y key-z{enter}');
await addItems(user, 'key-x key-y key-z');
await expect(screen.findByText('key-x')).resolves.toBeInTheDocument();
await expect(screen.findByText('key-y')).resolves.toBeInTheDocument();
@@ -309,21 +262,10 @@ describe('PermissionEditor', () => {
it('does not add duplicate items', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'same-key{enter}');
await user.type(input, 'same-key{enter}');
await addItems(user, 'same-key');
await addItems(user, 'same-key');
const badges = screen.getAllByText('same-key');
expect(badges).toHaveLength(1);
@@ -331,25 +273,13 @@ describe('PermissionEditor', () => {
it('removes item when X clicked', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await addItems(user, 'removable-key');
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'removable-key{enter}');
const badge = await screen.findByTestId('item-badge-factor-api-key-read-0');
const removeBtn = within(badge).getByRole('button', {
name: 'Remove removable-key',
});
await screen.findByTestId('item-badge-factor-api-key-read-0');
const removeBtn = getBadgeCloseButton(0);
expect(removeBtn).toHaveAttribute('aria-label', 'Remove removable-key');
await user.click(removeBtn);
expect(screen.queryByText('removable-key')).not.toBeInTheDocument();
@@ -357,48 +287,27 @@ describe('PermissionEditor', () => {
it('names each badge close button after the item it removes', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const readToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
await addItems(user, 'key-one key-two');
await screen.findByTestId('item-badge-factor-api-key-read-1');
expect(getBadgeCloseButton(0)).toHaveAttribute(
'aria-label',
'Remove key-one',
);
await user.click(await within(readToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
expect(getBadgeCloseButton(1)).toHaveAttribute(
'aria-label',
'Remove key-two',
);
await user.type(input, 'key-one key-two{enter}');
const firstBadge = await screen.findByTestId(
'item-badge-factor-api-key-read-0',
);
const secondBadge = screen.getByTestId('item-badge-factor-api-key-read-1');
expect(
within(firstBadge).getByRole('button', { name: 'Remove key-one' }),
).toBeInTheDocument();
expect(
within(secondBadge).getByRole('button', { name: 'Remove key-two' }),
).toBeInTheDocument();
});
it('exposes the full item value as a title so truncated badges stay readable', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const readToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(readToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'a-very-long-api-key-identifier-000001{enter}');
await addItems(user, 'a-very-long-api-key-identifier-000001');
const badge = await screen.findByTestId('item-badge-factor-api-key-read-0');
expect(
@@ -408,79 +317,47 @@ describe('PermissionEditor', () => {
it('moves focus to the previous badge when closed with the keyboard', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const readToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(readToggle).findByText('Only selected'));
await addItems(user, 'key-one key-two');
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'key-one key-two{enter}');
const secondBadge = await screen.findByTestId(
'item-badge-factor-api-key-read-1',
);
within(secondBadge).getByRole('button', { name: 'Remove key-two' }).focus();
await screen.findByTestId('item-badge-factor-api-key-read-1');
getBadgeCloseButton(1).focus();
await user.keyboard('{Enter}');
await waitFor(() => {
const firstBadge = screen.getByTestId('item-badge-factor-api-key-read-0');
expect(
within(firstBadge).getByRole('button', { name: 'Remove key-one' }),
).toHaveFocus();
expect(getBadgeCloseButton(0)).toHaveFocus();
});
expect(getBadgeCloseButton(0)).toHaveAttribute(
'aria-label',
'Remove key-one',
);
});
it('does not steal focus when a badge is closed with the mouse', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const readToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(readToggle).findByText('Only selected'));
await addItems(user, 'key-one key-two');
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'key-one key-two{enter}');
const secondBadge = await screen.findByTestId(
'item-badge-factor-api-key-read-1',
);
await user.click(
within(secondBadge).getByRole('button', { name: 'Remove key-two' }),
);
await screen.findByTestId('item-badge-factor-api-key-read-1');
await user.click(getBadgeCloseButton(1));
await waitFor(() => {
expect(screen.queryByText('key-two')).not.toBeInTheDocument();
});
const firstBadge = screen.getByTestId('item-badge-factor-api-key-read-0');
expect(
within(firstBadge).getByRole('button', { name: 'Remove key-one' }),
).not.toHaveFocus();
expect(getBadgeCloseButton(0)).toHaveAttribute(
'aria-label',
'Remove key-one',
);
expect(getBadgeCloseButton(0)).not.toHaveFocus();
});
it('shows Add button disabled when input is empty', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('Only selected'));
await chooseOnlySelected(user);
const addBtn = screen.getByTestId(
'item-input-selector-add-btn-factor-api-key-read',
@@ -492,22 +369,11 @@ describe('PermissionEditor', () => {
describe('scope change confirmation dialog', () => {
it('shows confirm dialog when leaving Only Selected with items', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await addItems(user, 'will-be-cleared');
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'will-be-cleared{enter}');
await user.click(await within(createToggle).findByText('All'));
await user.click(getScopeButton('all'));
await expect(
screen.findByText('Change permission scope?'),
@@ -516,27 +382,16 @@ describe('PermissionEditor', () => {
it('clears items when confirmed', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'to-be-cleared{enter}');
await user.click(await within(createToggle).findByText('All'));
const dialog = await screen.findByRole('dialog');
await user.click(
within(dialog).getByRole('button', { name: /change scope/i }),
await addItems(user, 'to-be-cleared');
await user.click(getScopeButton('all'));
const dialog = await screen.findByTestId(
'action-toggle-scope-dialog-factor-api-key-read',
);
await user.click(within(dialog).getByText('Change scope'));
await waitFor(() => {
expect(screen.queryByText('to-be-cleared')).not.toBeInTheDocument();
@@ -545,25 +400,16 @@ describe('PermissionEditor', () => {
it('keeps items when cancelled', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
await chooseOnlySelected(user);
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
await addItems(user, 'preserved-key');
await user.click(getScopeButton('none'));
const dialog = await screen.findByTestId(
'action-toggle-scope-dialog-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('Only selected'));
const input = screen.getByTestId(
'item-input-selector-input-factor-api-key-read',
);
await user.type(input, 'preserved-key{enter}');
await user.click(await within(createToggle).findByText('None'));
const dialog = await screen.findByRole('dialog');
await user.click(within(dialog).getByRole('button', { name: /cancel/i }));
await user.click(within(dialog).getByText('Cancel'));
await expect(
screen.findByText('preserved-key'),
@@ -576,16 +422,8 @@ describe('PermissionEditor', () => {
it('does not show dialog when leaving Only Selected with no items', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const createToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
await user.click(await within(createToggle).findByText('Only selected'));
await user.click(await within(createToggle).findByText('All'));
await chooseOnlySelected(user);
await user.click(getScopeButton('all'));
expect(
screen.queryByText('Change permission scope?'),
@@ -643,8 +481,8 @@ describe('PermissionEditor', () => {
const user = userEvent.setup();
await renderCreateRolePage();
const nameInput = screen.getByTestId('role-name-input');
await user.type(nameInput, 'valid-role');
await user.click(screen.getByTestId('role-name-input'));
await user.paste('valid-role');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const header = within(apiKeyCard).getByTestId(
@@ -652,11 +490,7 @@ describe('PermissionEditor', () => {
);
await user.click(header);
const readToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
const onlySelectedBtn = await within(readToggle).findByText('Only selected');
await user.click(onlySelectedBtn);
await user.click(getScopeButton('only_selected'));
await user.click(header);
@@ -673,8 +507,8 @@ describe('PermissionEditor', () => {
const user = userEvent.setup();
await renderCreateRolePage();
const nameInput = screen.getByTestId('role-name-input');
await user.type(nameInput, 'valid-role');
await user.click(screen.getByTestId('role-name-input'));
await user.paste('valid-role');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const header = within(apiKeyCard).getByTestId(
@@ -682,11 +516,7 @@ describe('PermissionEditor', () => {
);
await user.click(header);
const readToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
const onlySelectedBtn = await within(readToggle).findByText('Only selected');
await user.click(onlySelectedBtn);
await user.click(getScopeButton('only_selected'));
await user.click(header);
@@ -710,8 +540,8 @@ describe('PermissionEditor', () => {
const user = userEvent.setup();
await renderCreateRolePage();
const nameInput = screen.getByTestId('role-name-input');
await user.type(nameInput, 'valid-role');
await user.click(screen.getByTestId('role-name-input'));
await user.paste('valid-role');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const header = within(apiKeyCard).getByTestId(
@@ -719,11 +549,7 @@ describe('PermissionEditor', () => {
);
await user.click(header);
const readToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
const onlySelectedBtn = await within(readToggle).findByText('Only selected');
await user.click(onlySelectedBtn);
await user.click(getScopeButton('only_selected'));
await user.click(header);

View File

@@ -1,10 +1,12 @@
import { server } from 'mocks-server/server';
import { screen, userEvent, waitFor, within } from 'tests/test-utils';
import { render, screen, userEvent, waitFor, within } from 'tests/test-utils';
import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
import { AuthZResource } from 'lib/authz/hooks/useAuthZ/types';
import TelemetrySelectorWizard from '../components/TelemetrySelectorWizard';
import { expandResourceCard, renderCreateRolePage } from './testUtils';
jest.setTimeout(15_000);
type User = ReturnType<typeof userEvent.setup>;
beforeEach(() => {
server.use(setupAuthzAdmin());
@@ -14,74 +16,100 @@ afterEach(() => {
server.resetHandlers();
});
async function selectOnlySelected(
user: ReturnType<typeof userEvent.setup>,
resource = 'logs',
): Promise<void> {
async function selectOnlySelected(user: User, resource: string): Promise<void> {
await renderCreateRolePage();
await expandResourceCard(resource);
const card = screen.getByTestId(`resource-card-${resource}`);
const readToggle = within(card).getByTestId(`action-toggle-${resource}-read`);
await user.click(await within(readToggle).findByText('Only selected'));
}
async function selectLogsOnlySelected(
user: ReturnType<typeof userEvent.setup>,
): Promise<void> {
await selectOnlySelected(user, 'logs');
await user.click(
screen.getByTestId(
`action-toggle-scope-${resource}-read-button-only_selected`,
),
);
}
async function openWizard(
user: ReturnType<typeof userEvent.setup>,
resource = 'logs',
): Promise<void> {
await selectOnlySelected(user, resource);
user: User,
resource: AuthZResource = 'logs',
): Promise<jest.Mock> {
const onAdd = jest.fn();
render(
<TelemetrySelectorWizard
resource={resource}
testId={`${resource}-read`}
onAdd={onAdd}
/>,
);
await user.click(
screen.getByTestId(`telemetry-wizard-trigger-${resource}-read`),
);
await screen.findByTestId(`telemetry-wizard-dialog-${resource}-read`);
return onAdd;
}
async function openLogsWizard(
user: ReturnType<typeof userEvent.setup>,
): Promise<void> {
await openWizard(user, 'logs');
async function typeSelector(user: User, selector: string): Promise<void> {
await user.clear(screen.getByTestId('wizard-selector-input-logs-read'));
await user.paste(selector);
}
describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('shows wizard button for telemetry resources', async () => {
const user = userEvent.setup();
await selectLogsOnlySelected(user);
describe('in the permission editor', () => {
it('shows wizard button for telemetry resources', async () => {
const user = userEvent.setup();
await selectOnlySelected(user, 'logs');
expect(
screen.getByTestId('telemetry-wizard-trigger-logs-read'),
).toBeInTheDocument();
});
expect(
screen.getByTestId('telemetry-wizard-trigger-logs-read'),
).toBeInTheDocument();
});
it('does not show wizard button for non-telemetry resources', async () => {
await renderCreateRolePage();
await expandResourceCard('factor-api-key');
it('does not show wizard button for non-telemetry resources', async () => {
const user = userEvent.setup();
await selectOnlySelected(user, 'factor-api-key');
const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
const readToggle = within(apiKeyCard).getByTestId(
'action-toggle-factor-api-key-read',
);
expect(
within(screen.getByTestId('resource-card-factor-api-key')).queryByTestId(
'telemetry-wizard-trigger-factor-api-key-read',
),
).not.toBeInTheDocument();
});
const user = userEvent.setup();
await user.click(await within(readToggle).findByText('Only selected'));
it('adds a query-type wildcard when the value is left empty', async () => {
const user = userEvent.setup();
await selectOnlySelected(user, 'logs');
expect(
within(apiKeyCard).queryByTestId(
'telemetry-wizard-trigger-factor-api-key-read',
),
).not.toBeInTheDocument();
await user.click(screen.getByTestId('telemetry-wizard-trigger-logs-read'));
await user.click(await screen.findByTestId('wizard-add-btn-logs-read'));
await expect(
screen.findByText('builder_query/*'),
).resolves.toBeInTheDocument();
});
it('does not add duplicate selectors', async () => {
const user = userEvent.setup();
await selectOnlySelected(user, 'logs');
await user.click(screen.getByTestId('telemetry-wizard-trigger-logs-read'));
await user.click(await screen.findByTestId('wizard-add-btn-logs-read'));
await user.click(screen.getByTestId('telemetry-wizard-trigger-logs-read'));
await user.click(await screen.findByTestId('wizard-add-btn-logs-read'));
const badges = screen.getAllByText('builder_query/*');
expect(badges).toHaveLength(1);
});
});
it('opens wizard dialog when trigger clicked', async () => {
const user = userEvent.setup();
await selectLogsOnlySelected(user);
render(
<TelemetrySelectorWizard
resource="logs"
testId="logs-read"
onAdd={jest.fn()}
/>,
);
await user.click(screen.getByTestId('telemetry-wizard-trigger-logs-read'));
@@ -90,20 +118,9 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
).resolves.toBeInTheDocument();
});
it('adds a query-type wildcard when the value is left empty', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
await expect(
screen.findByText('builder_query/*'),
).resolves.toBeInTheDocument();
});
it('does not offer builder sub query', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
@@ -112,7 +129,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('does not show PromQL for logs', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
@@ -134,7 +151,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('allows PromQL for metrics', async () => {
const user = userEvent.setup();
await openWizard(user, 'metrics');
const onAdd = await openWizard(user, 'metrics');
await user.click(screen.getByTestId('wizard-query-type-select-metrics-read'));
await user.click(
@@ -143,12 +160,12 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
await user.click(screen.getByTestId('wizard-add-btn-metrics-read'));
await expect(screen.findByText('promql/*')).resolves.toBeInTheDocument();
expect(onAdd).toHaveBeenCalledWith('promql/*');
});
it('defaults the key to signoz.workspace.key.id', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
expect(screen.getByTestId('wizard-key-select-logs-read')).toHaveTextContent(
'signoz.workspace.key.id',
@@ -157,7 +174,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('rewrites the selector when another key is picked', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
const onAdd = await openWizard(user);
await user.type(
screen.getByTestId('wizard-value-input-logs-read'),
@@ -176,19 +193,17 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
await expect(
screen.findByText('builder_query/resource.service.name/checkout'),
).resolves.toBeInTheDocument();
expect(onAdd).toHaveBeenCalledWith(
'builder_query/resource.service.name/checkout',
);
});
it('folds the resource prefix of the workspace key from a typed selector', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(
selectorInput,
await typeSelector(
user,
'builder_query/resource.signoz.workspace.key.id/key-a',
);
@@ -198,19 +213,17 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
await user.type(screen.getByTestId('wizard-value-input-logs-read'), '2');
expect(selectorInput).toHaveValue(
expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
'builder_query/signoz.workspace.key.id/key-a2',
);
});
it('accepts the resource-prefixed workspace key in the hint', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(
selectorInput,
await typeSelector(
user,
'builder_query/resource.signoz.workspace.key.id/key-a',
);
@@ -223,12 +236,10 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('selects the key from a typed selector', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(
selectorInput,
await typeSelector(
user,
'builder_query/resource.deployment.environment.name/prod',
);
@@ -242,11 +253,9 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('hints when a typed selector uses an unsupported key', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(selectorInput, 'builder_query/host.name/web-1');
await typeSelector(user, 'builder_query/host.name/web-1');
expect(screen.getByTestId('wizard-key-select-logs-read')).toHaveTextContent(
'signoz.workspace.key.id',
@@ -258,10 +267,14 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('hides Key field for query types that do not support key scoping', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
await user.click(await screen.findByText('ClickHouse SQL'));
await user.click(
await screen.findByTestId(
'wizard-query-type-option-clickhouse_sql-logs-read',
),
);
expect(
screen.queryByTestId('wizard-key-select-logs-read'),
@@ -270,7 +283,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('adds a key-scoped selector when the value is filled', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
const onAdd = await openWizard(user);
await user.type(screen.getByTestId('wizard-value-input-logs-read'), '123');
@@ -280,31 +293,33 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
await expect(
screen.findByText('builder_query/signoz.workspace.key.id/123'),
).resolves.toBeInTheDocument();
expect(onAdd).toHaveBeenCalledWith(
'builder_query/signoz.workspace.key.id/123',
);
});
it('replaces the value with a wildcard when any resource is checked', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
const onAdd = await openWizard(user);
await user.click(screen.getByRole('checkbox', { name: 'Any value' }));
await user.click(
screen.getByTestId('wizard-any-resource-checkbox-logs-read'),
);
expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue('*');
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
await expect(
screen.findByText('builder_query/signoz.workspace.key.id/*'),
).resolves.toBeInTheDocument();
expect(onAdd).toHaveBeenCalledWith('builder_query/signoz.workspace.key.id/*');
});
it('clears the value when any resource is unchecked', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const anyResource = screen.getByRole('checkbox', { name: 'Any value' });
const anyResource = screen.getByTestId(
'wizard-any-resource-checkbox-logs-read',
);
await user.click(anyResource);
expect(anyResource).toBeChecked();
@@ -316,35 +331,44 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('checks any resource when the value is typed as a wildcard', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.type(screen.getByTestId('wizard-value-input-logs-read'), '*');
expect(screen.getByRole('checkbox', { name: 'Any value' })).toBeChecked();
expect(
screen.getByTestId('wizard-any-resource-checkbox-logs-read'),
).toBeChecked();
});
it('disables value scoping for query types that do not support it', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
await user.click(await screen.findByText('ClickHouse SQL'));
await user.click(
await screen.findByTestId(
'wizard-query-type-option-clickhouse_sql-logs-read',
),
);
expect(screen.getByTestId('wizard-value-input-logs-read')).toBeDisabled();
expect(screen.getByRole('checkbox', { name: 'Any value' })).toHaveAttribute(
'aria-disabled',
'true',
);
expect(
screen.getByTestId('wizard-any-resource-checkbox-logs-read'),
).toHaveAttribute('aria-disabled', 'true');
});
it('clears the value when switching to a query type without key scoping', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
const onAdd = await openWizard(user);
await user.type(screen.getByTestId('wizard-value-input-logs-read'), '123');
await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
await user.click(await screen.findByText('ClickHouse SQL'));
await user.click(
await screen.findByTestId(
'wizard-query-type-option-clickhouse_sql-logs-read',
),
);
expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue('');
expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
@@ -353,26 +377,18 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
await expect(
screen.findByText('clickhouse_sql/*'),
).resolves.toBeInTheDocument();
expect(onAdd).toHaveBeenCalledWith('clickhouse_sql/*');
});
it('follows a hand-edited selector on the query type and value inputs', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(
selectorInput,
'clickhouse_sql/signoz.workspace.key.id/checkout',
);
await typeSelector(user, 'clickhouse_sql/signoz.workspace.key.id/checkout');
const selectTrigger = screen.getByTestId(
'wizard-query-type-select-logs-read',
);
expect(within(selectTrigger).getByText('ClickHouse SQL')).toBeInTheDocument();
expect(
screen.getByTestId('wizard-query-type-select-logs-read'),
).toHaveTextContent('ClickHouse SQL');
expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue(
'checkout',
);
@@ -380,26 +396,24 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('checks any resource when the selector is edited to a wildcard value', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(selectorInput, 'builder_query/signoz.workspace.key.id/*');
await typeSelector(user, 'builder_query/signoz.workspace.key.id/*');
expect(screen.getByRole('checkbox', { name: 'Any value' })).toBeChecked();
expect(
screen.getByTestId('wizard-any-resource-checkbox-logs-read'),
).toBeChecked();
});
it('restores the selected key in the selector once the value changes', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(selectorInput, 'builder_query/host.name/web-1');
await typeSelector(user, 'builder_query/host.name/web-1');
await user.type(screen.getByTestId('wizard-value-input-logs-read'), '2');
expect(selectorInput).toHaveValue(
expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
'builder_query/signoz.workspace.key.id/web-12',
);
expect(screen.getByTestId('wizard-add-btn-logs-read')).not.toHaveAttribute(
@@ -410,11 +424,9 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('blocks adding when the selector has an unknown query type', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(selectorInput, 'sql_query/*');
await typeSelector(user, 'sql_query/*');
expect(
screen.getByTestId('wizard-selector-hint-logs-read'),
@@ -427,7 +439,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('blocks adding when the selector is emptied', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.clear(screen.getByTestId('wizard-selector-input-logs-read'));
@@ -442,22 +454,20 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('adds the hand-edited selector verbatim', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
const onAdd = await openWizard(user);
const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
await user.clear(selectorInput);
await user.type(selectorInput, 'builder_query/signoz.workspace.key.id/a/b');
await typeSelector(user, 'builder_query/signoz.workspace.key.id/a/b');
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
await expect(
screen.findByText('builder_query/signoz.workspace.key.id/a/b'),
).resolves.toBeInTheDocument();
expect(onAdd).toHaveBeenCalledWith(
'builder_query/signoz.workspace.key.id/a/b',
);
});
it('closes dialog after adding selector', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
@@ -468,28 +478,19 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
});
});
it('does not add duplicate selectors', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
await user.click(screen.getByTestId('telemetry-wizard-trigger-logs-read'));
await screen.findByTestId('telemetry-wizard-dialog-logs-read');
await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
const badges = screen.getAllByText('builder_query/*');
expect(badges).toHaveLength(1);
});
it('resets wizard state when dialog is closed and reopened', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.type(screen.getByTestId('wizard-value-input-logs-read'), '123');
await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
await user.click(await screen.findByText('ClickHouse SQL'));
await user.click(
await screen.findByTestId(
'wizard-query-type-option-clickhouse_sql-logs-read',
),
);
await user.click(screen.getByRole('button', { name: /cancel/i }));
await user.click(screen.getByTestId('wizard-cancel-btn-logs-read'));
await waitFor(() => {
expect(
@@ -502,7 +503,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
'wizard-query-type-select-logs-read',
);
expect(within(selectTrigger).getByText('Builder Query')).toBeInTheDocument();
expect(selectTrigger).toHaveTextContent('Builder Query');
expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue('');
expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
'builder_query/*',
@@ -511,7 +512,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('previews the query-type wildcard while the value is empty', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
'builder_query/*',
@@ -523,7 +524,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('describes a key-scoped selector', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.type(screen.getByTestId('wizard-value-input-logs-read'), '123');
@@ -536,9 +537,11 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('describes an any-resource selector', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.click(screen.getByRole('checkbox', { name: 'Any value' }));
await user.click(
screen.getByTestId('wizard-any-resource-checkbox-logs-read'),
);
expect(
screen.getByTestId('wizard-selector-hint-logs-read'),
@@ -549,7 +552,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
it('does not show query type descriptions', async () => {
const user = userEvent.setup();
await openLogsWizard(user);
await openWizard(user);
await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));

View File

@@ -158,6 +158,7 @@ function ActionToggle({
}
}}
title="Change permission scope?"
testId={`action-toggle-scope-dialog-${resource}-${action}`}
confirmText="Change scope"
cancelText="Cancel"
onConfirm={handleConfirmScopeChange}

View File

@@ -74,6 +74,7 @@ function TelemetrySelectorWizard({
variant="ghost"
color="secondary"
onClick={(): void => handleOpenChange(false)}
testId={`wizard-cancel-btn-${testId}`}
>
Cancel
</Button>

View File

@@ -113,7 +113,10 @@ function RoutingPolicyDetails({
},
]}
>
<Input placeholder="e.g. Base routing policy..." />
<Input
placeholder="e.g. Base routing policy..."
data-testid="routing-policy-name-input"
/>
</Form.Item>
</div>
<div className="input-group">
@@ -128,6 +131,7 @@ function RoutingPolicyDetails({
>
<Input.TextArea
placeholder="e.g. This is a routing policy that..."
data-testid="routing-policy-description-input"
autoSize={{ minRows: 1, maxRows: 6 }}
style={{ resize: 'none' }}
/>
@@ -146,6 +150,7 @@ function RoutingPolicyDetails({
>
<Input.TextArea
placeholder='e.g. service.name == "payment" && threshold.name == "critical"'
data-testid="routing-policy-expression-input"
autoSize={{ minRows: 1, maxRows: 6 }}
style={{ resize: 'none' }}
/>
@@ -181,6 +186,7 @@ function RoutingPolicyDetails({
status={isErrorChannels ? 'error' : undefined}
disabled={isLoadingChannels}
notFoundContent={notificationChannelsNotFoundContent}
data-testid="routing-policy-channels-select"
/>
</Form.Item>
</div>
@@ -190,6 +196,7 @@ function RoutingPolicyDetails({
icon={<X size={16} />}
onClick={closeModal}
disabled={isPolicyDetailsModalActionLoading}
data-testid="routing-policy-cancel"
>
Cancel
</Button>
@@ -199,6 +206,7 @@ function RoutingPolicyDetails({
htmlType="submit"
loading={isPolicyDetailsModalActionLoading}
disabled={isPolicyDetailsModalActionLoading}
data-testid="routing-policy-save"
>
Save Routing Policy
</Button>

View File

@@ -1,16 +1,14 @@
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import * as appHooks from 'providers/App/App';
import type { ComponentProps } from 'react';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { USER_ROLES } from 'types/roles';
import RoutingPolicyDetails from '../RoutingPolicyDetails';
import {
getAppContextMockState,
MOCK_CHANNEL_1,
MOCK_CHANNEL_2,
MOCK_ROUTING_POLICY_1,
} from './testUtils';
jest.spyOn(appHooks, 'useAppContext').mockReturnValue(getAppContextMockState());
const mockHandlePolicyDetailsModalAction = jest.fn();
const mockCloseModal = jest.fn();
const mockChannels = [MOCK_CHANNEL_1, MOCK_CHANNEL_2];
@@ -23,47 +21,58 @@ const NEW_DESCRIPTION = 'New Description';
const SAVE_BUTTON_TEXT = 'Save Routing Policy';
const NO_CHANNELS_FOUND_TEXT = 'No channels yet.';
const NAME_INPUT = 'routing-policy-name-input';
const EXPRESSION_INPUT = 'routing-policy-expression-input';
const DESCRIPTION_INPUT = 'routing-policy-description-input';
const CHANNELS_SELECT = 'routing-policy-channels-select';
const CANCEL_BUTTON = 'routing-policy-cancel';
const SAVE_BUTTON = 'routing-policy-save';
type Props = ComponentProps<typeof RoutingPolicyDetails>;
function renderDetails(
props: Partial<Props> = {},
role: string = USER_ROLES.ADMIN,
): void {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
{...props}
/>,
undefined,
{ role },
);
}
function channelsSelectInput(): HTMLInputElement {
return screen
.getByTestId(CHANNELS_SELECT)
.querySelector('input') as HTMLInputElement;
}
describe('RoutingPolicyDetails', () => {
it('renders base create layout with header, 3 inputs and footer', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
renderDetails({ mode: 'create' });
expect(screen.getByRole('dialog')).toBeInTheDocument();
expect(screen.getByText('Create routing policy')).toBeInTheDocument();
expect(screen.getByText('Routing Policy Name')).toBeInTheDocument();
expect(screen.getByText('Expression')).toBeInTheDocument();
expect(screen.getByText('Notification Channels')).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
expect(
screen.getByRole('button', { name: SAVE_BUTTON_TEXT }),
).toBeInTheDocument();
expect(screen.getByTestId(CANCEL_BUTTON)).toHaveTextContent('Cancel');
expect(screen.getByTestId(SAVE_BUTTON)).toHaveTextContent(SAVE_BUTTON_TEXT);
});
it('renders base edit layout with header, 3 inputs and footer', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="edit"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
renderDetails({ mode: 'edit' });
expect(screen.getByRole('dialog')).toBeInTheDocument();
expect(screen.getByText('Edit routing policy')).toBeInTheDocument();
@@ -71,194 +80,114 @@ describe('RoutingPolicyDetails', () => {
expect(screen.getByText('Expression')).toBeInTheDocument();
expect(screen.getByText('Notification Channels')).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
expect(
screen.getByRole('button', { name: SAVE_BUTTON_TEXT }),
).toBeInTheDocument();
expect(screen.getByTestId(CANCEL_BUTTON)).toHaveTextContent('Cancel');
expect(screen.getByTestId(SAVE_BUTTON)).toHaveTextContent(SAVE_BUTTON_TEXT);
});
it('prefills inputs with existing policy values in edit mode', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="edit"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
renderDetails({ mode: 'edit' });
const nameInput = screen.getByDisplayValue(mockRoutingPolicy.name);
expect(nameInput).toBeInTheDocument();
const expressionTextarea = screen.getByDisplayValue(
expect(screen.getByTestId(NAME_INPUT)).toHaveValue(mockRoutingPolicy.name);
expect(screen.getByTestId(EXPRESSION_INPUT)).toHaveValue(
mockRoutingPolicy.expression,
);
expect(expressionTextarea).toBeInTheDocument();
expect(screen.getByText(MOCK_CHANNEL_1.name)).toBeInTheDocument();
});
it('creating and saving the routing policy works correctly', async () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
const user = userEvent.setup();
renderDetails({ mode: 'create' });
const nameInput = screen.getByTestId(NAME_INPUT);
expect(nameInput).toHaveAttribute(
'placeholder',
'e.g. Base routing policy...',
);
const nameInput = screen.getByPlaceholderText('e.g. Base routing policy...');
expect(nameInput).toBeInTheDocument();
const expressionTextarea = screen.getByPlaceholderText(
const expressionTextarea = screen.getByTestId(EXPRESSION_INPUT);
expect(expressionTextarea).toHaveAttribute(
'placeholder',
'e.g. service.name == "payment" && threshold.name == "critical"',
);
expect(expressionTextarea).toBeInTheDocument();
const descriptionTextarea = screen.getByPlaceholderText(
const descriptionTextarea = screen.getByTestId(DESCRIPTION_INPUT);
expect(descriptionTextarea).toHaveAttribute(
'placeholder',
'e.g. This is a routing policy that...',
);
expect(descriptionTextarea).toBeInTheDocument();
fireEvent.change(nameInput, { target: { value: NEW_NAME } });
fireEvent.change(expressionTextarea, { target: { value: NEW_EXPRESSION } });
fireEvent.change(descriptionTextarea, { target: { value: NEW_DESCRIPTION } });
await user.click(nameInput);
await user.paste(NEW_NAME);
await user.click(expressionTextarea);
await user.paste(NEW_EXPRESSION);
await user.click(descriptionTextarea);
await user.paste(NEW_DESCRIPTION);
const channelSelect = screen.getByRole('combobox');
fireEvent.mouseDown(channelSelect);
const channelOptions = await screen.findAllByText('Channel 1');
fireEvent.click(channelOptions[1]);
await user.click(channelsSelectInput());
await user.click(
await screen.findByText('Channel 1', {
selector: '.ant-select-item-option-content',
}),
);
// Wait for the form to be valid before submitting
await waitFor(() => {
expect(screen.getByDisplayValue(NEW_NAME)).toBeInTheDocument();
});
await user.click(screen.getByTestId(SAVE_BUTTON));
const saveButton = screen.getByRole('button', {
name: 'Save Routing Policy',
});
fireEvent.click(saveButton);
// Wait for the form submission to complete
await waitFor(() => {
expect(mockHandlePolicyDetailsModalAction).toHaveBeenCalled();
});
expect(mockHandlePolicyDetailsModalAction).toHaveBeenCalledWith('create', {
name: NEW_NAME,
expression: NEW_EXPRESSION,
description: NEW_DESCRIPTION,
channels: ['Channel 1'],
});
await waitFor(() =>
expect(mockHandlePolicyDetailsModalAction).toHaveBeenCalledWith('create', {
name: NEW_NAME,
expression: NEW_EXPRESSION,
description: NEW_DESCRIPTION,
channels: ['Channel 1'],
}),
);
});
it('editing and saving the routing policy works correctly', async () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="edit"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
const user = userEvent.setup();
renderDetails({ mode: 'edit' });
const nameInput = screen.getByDisplayValue(mockRoutingPolicy.name);
expect(nameInput).toBeInTheDocument();
const expressionTextarea = screen.getByDisplayValue(
mockRoutingPolicy.expression,
);
expect(expressionTextarea).toBeInTheDocument();
const descriptionTextarea = screen.getByDisplayValue(
const nameInput = screen.getByTestId(NAME_INPUT);
expect(nameInput).toHaveValue(mockRoutingPolicy.name);
const expressionTextarea = screen.getByTestId(EXPRESSION_INPUT);
expect(expressionTextarea).toHaveValue(mockRoutingPolicy.expression);
const descriptionTextarea = screen.getByTestId(DESCRIPTION_INPUT);
expect(descriptionTextarea).toHaveValue(
mockRoutingPolicy.description || 'description 1',
);
expect(descriptionTextarea).toBeInTheDocument();
fireEvent.change(nameInput, { target: { value: NEW_NAME } });
fireEvent.change(expressionTextarea, { target: { value: NEW_EXPRESSION } });
fireEvent.change(descriptionTextarea, { target: { value: NEW_DESCRIPTION } });
await user.clear(nameInput);
await user.paste(NEW_NAME);
await user.clear(expressionTextarea);
await user.paste(NEW_EXPRESSION);
await user.clear(descriptionTextarea);
await user.paste(NEW_DESCRIPTION);
// Wait for the form to be valid before submitting
await waitFor(() => {
expect(screen.getByDisplayValue(NEW_NAME)).toBeInTheDocument();
});
await user.click(screen.getByTestId(SAVE_BUTTON));
const saveButton = screen.getByRole('button', {
name: SAVE_BUTTON_TEXT,
});
fireEvent.click(saveButton);
// Wait for the form submission to complete
await waitFor(() => {
expect(mockHandlePolicyDetailsModalAction).toHaveBeenCalled();
});
expect(mockHandlePolicyDetailsModalAction).toHaveBeenCalledWith('edit', {
name: NEW_NAME,
expression: NEW_EXPRESSION,
description: NEW_DESCRIPTION,
channels: ['Channel 1'],
});
await waitFor(() =>
expect(mockHandlePolicyDetailsModalAction).toHaveBeenCalledWith('edit', {
name: NEW_NAME,
expression: NEW_EXPRESSION,
description: NEW_DESCRIPTION,
channels: ['Channel 1'],
}),
);
});
it('should close modal when cancel button is clicked', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="edit"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
it('should close modal when cancel button is clicked', async () => {
const user = userEvent.setup();
renderDetails({ mode: 'edit' });
const cancelButton = screen.getByRole('button', { name: 'Cancel' });
fireEvent.click(cancelButton);
await user.click(screen.getByTestId(CANCEL_BUTTON));
expect(mockCloseModal).toHaveBeenCalled();
});
it('buttons should be disabled when loading', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="edit"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
renderDetails({ mode: 'edit', isPolicyDetailsModalActionLoading: true });
const cancelButton = screen.getByRole('button', { name: 'Cancel' });
expect(cancelButton).toBeDisabled();
expect(screen.getByTestId(CANCEL_BUTTON)).toBeDisabled();
const saveButton = screen.getByRole('button', {
name: new RegExp(SAVE_BUTTON_TEXT, 'i'),
});
const saveButton = screen.getByTestId(SAVE_BUTTON);
expect(saveButton).toHaveTextContent(SAVE_BUTTON_TEXT);
expect(saveButton).toBeDisabled();
expect(saveButton.querySelector('svg')).toBeInTheDocument();
expect(saveButton.querySelector('svg')).toHaveAttribute(
@@ -267,132 +196,56 @@ describe('RoutingPolicyDetails', () => {
);
});
it('submit should not be called when inputs are invalid', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={mockChannels}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
it('submit should not be called when inputs are invalid', async () => {
const user = userEvent.setup();
renderDetails({ mode: 'create' });
const saveButton = screen.getByRole('button', {
name: SAVE_BUTTON_TEXT,
});
fireEvent.click(saveButton);
await user.click(screen.getByTestId(SAVE_BUTTON));
await expect(
screen.findByText('Please provide a name for the routing policy'),
).resolves.toBeInTheDocument();
expect(mockHandlePolicyDetailsModalAction).not.toHaveBeenCalled();
});
it('notification channels select should be disabled when channels are loading', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={[]}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels
refreshChannels={mockRefreshChannels}
/>,
);
renderDetails({ channels: [], isLoadingChannels: true });
const channelSelect = screen.getByRole('combobox');
expect(channelSelect).toBeDisabled();
expect(channelsSelectInput()).toBeDisabled();
});
it('should show error state when channels fail to load', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={[]}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
renderDetails({ channels: [], isErrorChannels: true });
const channelSelect = screen.getByRole('combobox');
const selectContainer = channelSelect.closest('.ant-select');
expect(selectContainer).toHaveClass('ant-select-status-error');
expect(screen.getByTestId(CHANNELS_SELECT)).toHaveClass(
'ant-select-status-error',
);
});
it('should show empty state when no channels are available', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={[]}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
it('should show empty state when no channels are available', async () => {
const user = userEvent.setup();
renderDetails({ channels: [] });
const channelSelect = screen.getByRole('combobox');
fireEvent.mouseDown(channelSelect);
await user.click(channelsSelectInput());
expect(screen.getByText(NO_CHANNELS_FOUND_TEXT)).toBeInTheDocument();
});
it('should show create channel button for admin users in empty state', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={[]}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
it('should show create channel button for admin users in empty state', async () => {
const user = userEvent.setup();
renderDetails({ channels: [] });
const channelSelect = screen.getByRole('combobox');
fireEvent.mouseDown(channelSelect);
await user.click(channelsSelectInput());
expect(screen.getByText(NO_CHANNELS_FOUND_TEXT)).toBeInTheDocument();
expect(screen.getByText('Create one')).toBeInTheDocument();
});
it('should show admin message for non-admin users in empty state', () => {
jest
.spyOn(appHooks, 'useAppContext')
.mockReturnValue(getAppContextMockState({ role: 'VIEWER' }));
it('should show admin message for non-admin users in empty state', async () => {
const user = userEvent.setup();
renderDetails({ channels: [] }, USER_ROLES.VIEWER);
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={[]}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
const channelSelect = screen.getByRole('combobox');
fireEvent.mouseDown(channelSelect);
await user.click(channelsSelectInput());
expect(screen.getByText(NO_CHANNELS_FOUND_TEXT)).toBeInTheDocument();
expect(
@@ -401,28 +254,16 @@ describe('RoutingPolicyDetails', () => {
expect(screen.queryByText('Create one')).not.toBeInTheDocument();
});
it('should call refreshChannels when refresh button is clicked in empty state', () => {
render(
<RoutingPolicyDetails
routingPolicy={mockRoutingPolicy}
closeModal={mockCloseModal}
mode="create"
channels={[]}
handlePolicyDetailsModalAction={mockHandlePolicyDetailsModalAction}
isPolicyDetailsModalActionLoading={false}
isErrorChannels={false}
isLoadingChannels={false}
refreshChannels={mockRefreshChannels}
/>,
);
it('should call refreshChannels when refresh button is clicked in empty state', async () => {
const user = userEvent.setup();
renderDetails({ channels: [] });
const channelSelect = screen.getByRole('combobox');
fireEvent.mouseDown(channelSelect);
await user.click(channelsSelectInput());
const refreshButton = screen.getByText('Refresh');
expect(refreshButton).toBeInTheDocument();
fireEvent.click(refreshButton);
await user.click(refreshButton);
expect(mockRefreshChannels).toHaveBeenCalledTimes(1);
});
});

View File

@@ -1,5 +1,3 @@
import { fireEvent, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import {
AuthtypesTransactionDTO,
SavedviewtypesSourceDTO,
@@ -22,6 +20,7 @@ import {
} from 'lib/authz/utils/authz-test-utils';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { act, screen, userEvent, waitFor, within } from 'tests/test-utils';
import { DataSource } from 'types/common/queryBuilder';
import { SAVED_VIEW_HOVER_CARD_OPEN_DELAY_MS } from '../constants';
@@ -40,7 +39,6 @@ import {
} from './savedViewsTestUtils';
const PATH = ROUTES.TRACES_EXPLORER;
const HOVER_CARD_TIMEOUT = { timeout: SAVED_VIEW_HOVER_CARD_OPEN_DELAY_MS * 3 };
const errors = makeView({ id: 'view-1', displayName: 'Errors' });
const slow = makeView({ id: 'view-2', displayName: 'Slow spans' });
@@ -76,8 +74,9 @@ const rowNamed = (name: string): HTMLElement =>
.find((row) => row.textContent?.includes(name)) as HTMLElement;
async function openRowMenu(name: string): Promise<void> {
const user = userEvent.setup();
await screen.findAllByTestId('saved-views-row');
fireEvent.click(within(rowNamed(name)).getByTestId('saved-views-row-menu'));
await user.click(within(rowNamed(name)).getByTestId('saved-views-row-menu'));
}
// Records every check, answered by `isGranted`.
@@ -103,12 +102,15 @@ const readSelectors = (checks: AuthtypesTransactionDTO[]): string[] =>
async function hoverRow(name: string): Promise<HTMLElement> {
await screen.findAllByTestId('saved-views-row');
fireEvent.mouseEnter(rowNamed(name));
return screen.findByTestId(
'saved-view-hover-card',
undefined,
HOVER_CARD_TIMEOUT,
);
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
await user.hover(rowNamed(name));
act(() => {
jest.advanceTimersByTime(SAVED_VIEW_HOVER_CARD_OPEN_DELAY_MS);
});
return screen.findByTestId('saved-view-hover-card');
}
// Resolves once the row's check is back, so its state is final.
@@ -174,7 +176,7 @@ describe('SavedViews - AuthZ', () => {
await screen.findAllByTestId('saved-views-row');
const name = within(rowNamed('Errors')).getByTestId('saved-views-row-name');
expectUsable(name);
await userEvent.click(name);
await userEvent.setup().click(name);
await waitFor(() =>
expect(urlParam(history, QueryParams.viewKey)).toBe(
@@ -206,56 +208,66 @@ describe('SavedViews - AuthZ', () => {
).resolves.not.toHaveAttribute('data-disabled');
});
it('shows the denied callout in the hover card of a view it cannot read, without fetching it', async () => {
let fetches = 0;
mockSavedViewsApi([errors]);
server.use(
setupAuthzDeny(
SavedViewReadPermission,
buildSavedViewReadPermission(errors.id),
),
rest.get(`${API}/:id`, (_req, res, ctx) => {
fetches += 1;
return res(ctx.json({ status: 'success', data: errors }));
}),
);
renderPanel();
describe('hover card', () => {
afterEach(() => {
// useAuthZ batches checks on a timer; left pending, it blocks later checks.
act(() => {
jest.runOnlyPendingTimers();
});
jest.useRealTimers();
});
const card = await hoverRow('Errors');
await expect(
within(card).findByText(/not authorized/i),
).resolves.toBeInTheDocument();
expect(within(card).queryByTestId('saved-view-hover-card-query')).toBeNull();
expect(fetches).toBe(0);
});
it('shows the denied callout in the hover card of a view it cannot read, without fetching it', async () => {
let fetches = 0;
mockSavedViewsApi([errors]);
server.use(
setupAuthzDeny(
SavedViewReadPermission,
buildSavedViewReadPermission(errors.id),
),
rest.get(`${API}/:id`, (_req, res, ctx) => {
fetches += 1;
return res(ctx.json({ status: 'success', data: errors }));
}),
);
renderPanel();
it('skips the read check of the hovered view with read on every view', async () => {
mockSavedViewsApi([errors]);
const checks = recordChecks();
renderPanel();
const card = await hoverRow('Errors');
await expect(
within(card).findByText(/not authorized/i),
).resolves.toBeInTheDocument();
expect(within(card).queryByTestId('saved-view-hover-card-query')).toBeNull();
expect(fetches).toBe(0);
});
const card = await hoverRow('Errors');
it('skips the read check of the hovered view with read on every view', async () => {
mockSavedViewsApi([errors]);
const checks = recordChecks();
renderPanel();
await expect(
within(card).findByTestId('saved-view-hover-card-query'),
).resolves.toHaveTextContent('has_error = true');
expect(readSelectors(checks)).toStrictEqual(['*']);
});
const card = await hoverRow('Errors');
it('checks read on the hovered view without read on every view', async () => {
mockSavedViewsApi([errors]);
const checks = recordChecks(
(transaction) =>
transaction.relation !== 'read' || transaction.object.selector !== '*',
);
renderPanel();
await expect(
within(card).findByTestId('saved-view-hover-card-query'),
).resolves.toHaveTextContent('has_error = true');
expect(readSelectors(checks)).toStrictEqual(['*']);
});
const card = await hoverRow('Errors');
it('checks read on the hovered view without read on every view', async () => {
mockSavedViewsApi([errors]);
const checks = recordChecks(
(transaction) =>
transaction.relation !== 'read' || transaction.object.selector !== '*',
);
renderPanel();
await expect(
within(card).findByTestId('saved-view-hover-card-query'),
).resolves.toHaveTextContent('has_error = true');
expect(readSelectors(checks)).toStrictEqual(['*', errors.id]);
const card = await hoverRow('Errors');
await expect(
within(card).findByTestId('saved-view-hover-card-query'),
).resolves.toHaveTextContent('has_error = true');
expect(readSelectors(checks)).toStrictEqual(['*', errors.id]);
});
});
it('disables creating without create', async () => {
@@ -287,7 +299,7 @@ describe('SavedViews - AuthZ', () => {
const create = screen.getByTestId('saved-views-create');
expect(create).toHaveAttribute('aria-busy', 'true');
await userEvent.click(create);
await userEvent.setup().click(create);
expect(screen.queryByTestId('save-view-name')).toBeNull();
});
@@ -329,7 +341,9 @@ describe('SavedViews - AuthZ', () => {
viewKey: errors.id,
}),
);
await userEvent.click(await screen.findByTestId('saved-views-save-changes'));
await userEvent
.setup()
.click(await screen.findByTestId('saved-views-save-changes'));
await expect(
settledRow('saved-views-save-changes-item-update'),
@@ -354,7 +368,9 @@ describe('SavedViews - AuthZ', () => {
viewKey: errors.id,
}),
);
await userEvent.click(await screen.findByTestId('saved-views-save-changes'));
await userEvent
.setup()
.click(await screen.findByTestId('saved-views-save-changes'));
await expect(
settledRow('saved-views-save-changes-item-save-as-new'),

View File

@@ -1,5 +1,3 @@
import { act, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { Button } from '@signozhq/ui/button';
import { toast } from '@signozhq/ui/sonner';
import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
@@ -9,6 +7,7 @@ import ROUTES from 'constants/routes';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { act, screen, userEvent, waitFor, within } from 'tests/test-utils';
import { DataSource } from 'types/common/queryBuilder';
import SavedViewsHeader from '../SavedViewsHeader';
@@ -104,21 +103,23 @@ const SAVE_MENU_ITEM_TEST_IDS: Record<string, string> = {
'Update selected view': 'saved-views-save-changes-item-update',
};
async function chooseFromSaveMenu(item: string): Promise<void> {
await userEvent.click(screen.getByTestId('saved-views-save-changes'));
type User = ReturnType<typeof userEvent.setup>;
async function chooseFromSaveMenu(user: User, item: string): Promise<void> {
await user.click(screen.getByTestId('saved-views-save-changes'));
const menuItem = await screen.findByTestId(SAVE_MENU_ITEM_TEST_IDS[item]);
await waitFor(() => expectRowUsable(menuItem), MENU_CHECK_TIMEOUT);
await userEvent.click(menuItem);
await user.click(menuItem);
}
async function clickCreate(): Promise<void> {
async function clickCreate(user: User): Promise<void> {
await waitFor(() => expectUsable(screen.getByTestId('saved-views-create')));
await userEvent.click(screen.getByTestId('saved-views-create'));
await user.click(screen.getByTestId('saved-views-create'));
}
async function submitName(name: string): Promise<void> {
await userEvent.type(screen.getByTestId('save-view-name'), name);
await userEvent.click(screen.getByTestId('save-view-submit'));
async function submitName(user: User, name: string): Promise<void> {
await user.type(screen.getByTestId('save-view-name'), name);
await user.click(screen.getByTestId('save-view-submit'));
}
describe('SavedViewsHeader saving', () => {
@@ -128,10 +129,11 @@ describe('SavedViewsHeader saving', () => {
describe('create', () => {
it('saves the current state under a generated name and opens it', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([], { createdId: 'view-new' });
const { history } = renderHeader(explorerUrl(PATH, {}));
await clickCreate();
await clickCreate(user);
expect(within(modal()).getByText('Create new view')).toBeInTheDocument();
expect(screen.getByTestId('save-view-submit')).toHaveAttribute(
@@ -139,7 +141,7 @@ describe('SavedViewsHeader saving', () => {
'true',
);
await submitName('Slow checkout');
await submitName(user, 'Slow checkout');
await waitFor(() => expect(requests.created).toHaveLength(1));
expect(requests.created[0]).toStrictEqual(
@@ -171,11 +173,12 @@ describe('SavedViewsHeader saving', () => {
});
it('keeps the modal open and reports a failed save', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([], { createStatus: 500 });
const { history } = renderHeader(explorerUrl(PATH, {}));
await clickCreate();
await submitName('Slow checkout');
await clickCreate(user);
await submitName(user, 'Slow checkout');
await waitFor(() => expect(toast.error).toHaveBeenCalled());
expect(requests.created).toHaveLength(1);
@@ -186,11 +189,12 @@ describe('SavedViewsHeader saving', () => {
});
it('does not create a view from a blank name submitted with Enter', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([]);
renderHeader(explorerUrl(PATH, {}));
await clickCreate();
await userEvent.type(screen.getByTestId('save-view-name'), ' {enter}');
await clickCreate(user);
await user.type(screen.getByTestId('save-view-name'), ' {enter}');
await act(() => new Promise((resolve) => setTimeout(resolve, 200)));
expect(requests.created).toHaveLength(0);
@@ -198,13 +202,14 @@ describe('SavedViewsHeader saving', () => {
});
it('ignores Enter while the view is being saved', async () => {
const user = userEvent.setup();
let creates = 0;
mockSavedViewsApi([]);
server.use(
rest.post(API, (_req, res, ctx) => {
creates += 1;
return res(
ctx.delay(400),
ctx.delay(200),
ctx.status(201),
ctx.json({ status: 'success', data: { id: 'view-new' } }),
);
@@ -212,16 +217,17 @@ describe('SavedViewsHeader saving', () => {
);
renderHeader(explorerUrl(PATH, {}));
await clickCreate();
await submitName('Slow checkout');
await clickCreate(user);
await submitName(user, 'Slow checkout');
await waitFor(() => expect(creates).toBe(1));
await userEvent.type(screen.getByTestId('save-view-name'), '{enter}');
await user.type(screen.getByTestId('save-view-name'), '{enter}');
await waitFor(() => expect(isModalOpen()).toBe(false));
expect(creates).toBe(1);
});
it('saves the query that was run, not edits made since', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([], { createdId: 'view-new' });
const { history } = renderWithExplorerProviders(
<>
@@ -234,9 +240,9 @@ describe('SavedViewsHeader saving', () => {
explorerUrl(PATH, {}),
);
await userEvent.click(screen.getByTestId('edit-current-query'));
await clickCreate();
await submitName('Slow checkout');
await user.click(screen.getByTestId('edit-current-query'));
await clickCreate(user);
await submitName(user, 'Slow checkout');
await waitFor(() => expect(requests.created).toHaveLength(1));
const body = requests.created[0] as {
@@ -256,12 +262,13 @@ describe('SavedViewsHeader saving', () => {
});
it('cancel closes the modal without saving', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([]);
renderHeader(explorerUrl(PATH, {}));
await clickCreate();
await userEvent.type(screen.getByTestId('save-view-name'), 'Draft');
await userEvent.click(screen.getByTestId('save-view-cancel'));
await clickCreate(user);
await user.type(screen.getByTestId('save-view-name'), 'Draft');
await user.click(screen.getByTestId('save-view-cancel'));
await waitFor(() => expect(isModalOpen()).toBe(false));
expect(requests.created).toHaveLength(0);
@@ -269,14 +276,15 @@ describe('SavedViewsHeader saving', () => {
});
it('save as new creates another view from the changed state', async () => {
const user = userEvent.setup();
const errors = makeView({ id: 'view-1', displayName: 'Errors' });
const requests = mockSavedViewsApi([errors], { createdId: 'view-copy' });
const { history } = await openDirtyView(errors);
await chooseFromSaveMenu('Save as new view');
await chooseFromSaveMenu(user, 'Save as new view');
expect(within(modal()).getByText('Save as new view')).toBeInTheDocument();
await submitName('Errors copy');
await submitName(user, 'Errors copy');
await waitFor(() => expect(requests.created).toHaveLength(1));
const body = requests.created[0] as {
@@ -296,11 +304,12 @@ describe('SavedViewsHeader saving', () => {
});
it('update stores the changed state on the open view, keeping its name', async () => {
const user = userEvent.setup();
const errors = makeView({ id: 'view-1', displayName: 'Errors' });
const requests = mockSavedViewsApi([errors]);
await openDirtyView(errors);
await chooseFromSaveMenu('Update selected view');
await chooseFromSaveMenu(user, 'Update selected view');
await waitFor(() => expect(requests.updated).toHaveLength(1));
const { id, body } = requests.updated[0] as {
@@ -327,11 +336,12 @@ describe('SavedViewsHeader saving', () => {
});
it('update that fails reports the error and never says the view was updated', async () => {
const user = userEvent.setup();
const errors = makeView({ id: 'view-1', displayName: 'Errors' });
const requests = mockSavedViewsApi([errors], { updateStatus: 500 });
await openDirtyView(errors);
await chooseFromSaveMenu('Update selected view');
await chooseFromSaveMenu(user, 'Update selected view');
await waitFor(() => expect(toast.error).toHaveBeenCalled());
await act(() => new Promise((resolve) => setTimeout(resolve, 100)));
@@ -340,6 +350,7 @@ describe('SavedViewsHeader saving', () => {
});
it('update keeps the color of the open view', async () => {
const user = userEvent.setup();
const base = makeView({ id: 'view-1', displayName: 'Errors' });
const colored = {
...base,
@@ -348,7 +359,7 @@ describe('SavedViewsHeader saving', () => {
const requests = mockSavedViewsApi([colored]);
await openDirtyView(colored);
await chooseFromSaveMenu('Update selected view');
await chooseFromSaveMenu(user, 'Update selected view');
await waitFor(() => expect(requests.updated).toHaveLength(1));
const { body } = requests.updated[0] as {

View File

@@ -1,5 +1,3 @@
import { fireEvent, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { toast } from '@signozhq/ui/sonner';
import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
import { QueryParams } from 'constants/query';
@@ -7,6 +5,7 @@ import ROUTES from 'constants/routes';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { NANO_SECOND_MULTIPLIER } from 'store/globalTime';
import { screen, userEvent, waitFor, within } from 'tests/test-utils';
import SavedViewsHeader from '../SavedViewsHeader';
import SavedViewsPanel from '../SavedViewsPanel';
@@ -46,6 +45,16 @@ const slow = makeView({
expression: 'duration_nano > 1000',
});
function renderPanel(): ReturnType<typeof renderWithExplorerProviders> {
return renderWithExplorerProviders(
<SavedViewsPanel
source={SavedviewtypesSourceDTO.traces}
onClose={jest.fn()}
/>,
explorerUrl(PATH, {}),
);
}
function renderPanelWithHeader(
url = explorerUrl(PATH, {}),
): ReturnType<typeof renderWithExplorerProviders> {
@@ -74,14 +83,15 @@ const ROW_MENU_ITEM_TEST_IDS: Record<string, string> = {
};
async function chooseFromRowMenu(
user: ReturnType<typeof userEvent.setup>,
viewName: string,
item: string,
): Promise<void> {
await screen.findByTestId('saved-views-list');
fireEvent.click(within(row(viewName)).getByTestId('saved-views-row-menu'));
await user.click(within(row(viewName)).getByTestId('saved-views-row-menu'));
const menuItem = await screen.findByTestId(ROW_MENU_ITEM_TEST_IDS[item]);
await waitFor(() => expectRowUsable(menuItem), MENU_CHECK_TIMEOUT);
fireEvent.click(menuItem);
await user.click(menuItem);
}
const chip = (): HTMLElement => screen.getByTestId('saved-views-name');
@@ -94,11 +104,12 @@ describe('SavedViewsPanel row menu', () => {
});
it('offers copy link, copy id, edit details and delete', async () => {
const user = userEvent.setup();
mockSavedViewsApi([errors]);
renderPanelWithHeader();
renderPanel();
await screen.findByTestId('saved-views-list');
fireEvent.click(within(row('Errors')).getByTestId('saved-views-row-menu'));
await user.click(within(row('Errors')).getByTestId('saved-views-row-menu'));
await screen.findByTestId(ROW_MENU_ITEM_TEST_IDS['Copy link']);
const items = Object.values(ROW_MENU_ITEM_TEST_IDS).map(
@@ -113,10 +124,11 @@ describe('SavedViewsPanel row menu', () => {
});
it('copies the view id', async () => {
const user = userEvent.setup();
mockSavedViewsApi([errors, slow]);
renderPanelWithHeader();
renderPanel();
await chooseFromRowMenu('Slow spans', 'Copy ID');
await chooseFromRowMenu(user, 'Slow spans', 'Copy ID');
expect(mockCopy).toHaveBeenCalledWith(slow.id);
expect(toast.success).toHaveBeenCalledWith(
@@ -126,6 +138,7 @@ describe('SavedViewsPanel row menu', () => {
});
it('copies a link that opens the view with its query, tab and time range', async () => {
const user = userEvent.setup();
mockSavedViewsApi([errors, slow]);
renderWithExplorerProviders(
withGlobalTime(
@@ -142,7 +155,7 @@ describe('SavedViewsPanel row menu', () => {
explorerUrl(PATH, {}),
);
await chooseFromRowMenu('Slow spans', 'Copy link');
await chooseFromRowMenu(user, 'Slow spans', 'Copy link');
expect(mockCopy).toHaveBeenCalledTimes(1);
const link = new URL(mockCopy.mock.calls[0][0]);
@@ -163,15 +176,16 @@ describe('SavedViewsPanel row menu', () => {
});
it('renames a view without touching its query', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([errors, slow]);
renderPanelWithHeader();
renderPanel();
await chooseFromRowMenu('Slow spans', 'Edit details');
await chooseFromRowMenu(user, 'Slow spans', 'Edit details');
const name = screen.getByTestId('save-view-name');
expect(name).toHaveValue('Slow spans');
await userEvent.clear(name);
await userEvent.type(name, 'Slow checkout spans');
await userEvent.click(screen.getByTestId('save-view-submit'));
await user.clear(name);
await user.paste('Slow checkout spans');
await user.click(screen.getByTestId('save-view-submit'));
await waitFor(() => expect(requests.updated).toHaveLength(1));
const [update] = requests.updated;
@@ -184,9 +198,10 @@ describe('SavedViewsPanel row menu', () => {
});
it('renames from the stored view, not a stale list row', async () => {
const user = userEvent.setup();
const views = [errors, slow];
const requests = mockSavedViewsApi(views);
renderPanelWithHeader();
renderPanel();
await screen.findByTestId('saved-views-list');
const stored = makeView({
id: slow.id,
@@ -195,11 +210,11 @@ describe('SavedViewsPanel row menu', () => {
});
views[1] = stored;
await chooseFromRowMenu('Slow spans', 'Edit details');
await chooseFromRowMenu(user, 'Slow spans', 'Edit details');
const name = screen.getByTestId('save-view-name');
await userEvent.clear(name);
await userEvent.type(name, 'Slow checkout spans');
await userEvent.click(screen.getByTestId('save-view-submit'));
await user.clear(name);
await user.paste('Slow checkout spans');
await user.click(screen.getByTestId('save-view-submit'));
await waitFor(() => expect(requests.updated).toHaveLength(1));
expect(requests.updated[0].body).toMatchObject({
@@ -208,19 +223,20 @@ describe('SavedViewsPanel row menu', () => {
});
it('renames from the list row when the view cannot be read', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([errors, slow]);
server.use(
rest.get(`${API}/:id`, (_req, res, ctx) =>
res(ctx.status(403), ctx.json({ status: 'error' })),
),
);
renderPanelWithHeader();
renderPanel();
await chooseFromRowMenu('Slow spans', 'Edit details');
await chooseFromRowMenu(user, 'Slow spans', 'Edit details');
const name = screen.getByTestId('save-view-name');
await userEvent.clear(name);
await userEvent.type(name, 'Slow checkout spans');
await userEvent.click(screen.getByTestId('save-view-submit'));
await user.clear(name);
await user.paste('Slow checkout spans');
await user.click(screen.getByTestId('save-view-submit'));
await waitFor(() => expect(requests.updated).toHaveLength(1));
expect(requests.updated[0].body).toMatchObject({
@@ -229,31 +245,33 @@ describe('SavedViewsPanel row menu', () => {
});
it('does not rename when the stored view fails to load', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([errors, slow]);
server.use(
rest.get(`${API}/:id`, (_req, res, ctx) =>
res(ctx.status(500), ctx.json({ status: 'error' })),
),
);
renderPanelWithHeader();
renderPanel();
await chooseFromRowMenu('Slow spans', 'Edit details');
await chooseFromRowMenu(user, 'Slow spans', 'Edit details');
const name = screen.getByTestId('save-view-name');
await userEvent.type(name, ' 2');
await userEvent.click(screen.getByTestId('save-view-submit'));
await user.type(name, ' 2');
await user.click(screen.getByTestId('save-view-submit'));
await waitFor(() => expect(toast.error).toHaveBeenCalled());
expect(requests.updated).toHaveLength(0);
});
it('ignores Enter while the stored view loads', async () => {
const requests = mockSavedViewsApi([errors, slow], { getDelay: 300 });
renderPanelWithHeader();
const user = userEvent.setup();
const requests = mockSavedViewsApi([errors, slow], { getDelay: 100 });
renderPanel();
await chooseFromRowMenu('Slow spans', 'Edit details');
await chooseFromRowMenu(user, 'Slow spans', 'Edit details');
const name = screen.getByTestId('save-view-name');
await userEvent.type(name, ' 2{enter}');
await userEvent.type(name, '{enter}');
await user.type(name, ' 2{enter}');
await user.keyboard('{Enter}');
await waitFor(() =>
expect(toast.success).toHaveBeenCalledWith(
@@ -265,41 +283,44 @@ describe('SavedViewsPanel row menu', () => {
});
it('shows the new name in the header when the open view is renamed', async () => {
const user = userEvent.setup();
mockSavedViewsApi([errors]);
renderPanelWithHeader(viewUrl(PATH, errors));
await waitFor(() => expect(chip()).toHaveTextContent('Errors'));
await chooseFromRowMenu('Errors', 'Edit details');
await chooseFromRowMenu(user, 'Errors', 'Edit details');
const name = screen.getByTestId('save-view-name');
await userEvent.clear(name);
await userEvent.type(name, 'All errors');
await userEvent.click(screen.getByTestId('save-view-submit'));
await user.clear(name);
await user.paste('All errors');
await user.click(screen.getByTestId('save-view-submit'));
await waitFor(() => expect(chip()).toHaveTextContent('All errors'));
});
it('asks before deleting and keeps the view on cancel', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([errors, slow]);
renderPanelWithHeader();
renderPanel();
await chooseFromRowMenu('Slow spans', 'Delete');
await chooseFromRowMenu(user, 'Slow spans', 'Delete');
expect(screen.getByText('Delete this view')).toBeInTheDocument();
expect(
screen.getByText('Deleting this view is irreversible and cannot be undone.'),
).toBeInTheDocument();
await userEvent.click(screen.getByTestId('delete-saved-view-cancel'));
await user.click(screen.getByTestId('delete-saved-view-cancel'));
expect(requests.deleted).toHaveLength(0);
expect(row('Slow spans')).toBeInTheDocument();
});
it('deletes a view on confirm', async () => {
const user = userEvent.setup();
const requests = mockSavedViewsApi([errors, slow]);
renderPanelWithHeader();
renderPanel();
await chooseFromRowMenu('Slow spans', 'Delete');
await userEvent.click(screen.getByTestId('delete-saved-view-confirm'));
await chooseFromRowMenu(user, 'Slow spans', 'Delete');
await user.click(screen.getByTestId('delete-saved-view-confirm'));
await waitFor(() => expect(requests.deleted).toStrictEqual([slow.id]));
expect(toast.success).toHaveBeenCalledWith('View deleted', expect.anything());
@@ -307,12 +328,13 @@ describe('SavedViewsPanel row menu', () => {
});
it('clears the open view when it is deleted', async () => {
const user = userEvent.setup();
mockSavedViewsApi([errors, slow]);
const { history } = renderPanelWithHeader(viewUrl(PATH, errors));
await waitFor(() => expect(chip()).toHaveTextContent('Errors'));
await chooseFromRowMenu('Errors', 'Delete');
await userEvent.click(screen.getByTestId('delete-saved-view-confirm'));
await chooseFromRowMenu(user, 'Errors', 'Delete');
await user.click(screen.getByTestId('delete-saved-view-confirm'));
await waitFor(() =>
expect(urlParam(history, QueryParams.viewKey)).toBeNull(),
@@ -321,12 +343,13 @@ describe('SavedViewsPanel row menu', () => {
});
it('keeps the open view when another view is deleted', async () => {
const user = userEvent.setup();
mockSavedViewsApi([errors, slow]);
const { history } = renderPanelWithHeader(viewUrl(PATH, errors));
await waitFor(() => expect(chip()).toHaveTextContent('Errors'));
await chooseFromRowMenu('Slow spans', 'Delete');
await userEvent.click(screen.getByTestId('delete-saved-view-confirm'));
await chooseFromRowMenu(user, 'Slow spans', 'Delete');
await user.click(screen.getByTestId('delete-saved-view-confirm'));
await waitFor(() => expect(row('Slow spans')).toBeUndefined());
expect(urlParam(history, QueryParams.viewKey)).toBe(

View File

@@ -1,3 +1,4 @@
import type { Config } from '@jest/types';
import { initialQueriesMap } from 'constants/queryBuilder';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
@@ -58,7 +59,7 @@ type ListRequest = {
// Answers each offset with `rowsPerOffset[offset]` rows and records every request.
const mockListPages = (
rowsPerOffset: Record<number, number>,
firstPageDelayMs = 0,
onFirstPage?: () => void,
): ListRequest[] => {
const requests: ListRequest[] = [];
server.use(
@@ -75,6 +76,9 @@ const mockListPages = (
start: body.start,
end: body.end,
});
if (offset === 0) {
onFirstPage?.();
}
const length = Math.min(rowsPerOffset[offset] ?? 0, spec.limit);
const rows = Array.from({ length }, (_, i) => ({
...listRows[0],
@@ -84,11 +88,7 @@ const mockListPages = (
span_id: `span-${offset + i}`,
},
}));
return res(
ctx.delay(offset === 0 ? firstPageDelayMs : 0),
ctx.status(200),
ctx.json(listResponse(rows)),
);
return res(ctx.status(200), ctx.json(listResponse(rows)));
}),
);
return requests;
@@ -97,23 +97,27 @@ const mockListPages = (
// Tall enough that the mocked virtuoso renders every row and reaches the end.
const FULL_HEIGHT = 200 * 54;
const REAL_TIMER_APIS: Config.FakeableAPI[] = [
'hrtime',
'nextTick',
'performance',
'queueMicrotask',
'requestAnimationFrame',
'cancelAnimationFrame',
'requestIdleCallback',
'cancelIdleCallback',
'setImmediate',
'clearImmediate',
'setInterval',
'clearInterval',
'setTimeout',
'clearTimeout',
];
describe('Traces ListView - infinite scroll', () => {
afterEach(() => {
server.resetHandlers();
});
it('loads the next page at the end of the list over the same window', async () => {
// Past the one-second resolution of the window, so a recomputed "now" would show.
const requests = mockListPages({ 0: 100, 100: 5 }, 1100);
renderListView(initialQueriesMap.traces, FULL_HEIGHT);
await expect(
screen.findByText('span-104', undefined, { timeout: 3000 }),
).resolves.toBeInTheDocument();
expect(screen.getByText('span-0')).toBeInTheDocument();
expect(requests.map(({ offset }) => offset)).toStrictEqual([0, 100]);
expect(requests[1].start).toBe(requests[0].start);
expect(requests[1].end).toBe(requests[0].end);
jest.useRealTimers();
});
it('stops after a short page', async () => {
@@ -124,6 +128,21 @@ describe('Traces ListView - infinite scroll', () => {
expect(requests.map(({ offset }) => offset)).toStrictEqual([0]);
});
it('loads the next page at the end of the list over the same window', async () => {
jest.useFakeTimers({ doNotFake: REAL_TIMER_APIS });
// Past the one-second resolution of the window, so a recomputed "now" would show.
const requests = mockListPages({ 0: 100, 100: 5 }, () =>
jest.setSystemTime(Date.now() + 1100),
);
renderListView(initialQueriesMap.traces, FULL_HEIGHT);
await expect(screen.findByText('span-104')).resolves.toBeInTheDocument();
expect(screen.getByText('span-0')).toBeInTheDocument();
expect(requests.map(({ offset }) => offset)).toStrictEqual([0, 100]);
expect(requests[1].start).toBe(requests[0].start);
expect(requests[1].end).toBe(requests[0].end);
});
it('stops at the query limit', async () => {
const requests = mockListPages({ 0: 100, 100: 100 });
const { builder } = initialQueriesMap.traces;

View File

@@ -1,14 +1,22 @@
import userEvent from '@testing-library/user-event';
import { safeNavigateMock } from '__tests__/safeNavigateMock';
import ROUTES from 'constants/routes';
import { triggeredAlertsFixture } from 'mocks-server/__mockdata__/triggered_alerts';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { screen, waitFor } from 'tests/test-utils';
import { act, screen, userEvent } from 'tests/test-utils';
import { renderTriggeredAlerts } from './_helpers';
import { getTriggeredAlertRowTestId, renderTriggeredAlerts } from './_helpers';
const HIGH_CPU_NAME = getTriggeredAlertRowTestId('fp-critical-1', 'name');
// The 300 ms search debounce plus the URL write that follows it.
const SEARCH_SETTLE_MS = 1000;
const NO_MATCH_SEARCH = 'this-matches-nothing-xyz';
describe('TriggeredAlerts — empty / error states', () => {
afterEach(() => {
jest.useRealTimers();
});
it('shows the "No alerts firing" empty state when the API returns []', async () => {
server.use(
rest.get('http://localhost/api/v1/alerts', (_, res, ctx) =>
@@ -28,7 +36,7 @@ describe('TriggeredAlerts — empty / error states', () => {
});
it('navigates to ROUTES.ALERTS_NEW when "Create Alert Rule" is clicked', async () => {
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
server.use(
rest.get('http://localhost/api/v1/alerts', (_, res, ctx) =>
res(ctx.status(200), ctx.json({ data: [], status: 'success' })),
@@ -74,45 +82,57 @@ describe('TriggeredAlerts — empty / error states', () => {
}),
);
const user = userEvent.setup({ delay: null });
const user = userEvent.setup();
renderTriggeredAlerts();
await screen.findByTestId('error-refresh-button');
await user.click(screen.getByTestId('error-refresh-button'));
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
await expect(screen.findByTestId(HIGH_CPU_NAME)).resolves.toHaveTextContent(
'High CPU Usage',
);
});
it('shows NoResultsEmptyState when filters yield zero matches', async () => {
const user = userEvent.setup({ delay: null });
renderTriggeredAlerts();
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
);
await screen.findByTestId(HIGH_CPU_NAME);
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
const input = screen.getByTestId('triggered-alerts-search-input');
await user.type(input, 'this-matches-nothing-xyz');
await user.type(input, NO_MATCH_SEARCH);
act(() => {
jest.advanceTimersByTime(SEARCH_SETTLE_MS);
});
await screen.findByTestId('no-results-empty-state');
expect(screen.getByTestId('no-results-empty-state')).toBeInTheDocument();
expect(screen.getByTestId('no-results-title')).toHaveTextContent(
'No matching alerts',
);
expect(screen.getByTestId('no-results-subtitle')).toHaveTextContent(
'No alerts match your current filters. Try adjusting your search criteria.',
);
});
it('clears the search from the no-results state', async () => {
renderTriggeredAlerts({ initialRoute: `/?search=${NO_MATCH_SEARCH}` });
await screen.findByTestId('no-results-empty-state');
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
await user.click(screen.getByTestId('no-results-clear-button'));
act(() => {
jest.advanceTimersByTime(SEARCH_SETTLE_MS);
});
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
);
expect(
(screen.getByTestId('triggered-alerts-search-input') as HTMLInputElement)
.value,
).toBe('');
expect(screen.getByTestId(HIGH_CPU_NAME)).toHaveTextContent('High CPU Usage');
expect(screen.getByTestId('triggered-alerts-search-input')).toHaveValue('');
});
});

View File

@@ -1,118 +1,115 @@
import userEvent from '@testing-library/user-event';
import { screen, waitFor } from 'tests/test-utils';
import { act, screen, userEvent } from 'tests/test-utils';
import { renderTriggeredAlerts } from './_helpers';
import { getTriggeredAlertRowTestId, renderTriggeredAlerts } from './_helpers';
const SEARCH_INPUT = 'triggered-alerts-search-input';
// The 300 ms search debounce plus the URL write that follows it.
const SEARCH_SETTLE_MS = 1000;
function nameCell(fingerprint: string): HTMLElement | null {
return screen.queryByTestId(getTriggeredAlertRowTestId(fingerprint, 'name'));
}
async function search(text: string): Promise<void> {
jest.useFakeTimers();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
await user.type(screen.getByTestId(SEARCH_INPUT), text);
act(() => {
jest.advanceTimersByTime(SEARCH_SETTLE_MS);
});
}
describe('TriggeredAlerts — search', () => {
afterEach(() => {
jest.useRealTimers();
});
it('filters rows by alertname when typing in the search input', async () => {
const user = userEvent.setup({ delay: null });
renderTriggeredAlerts();
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
);
expect(screen.getByText('Memory Warning')).toBeInTheDocument();
await expect(
screen.findByTestId(getTriggeredAlertRowTestId('fp-critical-1', 'name')),
).resolves.toHaveTextContent('High CPU Usage');
expect(nameCell('fp-warning-1')).toHaveTextContent('Memory Warning');
const input = screen.getByTestId('triggered-alerts-search-input');
await user.type(input, 'CPU');
await search('CPU');
await waitFor(() => {
expect(screen.getByText('High CPU Usage')).toBeInTheDocument();
expect(screen.queryByText('Memory Warning')).not.toBeInTheDocument();
});
expect(nameCell('fp-critical-1')).toHaveTextContent('High CPU Usage');
expect(nameCell('fp-warning-1')).not.toBeInTheDocument();
});
it('shows all rows again when search is cleared', async () => {
const user = userEvent.setup({ delay: null });
renderTriggeredAlerts();
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
await screen.findByTestId(
getTriggeredAlertRowTestId('fp-critical-1', 'name'),
);
const input = screen.getByTestId('triggered-alerts-search-input');
await user.type(input, 'CPU');
await search('CPU');
expect(nameCell('fp-warning-1')).not.toBeInTheDocument();
await waitFor(() =>
expect(screen.queryByText('Memory Warning')).not.toBeInTheDocument(),
);
await user.clear(input);
await waitFor(() => {
expect(screen.getByText('High CPU Usage')).toBeInTheDocument();
expect(screen.getByText('Memory Warning')).toBeInTheDocument();
expect(screen.getByText('Disk Slow')).toBeInTheDocument();
const user = userEvent.setup({
advanceTimers: (ms) => jest.advanceTimersByTime(ms),
});
await user.clear(screen.getByTestId(SEARCH_INPUT));
act(() => {
jest.advanceTimersByTime(SEARCH_SETTLE_MS);
});
expect(nameCell('fp-critical-1')).toHaveTextContent('High CPU Usage');
expect(nameCell('fp-warning-1')).toHaveTextContent('Memory Warning');
expect(nameCell('fp-info-1')).toHaveTextContent('Disk Slow');
});
it('matches rows by label value (case-insensitive)', async () => {
const user = userEvent.setup({ delay: null });
renderTriggeredAlerts();
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
await screen.findByTestId(
getTriggeredAlertRowTestId('fp-critical-1', 'name'),
);
const input = screen.getByTestId('triggered-alerts-search-input');
// "backend" matches `service: backend` labels on Memory Warning and Network Hiccup.
await user.type(input, 'backend');
await search('backend');
await waitFor(() => {
expect(screen.getByText('Memory Warning')).toBeInTheDocument();
expect(screen.getByText('Network Hiccup')).toBeInTheDocument();
expect(screen.queryByText('High CPU Usage')).not.toBeInTheDocument();
expect(screen.queryByText('Disk Slow')).not.toBeInTheDocument();
});
expect(nameCell('fp-warning-1')).toHaveTextContent('Memory Warning');
expect(nameCell('fp-suppressed-1')).toHaveTextContent('Network Hiccup');
expect(nameCell('fp-critical-1')).not.toBeInTheDocument();
expect(nameCell('fp-info-1')).not.toBeInTheDocument();
});
it('matches rows by label key', async () => {
const user = userEvent.setup({ delay: null });
renderTriggeredAlerts();
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
await screen.findByTestId(
getTriggeredAlertRowTestId('fp-critical-1', 'name'),
);
const input = screen.getByTestId('triggered-alerts-search-input');
await user.type(input, 'staging');
await search('staging');
await waitFor(() => {
expect(screen.getByText('Disk Slow')).toBeInTheDocument();
expect(screen.queryByText('High CPU Usage')).not.toBeInTheDocument();
expect(screen.queryByText('Memory Warning')).not.toBeInTheDocument();
});
expect(nameCell('fp-info-1')).toHaveTextContent('Disk Slow');
expect(nameCell('fp-critical-1')).not.toBeInTheDocument();
expect(nameCell('fp-warning-1')).not.toBeInTheDocument();
});
it('renders the no-results empty state when the search matches nothing', async () => {
const user = userEvent.setup({ delay: null });
renderTriggeredAlerts();
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
await screen.findByTestId(
getTriggeredAlertRowTestId('fp-critical-1', 'name'),
);
const input = screen.getByTestId('triggered-alerts-search-input');
await user.type(input, 'zzzzznever-matches-anything');
await search('zzzzznever-matches-anything');
await waitFor(() =>
expect(screen.getByTestId('no-results-empty-state')).toBeInTheDocument(),
);
expect(screen.getByTestId('no-results-empty-state')).toBeInTheDocument();
});
it('resets pagination to page 1 when the search changes', async () => {
const user = userEvent.setup({ delay: null });
renderTriggeredAlerts({ initialRoute: '/?page=2&limit=2' });
await waitFor(() =>
expect(screen.getByText('Disk Slow')).toBeInTheDocument(),
);
await expect(
screen.findByTestId(getTriggeredAlertRowTestId('fp-info-1', 'name')),
).resolves.toHaveTextContent('Disk Slow');
const input = screen.getByTestId('triggered-alerts-search-input');
await user.type(input, 'CPU');
await search('CPU');
await waitFor(() =>
expect(screen.getByText('High CPU Usage')).toBeInTheDocument(),
);
expect(nameCell('fp-critical-1')).toHaveTextContent('High CPU Usage');
});
});

View File

@@ -35,6 +35,7 @@ function PermissionDeniedCallout({
showIcon
size="small"
className={cx(styles.callout, className)}
testId="permission-denied-callout"
>
<Typography.Text className={styles.permission}>
<code className={styles.permissionCode}>user/{user.id}</code> is not

View File

@@ -1,9 +1,8 @@
import { ReactElement } from 'react';
import { renderHook, waitFor, act } from '@testing-library/react';
import { useQueryClient } from 'react-query';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { AllTheProviders } from 'tests/test-utils';
import { act, AllTheProviders, renderHook, waitFor } from 'tests/test-utils';
import {
AUTHZ_CHECK_URL,
authzMockResponse,
@@ -357,14 +356,11 @@ describe('useAuthZ', () => {
wrapper,
});
await waitFor(
() => {
expect(result1.current.isLoading).toBe(false);
expect(result2.current.isLoading).toBe(false);
expect(result3.current.isLoading).toBe(false);
},
{ timeout: 200 },
);
await waitFor(() => {
expect(result1.current.isLoading).toBe(false);
expect(result2.current.isLoading).toBe(false);
expect(result3.current.isLoading).toBe(false);
});
expect(requestCount).toBe(1);
expect(receivedPayloads).toHaveLength(1);
@@ -421,18 +417,13 @@ describe('useAuthZ', () => {
wrapper,
});
await waitFor(
() => {
expect(result1.current.isLoading).toBe(false);
},
{ timeout: 200 },
);
await waitFor(() => {
expect(result1.current.isLoading).toBe(false);
});
expect(requestCount).toBe(1);
expect(receivedPayloads[0]).toHaveLength(1);
await new Promise((resolve) => setTimeout(resolve, 100));
const { result: result2 } = renderHook(() => useAuthZ([permission2]), {
wrapper,
});
@@ -441,13 +432,10 @@ describe('useAuthZ', () => {
wrapper,
});
await waitFor(
() => {
expect(result2.current.isLoading).toBe(false);
expect(result3.current.isLoading).toBe(false);
},
{ timeout: 200 },
);
await waitFor(() => {
expect(result2.current.isLoading).toBe(false);
expect(result3.current.isLoading).toBe(false);
});
expect(requestCount).toBe(2);
expect(receivedPayloads).toHaveLength(2);
@@ -526,30 +514,22 @@ describe('useAuthZ', () => {
wrapper,
});
await waitFor(
() => {
expect(result1.current.isLoading).toBe(false);
},
{ timeout: 200 },
);
await waitFor(() => {
expect(result1.current.isLoading).toBe(false);
});
expect(requestCount).toBe(1);
expect(result1.current.permissions).toStrictEqual({
[permission1]: { isGranted: true },
});
await new Promise((resolve) => setTimeout(resolve, 100));
const { result: result2 } = renderHook(() => useAuthZ([permission2]), {
wrapper,
});
await waitFor(
() => {
expect(result2.current.isLoading).toBe(false);
},
{ timeout: 200 },
);
await waitFor(() => {
expect(result2.current.isLoading).toBe(false);
});
expect(requestCount).toBe(2);
expect(result1.current.permissions).toStrictEqual({

View File

@@ -4,8 +4,6 @@ import { render, screen } from 'tests/test-utils';
import ChannelForm from '../components/ChannelForm/ChannelForm';
const FIND = { timeout: 5000 };
describe('ChannelForm', () => {
beforeEach(() => {
window.history.replaceState({}, '', '/');
@@ -20,11 +18,11 @@ describe('ChannelForm', () => {
it('prefills the channel it was opened on', async () => {
render(<ChannelForm channelId="3" onDone={jest.fn()} />);
const name = await screen.findByTestId('channel-name-textbox', {}, FIND);
const name = await screen.findByTestId('channel-name-textbox');
expect(name).toHaveValue('Dummy-Channel');
expect(screen.getByTestId('webhook-url-textbox')).toHaveValue(
'https://hooks.slack.com/services/dummy',
);
}, 20000);
});
});

View File

@@ -88,7 +88,8 @@ describe('Exceptions page - run query', () => {
const user = userEvent.setup({ delay: null });
await renderWithFilter();
await user.click(screen.getByRole('button', { name: /run query/i }));
// The button reads Cancel while the list is still fetching.
await user.click(await screen.findByTestId('explorer-run-query-btn'));
await waitFor(() =>
expect(lastNavigatedFilterItems()).toStrictEqual(KEPT_FILTER_ITEMS),
@@ -99,9 +100,9 @@ describe('Exceptions page - run query', () => {
const user = userEvent.setup({ delay: null });
await renderWithFilter();
await user.click(
within(screen.getByTestId('qb-search-select')).getByRole('combobox'),
);
within(screen.getByTestId('qb-search-select'))
.getByRole('combobox', { hidden: true })
.focus();
await user.keyboard('{Control>}{Enter}{/Control}');
await waitFor(() =>

View File

@@ -106,9 +106,13 @@ function renderMenu(): void {
);
}
async function openSubmenu(name: string): Promise<void> {
await userEvent.click(screen.getByRole('button', { name: 'Panel actions' }));
await userEvent.click(await screen.findByRole('menuitem', { name }));
const MENU_TEST_ID = 'panel-actions-panel-1';
async function openSubmenu(value: string): Promise<void> {
await userEvent.click(screen.getByTestId(MENU_TEST_ID));
await userEvent.click(
await screen.findByTestId(`${MENU_TEST_ID}-item-${value}`),
);
}
describe('PanelActionsMenu submenus', () => {
@@ -121,8 +125,12 @@ describe('PanelActionsMenu submenus', () => {
['Download as SVG', 'svg'],
])('"%s" downloads the panel image as %s', async (label, format) => {
renderMenu();
await openSubmenu('Download');
await userEvent.click(await screen.findByRole('menuitem', { name: label }));
await openSubmenu('download');
const row = await screen.findByTestId(
`${MENU_TEST_ID}-item-download-${format}`,
);
expect(row).toHaveTextContent(label);
await userEvent.click(row);
expect(mockDownloadImage).toHaveBeenCalledTimes(1);
expect(mockDownloadImage).toHaveBeenCalledWith('panel-1', 'Requests', format);
@@ -131,33 +139,38 @@ describe('PanelActionsMenu submenus', () => {
it('"Download as CSV" exports the table data, not an image', async () => {
renderMenu();
await openSubmenu('Download');
await userEvent.click(
await screen.findByRole('menuitem', { name: 'Download as CSV' }),
);
await openSubmenu('download');
const row = await screen.findByTestId(`${MENU_TEST_ID}-item-download-csv`);
expect(row).toHaveTextContent('Download as CSV');
await userEvent.click(row);
expect(mockDownloadCsv).toHaveBeenCalledTimes(1);
expect(mockDownloadImage).not.toHaveBeenCalled();
});
it.each([
['Dashboard (root)', 0],
['B', 2],
])('Move to "%s" moves the panel to layout %s', async (label, target) => {
renderMenu();
await openSubmenu('Move to section');
['Dashboard (root)', 0, 'move-to-root'],
['B', 2, 'move-2'],
])(
'Move to "%s" moves the panel to layout %s',
async (label, target, value) => {
renderMenu();
await openSubmenu('move');
const row = await screen.findByRole('menuitem', { name: label });
// The panel already sits in "A".
expect(screen.queryByRole('menuitem', { name: 'A' })).not.toBeInTheDocument();
const row = await screen.findByTestId(`${MENU_TEST_ID}-item-${value}`);
expect(row).toHaveTextContent(label);
expect(
screen.queryByTestId(`${MENU_TEST_ID}-item-move-1`),
).not.toBeInTheDocument();
await userEvent.click(row);
await userEvent.click(row);
expect(mockMovePanel).toHaveBeenCalledTimes(1);
expect(mockMovePanel).toHaveBeenCalledWith({
panelId: 'panel-1',
fromLayoutIndex: 1,
toLayoutIndex: target,
});
});
expect(mockMovePanel).toHaveBeenCalledTimes(1);
expect(mockMovePanel).toHaveBeenCalledWith({
panelId: 'panel-1',
fromLayoutIndex: 1,
toLayoutIndex: target,
});
},
);
});

View File

@@ -1,8 +1,7 @@
import { server } from 'mocks-server/server';
import userEvent from '@testing-library/user-event';
import { rest } from 'msw';
import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
import { render, screen, waitFor, within } from 'tests/test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import {
AUTHZ_CHECK_URL,
setupAuthzAdmin,
@@ -94,8 +93,7 @@ describe('DashboardsList - AuthZ', () => {
});
describe('list permission', () => {
it('blocks the table and never fires the list request when list is denied', async () => {
const onList = jest.fn();
const denyList = (onList = jest.fn()): void => {
server.use(
// Create is still granted — the CTA must stay usable (authz guide list pattern).
setupAuthzAllow(DashboardCreatePermission),
@@ -110,26 +108,48 @@ describe('DashboardsList - AuthZ', () => {
);
}),
);
};
it('blocks the table and never fires the list request when list is denied', async () => {
const onList = jest.fn();
denyList(onList);
renderList();
await waitFor(() => {
expect(
screen.getAllByText(/is not authorized to perform/).length,
).toBeGreaterThan(0);
});
expect(
(await screen.findAllByText(/is not authorized to perform/)).length,
).toBeGreaterThan(0);
expect(screen.getAllByText('list:dashboard:*').length).toBeGreaterThan(0);
expect(onList).not.toHaveBeenCalled();
const cta = screen.getByTestId('new-dashboard-cta');
expect(cta).not.toHaveAttribute('aria-disabled', 'true');
});
it('turns off the search box and filters when list is denied', async () => {
denyList();
renderList();
// The box and filters edit a query only the list API can run, so they are
// inert and say why; the rail carries its own denial.
expect(
within(screen.getByTestId('dashboards-filter-created-by')).getByRole(
'combobox',
await expect(
screen.findByTestId('views-rail-denied'),
).resolves.toBeInTheDocument();
await waitFor(() =>
expect(screen.getByTestId('dashboards-search-zone')).toHaveAttribute(
'data-denied-permissions',
DashboardListPermission,
),
);
expect(screen.getByTestId('dashboards-filter-zone')).toHaveAttribute(
'data-denied-permissions',
DashboardListPermission,
);
expect(
screen
.getByTestId('dashboards-filter-created-by')
.querySelector('input[role="combobox"]'),
).toBeDisabled();
expect(screen.getByLabelText('Run search')).toHaveAttribute(
'aria-disabled',
@@ -138,22 +158,27 @@ describe('DashboardsList - AuthZ', () => {
expect(
screen.getByTestId('dashboards-list-search').querySelector('.cm-content'),
).toHaveAttribute('contenteditable', 'false');
expect(screen.getByTestId('views-rail-denied')).toBeInTheDocument();
});
expect(screen.getByTestId('dashboards-search-zone')).toHaveAttribute(
'data-denied-permissions',
DashboardListPermission,
);
expect(screen.getByTestId('dashboards-filter-zone')).toHaveAttribute(
'data-denied-permissions',
DashboardListPermission,
it('explains the list denial in a tooltip on the search box', async () => {
const user = userEvent.setup();
denyList();
renderList();
await waitFor(() =>
expect(screen.getByTestId('dashboards-search-zone')).toHaveAttribute(
'data-denied-permissions',
DashboardListPermission,
),
);
// Radix's content has no testid, and the table's callout carries the same
// words, so the reason is read off the tooltip role.
await userEvent.hover(screen.getByTestId('dashboards-search-zone'));
await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
'is not authorized to perform list:dashboard:*',
await user.hover(screen.getByTestId('dashboards-search-zone'));
await waitFor(() =>
expect(document.querySelector('[role="tooltip"]')).toHaveTextContent(
'is not authorized to perform list:dashboard:*',
),
);
});
@@ -208,11 +233,9 @@ describe('DashboardsList - AuthZ', () => {
renderList();
await waitFor(() => {
expect(
screen.getAllByText(/is not authorized to perform/).length,
).toBeGreaterThan(0);
});
expect(
(await screen.findAllByText(/is not authorized to perform/)).length,
).toBeGreaterThan(0);
expect(onViews).not.toHaveBeenCalled();
});
});
@@ -238,11 +261,9 @@ describe('DashboardsList - AuthZ', () => {
renderList();
await waitFor(() => {
expect(
screen.getAllByText(/is not authorized to perform/).length,
).toBeGreaterThan(0);
});
expect(
(await screen.findAllByText(/is not authorized to perform/)).length,
).toBeGreaterThan(0);
expect(onList).not.toHaveBeenCalled();
});
});

View File

@@ -5,13 +5,14 @@ import {
initialQueryBuilderFormValues,
PANEL_TYPES,
} from 'constants/queryBuilder';
import { LOCALSTORAGE } from 'constants/localStorage';
import { noop } from 'lodash-es';
import { logsQueryRangeSuccessResponse } from 'mocks-server/__mockdata__/logs_query_range';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { PreferenceContextProvider } from 'providers/preferences/context/PreferenceContextProvider';
import { QueryBuilderContext } from 'providers/QueryBuilder';
import { fireEvent, render, waitFor } from 'tests/test-utils';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import { Query } from 'types/api/queryBuilder/queryBuilderData';
import LogsExplorer from '../index';
@@ -38,6 +39,26 @@ jest.mock(
},
);
jest.mock(
'components/OverlayScrollbar/OverlayScrollbar',
() =>
function MockOverlayScrollbar({
children,
}: {
children: React.ReactNode;
}): JSX.Element {
return <div>{children}</div>;
},
);
jest.mock(
'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch',
() =>
function MockQuerySearch(): JSX.Element {
return <div data-testid="mock-query-search" />;
},
);
jest.mock('constants/panelTypes', () => ({
AVAILABLE_EXPORT_PANEL_TYPES: ['graph', 'table'],
}));
@@ -71,6 +92,8 @@ jest.mock('providers/preferences/sync/usePreferenceSync', () => ({
}),
}));
const FREQUENCY_CHART_TOGGLE_TEST_ID = 'logs-frequency-chart-toggle';
const logsQueryServerRequest = (): void =>
server.use(
rest.post(queryRangeURL, (req, res, ctx) =>
@@ -79,21 +102,25 @@ const logsQueryServerRequest = (): void =>
);
describe('Logs Explorer Tests', () => {
beforeEach(() => {
localStorage.removeItem(LOCALSTORAGE.SHOW_FREQUENCY_CHART);
});
it('Logs Explorer default view test without data', async () => {
const { getByRole, queryByText, getByTestId, queryByTestId, container } =
render(
<PreferenceContextProvider>
<LogsExplorer />
</PreferenceContextProvider>,
undefined,
{
initialRoute: '/logs-explorer/?panelType=list&selectedExplorerView=list',
},
);
const user = userEvent.setup();
const { queryByText, getByTestId, queryByTestId, container } = render(
<PreferenceContextProvider>
<LogsExplorer />
</PreferenceContextProvider>,
undefined,
{
initialRoute: '/logs-explorer/?panelType=list&selectedExplorerView=list',
},
);
// by default is hidden, toggle the chart and check it's visibility
const histogramToggle = getByRole('switch');
fireEvent.click(histogramToggle);
expect(queryByText(frequencyChartContent)).not.toBeInTheDocument();
await user.click(getByTestId(FREQUENCY_CHART_TOGGLE_TEST_ID));
expect(queryByText(frequencyChartContent)).toBeInTheDocument();
// check the presence of search bar and query builder and absence of clickhouse
@@ -173,7 +200,7 @@ describe('Logs Explorer Tests', () => {
it('Multiple Current Queries', async () => {
// mocking the query range API to return the logs
logsQueryServerRequest();
const { queryAllByText } = render(
render(
<QueryBuilderContext.Provider
value={{
isDefaultQuery: (): boolean => false,
@@ -233,14 +260,13 @@ describe('Logs Explorer Tests', () => {
},
);
const queries = queryAllByText(
"Enter your filter query (e.g., http.status_code >= 500 AND service.name = 'frontend')",
);
expect(queries).toHaveLength(1);
expect(screen.getAllByTestId('mock-query-search')).toHaveLength(1);
});
it('frequency chart visibility and switch toggle', async () => {
const { getByRole, queryByText } = render(
localStorage.setItem(LOCALSTORAGE.SHOW_FREQUENCY_CHART, 'true');
const user = userEvent.setup();
const { queryByText } = render(
<PreferenceContextProvider>
<LogsExplorer />
</PreferenceContextProvider>,
@@ -254,12 +280,13 @@ describe('Logs Explorer Tests', () => {
expect(queryByText('Frequency chart')).toBeInTheDocument();
// check the default state of the histogram toggle
const histogramToggle = getByRole('switch');
const histogramToggle = screen.getByTestId(FREQUENCY_CHART_TOGGLE_TEST_ID);
expect(histogramToggle).toBeInTheDocument();
expect(histogramToggle).toBeChecked();
expect(queryByText(frequencyChartContent)).toBeInTheDocument();
// toggle the chart and check it gets removed from the DOM
await fireEvent.click(histogramToggle);
await user.click(histogramToggle);
expect(histogramToggle).not.toBeChecked();
expect(queryByText(frequencyChartContent)).not.toBeInTheDocument();
});

View File

@@ -11,25 +11,18 @@ describe('Services', () => {
expect(screen.getByTestId('resource-environment-filter')).toBeInTheDocument();
const application = screen.getByRole('columnheader', {
name: /application/i,
});
expect(application).toBeInTheDocument();
const p99 = screen.getByRole('columnheader', {
name: /p99 latency \(in ms\)/i,
});
expect(p99).toBeInTheDocument();
const errorRate = screen.getByRole('columnheader', {
name: /error rate \(% of total\)/i,
});
expect(errorRate).toBeInTheDocument();
const operationPerSecond = screen.getByRole('columnheader', {
name: /operations per second/i,
});
expect(operationPerSecond).toBeInTheDocument();
const columnHeaders = Array.from(
document.querySelectorAll('th'),
(header) => header.textContent,
);
expect(columnHeaders).toStrictEqual(
expect.arrayContaining([
expect.stringMatching(/application/i),
expect.stringMatching(/p99 latency \(in ms\)/i),
expect.stringMatching(/error rate \(% of total\)/i),
expect.stringMatching(/operations per second/i),
]),
);
});
// TODO: Fix this test

View File

@@ -135,6 +135,7 @@ function SignUp(): JSX.Element {
autoFocus
required
id="signupEmail"
data-testid="signup-email"
className="signup-form-input"
/>
</FormContainer.Item>
@@ -150,6 +151,7 @@ function SignUp(): JSX.Element {
<AntdInput.Password
required
id="currentPassword"
data-testid="signup-password"
placeholder="Enter new password"
disabled={loading}
className="signup-antd-input"
@@ -173,6 +175,7 @@ function SignUp(): JSX.Element {
<AntdInput.Password
required
id="confirmPassword"
data-testid="signup-confirm-password"
placeholder="Confirm your new password"
disabled={loading}
className="signup-antd-input"
@@ -198,6 +201,7 @@ function SignUp(): JSX.Element {
color="primary"
type="submit"
data-attr="signup"
testId="signup-submit"
disabled={!!invalidFormReason}
loading={loading}
width="100%"

View File

@@ -31,6 +31,35 @@ const mockTokenResponse: Token = {
refreshToken: 'mock-refresh-token',
};
type User = ReturnType<typeof userEvent.setup>;
type SignupField =
| 'signup-email'
| 'signup-password'
| 'signup-confirm-password';
async function enterValue(
user: User,
testId: SignupField,
value: string,
): Promise<void> {
await user.click(screen.getByTestId(testId));
await user.paste(value);
}
async function fillSignupForm(
user: User,
{
email,
password,
confirmPassword,
}: { email: string; password: string; confirmPassword: string },
): Promise<void> {
await enterValue(user, 'signup-email', email);
await enterValue(user, 'signup-password', password);
await enterValue(user, 'signup-confirm-password', confirmPassword);
}
describe('SignUp Component - Regular Signup', () => {
beforeEach(() => {
jest.clearAllMocks();
@@ -52,9 +81,9 @@ describe('SignUp Component - Regular Signup', () => {
expect(
screen.getByLabelText(/confirm your new password/i),
).toBeInTheDocument();
expect(
screen.getByRole('button', { name: /access my workspace/i }),
).toBeInTheDocument();
expect(screen.getByTestId('signup-submit')).toHaveTextContent(
/access my workspace/i,
);
});
it('shows info callout for admin account creation', () => {
@@ -70,57 +99,43 @@ describe('SignUp Component - Regular Signup', () => {
it('disables submit button when form is invalid', async () => {
render(<SignUp />, undefined, { initialRoute: '/signup' });
const submitButton = screen.getByRole('button', {
name: /access my workspace/i,
});
const submitButton = screen.getByTestId('signup-submit');
expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
it('disables submit button for partially filled fields', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<SignUp />, undefined, { initialRoute: '/signup' });
const emailInput = screen.getByLabelText(/email address/i);
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /access my workspace/i,
});
const submitButton = screen.getByTestId('signup-submit');
// Missing email
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password123');
await enterValue(user, 'signup-password', 'password123');
await enterValue(user, 'signup-confirm-password', 'password123');
expect(submitButton).toHaveAttribute('aria-disabled', 'true');
// Missing password
await user.clear(passwordInput);
await user.clear(confirmPasswordInput);
await user.type(emailInput, 'test@signoz.io');
await user.type(confirmPasswordInput, 'password123');
await user.clear(screen.getByTestId('signup-password'));
await user.clear(screen.getByTestId('signup-confirm-password'));
await enterValue(user, 'signup-email', 'test@signoz.io');
await enterValue(user, 'signup-confirm-password', 'password123');
expect(submitButton).toHaveAttribute('aria-disabled', 'true');
// Missing confirm password
await user.clear(confirmPasswordInput);
await user.type(passwordInput, 'password123');
await user.clear(screen.getByTestId('signup-confirm-password'));
await enterValue(user, 'signup-password', 'password123');
expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
it('shows error when passwords do not match', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<SignUp />, undefined, { initialRoute: '/signup' });
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password456');
await enterValue(user, 'signup-password', 'password123');
await enterValue(user, 'signup-confirm-password', 'password456');
await user.tab(); // Blur the confirm password field to trigger validation
await expect(
@@ -129,25 +144,20 @@ describe('SignUp Component - Regular Signup', () => {
});
it('clears password mismatch error when passwords match', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
render(<SignUp />, undefined, { initialRoute: '/signup' });
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password456');
await enterValue(user, 'signup-password', 'password123');
await enterValue(user, 'signup-confirm-password', 'password456');
await user.tab(); // Blur the confirm password field to trigger validation
await expect(
screen.findByText(/passwords don't match/i),
).resolves.toBeInTheDocument();
await user.clear(confirmPasswordInput);
await user.type(confirmPasswordInput, 'password123');
await user.clear(screen.getByTestId('signup-confirm-password'));
await user.paste('password123');
await user.tab(); // Blur again to trigger validation
await waitFor(() => {
@@ -160,7 +170,7 @@ describe('SignUp Component - Regular Signup', () => {
describe('Successful Signup', () => {
it('successfully creates account and logs in user', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(REGISTER_ENDPOINT, (_req, res, ctx) =>
@@ -185,18 +195,13 @@ describe('SignUp Component - Regular Signup', () => {
render(<SignUp />, undefined, { initialRoute: '/signup' });
const emailInput = screen.getByLabelText(/email address/i);
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /access my workspace/i,
});
const submitButton = screen.getByTestId('signup-submit');
await user.type(emailInput, 'test@signoz.io');
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password123');
await fillSignupForm(user, {
email: 'test@signoz.io',
password: 'password123',
confirmPassword: 'password123',
});
await waitFor(() => {
expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
@@ -215,7 +220,7 @@ describe('SignUp Component - Regular Signup', () => {
describe('Error Handling', () => {
it('displays error message when signup API fails', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.post(REGISTER_ENDPOINT, (_req, res, ctx) =>
@@ -233,18 +238,13 @@ describe('SignUp Component - Regular Signup', () => {
render(<SignUp />, undefined, { initialRoute: '/signup' });
const emailInput = screen.getByLabelText(/email address/i);
const passwordInput = screen.getByPlaceholderText(/enter new password/i);
const confirmPasswordInput = screen.getByPlaceholderText(
/confirm your new password/i,
);
const submitButton = screen.getByRole('button', {
name: /access my workspace/i,
});
const submitButton = screen.getByTestId('signup-submit');
await user.type(emailInput, 'existing@signoz.io');
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password123');
await fillSignupForm(user, {
email: 'existing@signoz.io',
password: 'password123',
confirmPassword: 'password123',
});
await waitFor(() => {
expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
@@ -258,13 +258,17 @@ describe('SignUp Component - Regular Signup', () => {
});
describe('Enter key submission', () => {
function mockSignup(delayMs = 0): { registerCalls: () => number } {
function mockSignup(): {
registerCalls: () => number;
holdResponse: () => () => void;
} {
let calls = 0;
let pending: Promise<void> = Promise.resolve();
server.use(
rest.post(REGISTER_ENDPOINT, (_req, res, ctx) => {
rest.post(REGISTER_ENDPOINT, async (_req, res, ctx) => {
calls += 1;
await pending;
return res(
ctx.delay(delayMs),
ctx.status(200),
ctx.json({ data: mockSignupResponse, status: 'success' }),
);
@@ -276,24 +280,30 @@ describe('SignUp Component - Regular Signup', () => {
),
),
);
return { registerCalls: (): number => calls };
return {
registerCalls: (): number => calls,
holdResponse: (): (() => void) => {
let release: () => void = () => {};
pending = new Promise((resolve) => {
release = resolve;
});
return release;
},
};
}
it('submits once on Enter in the confirm password field', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const { registerCalls } = mockSignup();
render(<SignUp />, undefined, { initialRoute: '/signup' });
await user.type(screen.getByLabelText(/email address/i), 'test@signoz.io');
await user.type(
screen.getByPlaceholderText(/enter new password/i),
'password123',
);
await user.type(
screen.getByPlaceholderText(/confirm your new password/i),
'password123{enter}',
);
await fillSignupForm(user, {
email: 'test@signoz.io',
password: 'password123',
confirmPassword: 'password123',
});
await user.keyboard('{enter}');
await waitFor(() => {
expect(mockAfterLogin).toHaveBeenCalledWith(
@@ -305,23 +315,20 @@ describe('SignUp Component - Regular Signup', () => {
});
it('does not submit on Enter while the passwords do not match', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
const { registerCalls } = mockSignup();
render(<SignUp />, undefined, { initialRoute: '/signup' });
await user.type(screen.getByLabelText(/email address/i), 'test@signoz.io');
await user.type(
screen.getByPlaceholderText(/enter new password/i),
'password123',
await fillSignupForm(user, {
email: 'test@signoz.io',
password: 'password123',
confirmPassword: 'password456',
});
expect(screen.getByTestId('signup-submit')).toHaveAttribute(
'aria-disabled',
'true',
);
await user.type(
screen.getByPlaceholderText(/confirm your new password/i),
'password456',
);
expect(
screen.getByRole('button', { name: /access my workspace/i }),
).toHaveAttribute('aria-disabled', 'true');
await user.keyboard('{enter}');
@@ -331,31 +338,30 @@ describe('SignUp Component - Regular Signup', () => {
});
it('does not submit again on Enter while the first submit is loading', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const { registerCalls } = mockSignup(1000);
const user = userEvent.setup();
const { registerCalls, holdResponse } = mockSignup();
const releaseResponse = holdResponse();
render(<SignUp />, undefined, { initialRoute: '/signup' });
const emailInput = screen.getByLabelText(/email address/i);
await user.type(emailInput, 'test@signoz.io');
await user.type(
screen.getByPlaceholderText(/enter new password/i),
'password123',
);
await user.type(
screen.getByPlaceholderText(/confirm your new password/i),
'password123{enter}',
);
await fillSignupForm(user, {
email: 'test@signoz.io',
password: 'password123',
confirmPassword: 'password123',
});
await user.keyboard('{enter}');
await waitFor(() => {
expect(
screen.getByRole('button', { name: /access my workspace/i }),
).toHaveAttribute('aria-disabled', 'true');
expect(screen.getByTestId('signup-submit')).toHaveAttribute(
'aria-disabled',
'true',
);
});
// The password inputs are disabled while loading; the email input is not.
await user.type(emailInput, '{enter}');
await user.type(screen.getByTestId('signup-email'), '{enter}');
releaseResponse();
await waitFor(() => {
expect(mockAfterLogin).toHaveBeenCalled();
});

View File

@@ -15,8 +15,8 @@ import {
fireEvent,
render,
screen,
userEvent,
waitFor,
within,
} from 'tests/test-utils';
import { QueryRangePayloadV5 } from 'types/api/v5/queryRange';
@@ -297,6 +297,7 @@ describe('TracesExplorer -', () => {
});
it('create a dashboard btn assert', async () => {
const user = userEvent.setup();
renderWithTracesExplorerRouter(<TracesExplorer />, [
'/traces-explorer/?panelType=list&selectedExplorerView=list',
]);
@@ -307,24 +308,22 @@ describe('TracesExplorer -', () => {
await waitFor(() =>
expect(createDashboardBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
fireEvent.click(createDashboardBtn);
await user.click(createDashboardBtn);
const createDashboardModal = (await screen.findByRole(
'dialog',
)) as HTMLElement;
const newDashboardBtn = await screen.findByTestId(
'export-panel-new-dashboard',
);
const createDashboardModal = newDashboardBtn.closest('[role="dialog"]');
expect(createDashboardModal).toBeInTheDocument();
// assert modal content
expect(
within(createDashboardModal).getByTestId('export-panel-new-dashboard'),
).toBeInTheDocument();
expect(
within(createDashboardModal).getByTestId('export-panel-export'),
).toBeInTheDocument();
expect(createDashboardModal).toContainElement(
screen.getByTestId('export-panel-export'),
);
});
it('create an alert btn assert', async () => {
const user = userEvent.setup();
renderWithTracesExplorerRouter(<TracesExplorer />, [
'/traces-explorer/?panelType=list&selectedExplorerView=list',
]);
@@ -333,7 +332,7 @@ describe('TracesExplorer -', () => {
await waitFor(() =>
expect(createAlertBtn).not.toHaveAttribute('aria-disabled', 'true'),
);
fireEvent.click(createAlertBtn);
await user.click(createAlertBtn);
expect(getCurrentLocation().pathname).toBe(ROUTES.ALERTS_NEW);
});

View File

@@ -20,7 +20,7 @@ import MyComponent from '../MyComponent';
describe('MyComponent', () => {
it('renders and interacts', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
server.use(
rest.get('*/api/v1/example', (_req, res, ctx) => res(ctx.status(200), ctx.json({ value: 42 })))
@@ -40,6 +40,8 @@ The full list is [`.claude/rules/frontend-tests.md`](../../../.claude/rules/fron
- Import from `tests/test-utils` only.
- Prefer `userEvent` for real interactions; use `fireEvent` only for low-level events (scroll/resize/setting `scrollTop`).
- One behaviour per test, rendering the smallest component that owns it; each test under 500 ms (`pnpm jest <file> --verbose`).
- Never call `*ByRole` inside `waitFor`; never raise a timeout to make a slow test pass.
- Use MSW to mock network calls; large JSON goes in `mocks-server/__mockdata__`.
- Keep tests type-safe (`jest.MockedFunction<T>`, avoid `any`).
- Find elements by test ID (`getByTestId`, `findByTestId`); role or text only for markup the app doesn't own.
@@ -48,6 +50,7 @@ The full list is [`.claude/rules/frontend-tests.md`](../../../.claude/rules/fron
Repo-specific reasons:
- The harness wires Redux, React Query, i18n, timezone, preferences, so importing from RTL directly bypasses critical providers.
- Some infra deps are globally mocked (e.g., `uplot`) to keep tests fast and stable.
- `jest.setup.ts` turns off user-event's pointer-events check, Floating UI positioning and antd's scroll-container lookup for every test. Each walks `getComputedStyle` up the DOM, which jsdom computes slowly.
- For virtualization (react-virtuoso), there is no `userEvent` scroll helper; use `fireEvent.scroll` after setting `element.scrollTop`.
#### Example patterns (from `components/QuickFilters/tests/QuickFilters.test.tsx`)
@@ -73,7 +76,7 @@ jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
Interact via test IDs:
```ts
const user = userEvent.setup({ pointerEventsCheck: 0 });
const user = userEvent.setup();
await user.click(screen.getByTestId('save-changes'));
expect(screen.getByText(/ADDED FILTERS/i)).toBeInTheDocument();
```
@@ -113,5 +116,5 @@ const navigateSpy = mockNavigate(); // module-level navigate()
```
#### Notes
- Global mocks configured in Jest: `uplot` → `__mocks__/uplotMock.ts`.
- Global mocks configured in Jest: `uplot` → `__mocks__/uplotMock.ts`; `@floating-ui/dom`, `@testing-library/user-event` and antd's `collectScroller` in `jest.setup.ts`.
- If a test needs custom behavior (e.g., different API response), override with `server.use(...)` locally.

View File

@@ -0,0 +1,34 @@
import { render, screen, userEvent } from 'tests/test-utils';
describe('userEvent from the harness', () => {
const onClick = jest.fn();
const renderBlockedButton = (): void => {
render(
<button
type="button"
data-testid="blocked"
style={{ pointerEvents: 'none' }}
onClick={onClick}
>
Blocked
</button>,
);
};
it('skips the pointer-events check for setup()', async () => {
renderBlockedButton();
await userEvent.setup().click(screen.getByTestId('blocked'));
expect(onClick).toHaveBeenCalledTimes(1);
});
it('skips the pointer-events check for the direct API', async () => {
renderBlockedButton();
await userEvent.click(screen.getByTestId('blocked'));
expect(onClick).toHaveBeenCalledTimes(1);
});
});

View File

@@ -0,0 +1,60 @@
type UserEventModule = typeof import('@testing-library/user-event');
type UserEvent = UserEventModule['default'];
type DirectMethod = Exclude<keyof UserEvent, 'setup'>;
const actual = jest.requireActual<UserEventModule>(
'@testing-library/user-event',
);
const userEvent = actual.default;
// The pointer-events check walks getComputedStyle up the tree on every action.
const DEFAULTS = {
pointerEventsCheck: actual.PointerEventsCheckLevel.Never,
};
// Position of the options argument in each direct API call.
const OPTIONS_INDEX: Record<Exclude<DirectMethod, 'clear'>, number> = {
copy: 0,
cut: 0,
tab: 0,
click: 1,
dblClick: 1,
tripleClick: 1,
hover: 1,
unhover: 1,
keyboard: 1,
pointer: 1,
paste: 1,
deselectOptions: 2,
selectOptions: 2,
type: 2,
upload: 2,
};
const withDefaults =
(name: DirectMethod, optionsIndex: number) =>
(...args: unknown[]): Promise<unknown> => {
const next = [...args];
next[optionsIndex] = {
...DEFAULTS,
...(next[optionsIndex] as object | undefined),
};
return Reflect.apply(userEvent[name], userEvent, next);
};
const directApi = Object.fromEntries(
Object.entries(OPTIONS_INDEX).map(([name, index]) => [
name,
withDefaults(name as DirectMethod, index),
]),
);
const userEventWithDefaults: UserEvent = {
...userEvent,
...directApi,
clear: (element) => userEvent.setup(DEFAULTS).clear(element),
setup: (options) => userEvent.setup({ ...DEFAULTS, ...options }),
};
export const { PointerEventsCheckLevel } = actual;
export default userEventWithDefaults;