* test(web): audit branch-coverage outliers, raise per-file gate to 70 (#1271) The web per-file coverage gate had drifted red: the recently-landed EMA auth feature (core/auth/ema/*) and ClientSettings components shipped undertested, and the prior 50% branch floor let business-logic branches go untested. CI does not run the coverage gate, so this accumulated. Add tests to bring every failing file above the gate and push branch coverage well past 70 across the board, then raise the per-file branches threshold 50 -> 70 in clients/web/vite.config.ts. - EMA core (emaFlow, resourceContext, jwt, wire): 50-88% -> 86-100% branch - EMA OIDC/transport (idpOidc, tokenEndpoint, transportProvider): -> 97-100% - oauthManager / discovery: 73-83% -> 88-92% - ClientSettingsModal/Form, ConnectionInfoContent: 0-88% -> 96-100% - useClientSettingsDraft / useEmaIdpLoginState hooks: 20% -> 100% - TaskStatusBadge / SortableServerCard outliers: 50% -> 100% Coverable branches reached by mocking useComputedColorScheme (dark theme), dnd-kit useSortable (isDragging), and fetch/OIDC paths. Remaining sub-100 branches are genuinely-unreachable defensive guards or happy-dom-inherent (portal / useMediaQuery / typeof window) and documented in test comments. No source files changed. Global web branch coverage 88.73% -> 90.63%. AGENTS.md updated; cli/tui/launcher stay at 50 (out of scope). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test: raise per-file coverage gate to 90/90/90/90 across all clients Follows the #1271 web branch-coverage audit (50 -> 70) by raising the whole per-file gate to >=90 on all four dimensions — lines, statements, functions, branches — for web, cli, tui, and launcher (core/ is measured under the web suite). A codebase-wide audit added real tests for every outlier and brought global coverage up across the board. Config: all four vitest/vite coverage configs set to 90/90/90/90. Two pure-type modules (core/mcp/import/types.ts, clients/web/server/ types.ts) added to the web coverage exclude list, matching the existing type-only exclusions. Tests: ~50 test files extended/created across core (auth, ema, mcp, remote, state, storage, react), web components/screens/server, and the cli/tui clients. Highlights: full EMA OAuth flow + transport coverage, inspectorClient/remote server backfill, every Mantine control's handler branches, and the cli unsupported-method / argv-fallback paths. Genuinely-unreachable branches are annotated at the source with justified `/* v8 ignore -- <reason> */` comments rather than lowering the gate: happy-dom-inherent paths (Mantine portal, useMediaQuery, typeof window SSR guards), React StrictMode effect replay, and provably-dead defensive guards (?? fallbacks the types make impossible, Select.onChange values outside the allowed list). No runtime logic changed; the only structural edits are two behavior-preserving refactors (ResourceTemplatePanel hoists the field value to a local so the ignore applies in JSX; ToolsScreen swaps a ternary for an if) and prettier line-wrapping. Also fixed a flaky real-timer debounce assertion in PromptArgumentsForm (asserted an exact sibling-typing interleaving that raced the 300ms debounce; now asserts the load-bearing fact — a non-empty fire-time sibling capture). AGENTS.md updated to describe the uniform 90 gate and the v8-ignore policy. All four client coverage gates, root validate, storybook (370), and smoke pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(web): make connect-crash SSE reader stop on the terminal event `readSseEvents` looped until the server closed the stream (`done`). The server closes the events stream immediately after writing the terminal `transport_error`, but under the heavy parallel scheduler pressure of a full `coverage` run (v8 instrumentation across all workers) that close can lag far enough behind the event to trip the 30s test timeout — a hang, not a wrong result. This made the test intermittently fail under `npm run coverage` (it passed in isolation and under CI's lighter `test:integration`). Stop reading as soon as the terminal `transport_error` event arrives (cancelling the reader) instead of waiting only for `done`. That event is always the last one the session queue emits, so nothing is lost, and the test no longer depends on stream-close timing. The `done` break is kept for any stream that closes first. Verified green across two consecutive full `npm run test:coverage` runs (3094 tests) where it previously hung, plus isolation (~0.5s). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Cliff Hall
GitHub
parent
d04a7fb9c8
commit
c96db0402e
86 changed files with 8793 additions and 63 deletions
|
|
@ -127,7 +127,7 @@ All work should be driven by items on the project board.
|
|||
- Run TUI tests with `npm run test` from `clients/tui/`
|
||||
- The repo root has no aggregate `test` script — each client self-validates, so run `npm run validate` from the root (all clients, fast) or `cd clients/<name> && npm run validate` (one client). Each client still exposes its own `test` / `test:coverage` for quick iteration.
|
||||
- **`validate` is fast: it runs `test`, not `test:coverage`.** The coverage gate (slower — adds v8 instrumentation, and for web the integration project) is a **separate** top-level `npm run coverage` (and per-client `coverage:web` / `coverage:cli` / `coverage:tui` / `coverage:launcher`, each delegating to that client's `test:coverage`). Run `npm run coverage` when you want the gate. **CI does NOT run `coverage`** — the gate is local-only; CI runs `validate` (fast) plus the web integration suite (`clients/web` `test:integration`, no coverage) so the integration paths are still exercised.
|
||||
- Each client's `test:coverage` enforces a per-file gate: lines ≥ 90, statements ≥ 85, functions ≥ 80, branches ≥ 50 (CI enforces this gate). Branches is intentionally relaxed because Mantine portal/media-query branches are not exercisable under happy-dom; new business-logic branches should still be covered.
|
||||
- Each client's `test:coverage` enforces a **uniform per-file gate of ≥ 90 on all four dimensions** — lines, statements, functions, and branches — across `clients/web`, `clients/cli`, `clients/tui`, and `clients/launcher` (CI enforces this gate). This is the result of a codebase-wide audit: the branch floor was first lifted 50 → 70 for web (#1271), then the whole gate raised to 90 with real tests added for every outlier. Genuinely-unreachable branches are **not** waved through by lowering the gate — they are annotated at the source with a justified `/* v8 ignore … -- <reason> */` comment. Acceptable reasons are happy-dom-inherent paths (Mantine portal mount points, `useMediaQuery` fallbacks, `typeof window` SSR guards), React StrictMode effect-replay blocks, and provably-dead defensive guards (e.g. a `?? fallback` for a value the types guarantee non-null, or a `Select.onChange` receiving a value outside the allowed list). New code must clear 90 on every dimension; reach for a justified `v8 ignore` only when a branch is genuinely impossible to exercise.
|
||||
- The **same per-file gate** is enforced for the CLI and TUI (#1484), not just web:
|
||||
- **CLI** (`clients/cli`): tests run **in-process** by importing `runCli()` (see `__tests__/helpers/cli-runner.ts`) so `clients/cli/src` is measured under v8 instrumentation. A thin out-of-process layer (`__tests__/e2e.test.ts` + `scripts/smoke-cli.mjs`) still spawns the built binary for the shebang/`process.exit` paths; `src/index.ts` (binary bootstrap) is the only coverage exclusion. `commander` uses `.exitOverride()` so a parse error throws instead of tearing down the test worker.
|
||||
- **TUI** (`clients/tui`): the gate covers the **non-React logic** only — `logger.ts`, `components/tabsConfig.ts`, and `utils/*` (server resolution lives in `core/` and is measured by the web suite). The Ink components, `App.tsx`, and `hooks/` are an **interim exclusion** in `clients/tui/vitest.config.ts` pending the renderer-based follow-up (#1501). When adding new **non-React** logic under `clients/tui/src`, it falls under the gate automatically — add tests for it.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
import { describe, it, expect } from "vitest";
|
||||
import { describe, it, expect, vi } from "vitest";
|
||||
import { mkdtempSync } from "node:fs";
|
||||
import { tmpdir } from "node:os";
|
||||
import { join } from "node:path";
|
||||
import { runCli } from "./helpers/cli-runner.js";
|
||||
import { runCli as runCliDirect } from "../src/cli.js";
|
||||
import {
|
||||
expectCliSuccess,
|
||||
expectCliFailure,
|
||||
|
|
@ -1018,4 +1022,33 @@ describe("CLI Tests", () => {
|
|||
expectCliFailure(result);
|
||||
});
|
||||
});
|
||||
|
||||
describe("argv placeholder fallbacks", () => {
|
||||
// The cli-runner helper always prepends `["node", "inspector-cli", ...]`, so
|
||||
// `rawArgs[0]`/`rawArgs[1]` are never undefined through it. Call `runCli`
|
||||
// directly with a too-short argv to exercise the `?? "node"` /
|
||||
// `?? "inspector-cli"` fallbacks in parseArgs (commander's `name()`/program
|
||||
// bootstrap). With no method present, parseArgs throws "Method is required"
|
||||
// before any connection, so this stays fully in-process and fast.
|
||||
it("defaults the node/script argv slots when rawArgs has fewer than two entries", async () => {
|
||||
// Point the catalog at a fresh temp file so the empty-argv run resolves
|
||||
// deterministically (the default ~/.mcp-inspector catalog may already hold
|
||||
// several servers on the dev machine). Either way the rawArgs[0]/[1]
|
||||
// fallbacks have already run by the time parseArgs throws.
|
||||
const tempCatalog = join(
|
||||
mkdtempSync(join(tmpdir(), "cli-argv-")),
|
||||
"mcp.json",
|
||||
);
|
||||
const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
|
||||
const prev = process.env.MCP_CATALOG_PATH;
|
||||
process.env.MCP_CATALOG_PATH = tempCatalog;
|
||||
try {
|
||||
await expect(runCliDirect([])).rejects.toThrow();
|
||||
} finally {
|
||||
if (prev === undefined) delete process.env.MCP_CATALOG_PATH;
|
||||
else process.env.MCP_CATALOG_PATH = prev;
|
||||
errorSpy.mockRestore();
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -59,6 +59,22 @@ describe("CLI method coverage", () => {
|
|||
expect(Array.isArray(json.tools)).toBe(true);
|
||||
});
|
||||
|
||||
it("throws for an unsupported method after connecting", async () => {
|
||||
// Reaches the final `else` in callMethod: the connection succeeds, none of
|
||||
// the known method branches match, so it throws "Unsupported method".
|
||||
const result = await runCli([
|
||||
command,
|
||||
...args,
|
||||
"--cli",
|
||||
"--method",
|
||||
"definitely/not-a-real-method",
|
||||
]);
|
||||
|
||||
expectCliFailure(result);
|
||||
expectOutputContains(result, "Unsupported method");
|
||||
expectOutputContains(result, "definitely/not-a-real-method");
|
||||
});
|
||||
|
||||
it("rejects an invalid --transport value before connecting", async () => {
|
||||
const result = await runCli([
|
||||
command,
|
||||
|
|
|
|||
|
|
@ -139,6 +139,11 @@ async function callMethod(
|
|||
if (invocation.result !== null) {
|
||||
result = invocation.result;
|
||||
} else {
|
||||
/* v8 ignore next 9 -- unreachable: InspectorClient.callTool either
|
||||
throws on a tool-execution/transport error (caught by the outer
|
||||
try) or returns an invocation whose `result` is guaranteed
|
||||
non-null (attemptToolCall throws if finalResult is falsy). This
|
||||
else is defensive only. */
|
||||
result = {
|
||||
content: [
|
||||
{
|
||||
|
|
@ -250,6 +255,10 @@ function parseArgs(argv?: string[]): {
|
|||
// (exitCode 0) we return without throwing, so commander falls through to its
|
||||
// normal clean process.exit(0) after printing — preserving that UX. See #1484.
|
||||
program.exitOverride((err) => {
|
||||
/* v8 ignore next -- the `exitCode === 0` arm only fires for --help/--version,
|
||||
which cannot run through the in-process test runner (it would call the
|
||||
real process.exit(0) and tear down the vitest worker). That UX is covered
|
||||
out-of-process in e2e.test.ts; here only the throwing arm is exercised. */
|
||||
if (err.exitCode !== 0) throw err;
|
||||
});
|
||||
const rawArgs = argv ?? process.argv;
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@ export default defineConfig({
|
|||
thresholds: {
|
||||
perFile: true,
|
||||
lines: 90,
|
||||
statements: 85,
|
||||
functions: 80,
|
||||
branches: 50,
|
||||
statements: 90,
|
||||
functions: 90,
|
||||
branches: 90,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ export default defineConfig({
|
|||
thresholds: {
|
||||
perFile: true,
|
||||
lines: 90,
|
||||
statements: 85,
|
||||
functions: 80,
|
||||
branches: 50,
|
||||
statements: 90,
|
||||
functions: 90,
|
||||
branches: 90,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -66,4 +66,43 @@ describe("getTuiLogger", () => {
|
|||
expect(logger).toBeDefined();
|
||||
await waitForFile(join(tempDir, ".mcp-inspector", "auth.log"));
|
||||
});
|
||||
|
||||
it("falls back to USERPROFILE/.mcp-inspector when HOME is unset", async () => {
|
||||
// Exercises the second arm of `HOME || USERPROFILE || "."`: HOME empty so
|
||||
// the chain continues to USERPROFILE (the Windows home var).
|
||||
delete process.env.MCP_INSPECTOR_LOG_DIR;
|
||||
delete process.env.HOME;
|
||||
process.env.USERPROFILE = tempDir;
|
||||
const { getTuiLogger } = await import("../src/logger.js");
|
||||
|
||||
const logger = getTuiLogger();
|
||||
|
||||
expect(logger).toBeDefined();
|
||||
await waitForFile(join(tempDir, ".mcp-inspector", "auth.log"));
|
||||
});
|
||||
|
||||
it('falls back to "." when neither HOME nor USERPROFILE is set', async () => {
|
||||
// Exercises the final arm of the chain: with both home vars unset, the dir
|
||||
// resolves to "./.mcp-inspector" relative to the process cwd. chdir into the
|
||||
// temp dir so the relative path pino opens lands there (and gets cleaned up).
|
||||
delete process.env.MCP_INSPECTOR_LOG_DIR;
|
||||
delete process.env.HOME;
|
||||
delete process.env.USERPROFILE;
|
||||
const originalCwd = process.cwd();
|
||||
process.chdir(tempDir);
|
||||
// Re-read cwd after chdir: on macOS tmpdir is a symlink (/var -> /private/var),
|
||||
// so the resolved cwd differs from `tempDir` and the file lands under it.
|
||||
const resolvedCwd = process.cwd();
|
||||
try {
|
||||
const { getTuiLogger } = await import("../src/logger.js");
|
||||
|
||||
const logger = getTuiLogger();
|
||||
|
||||
expect(logger).toBeDefined();
|
||||
// pino resolves the relative "./.mcp-inspector/auth.log" against cwd.
|
||||
await waitForFile(join(resolvedCwd, ".mcp-inspector", "auth.log"));
|
||||
} finally {
|
||||
process.chdir(originalCwd);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ export function uriTemplateToForm(
|
|||
|
||||
try {
|
||||
const template = new UriTemplate(uriTemplate);
|
||||
/* v8 ignore next -- UriTemplate.variableNames is a getter that always
|
||||
returns a string[]; the `|| []` fallback is an unreachable guard. */
|
||||
const variableNames = template.variableNames || [];
|
||||
|
||||
for (const variableName of variableNames) {
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ export default defineConfig({
|
|||
thresholds: {
|
||||
perFile: true,
|
||||
lines: 90,
|
||||
statements: 85,
|
||||
functions: 80,
|
||||
branches: 50,
|
||||
statements: 90,
|
||||
functions: 90,
|
||||
branches: 90,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -70,6 +70,9 @@ export function createSandboxController(
|
|||
// first signal wins.
|
||||
let settled = false;
|
||||
const settle = (value: { port: number; url: string }) => {
|
||||
/* v8 ignore next -- defensive double-settle guard: for a TCP listen
|
||||
the `error` and `listening` events are mutually exclusive, so the
|
||||
second-signal early-return is unreachable in practice. */
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
resolve(value);
|
||||
|
|
@ -111,7 +114,11 @@ export function createSandboxController(
|
|||
const actualPort =
|
||||
typeof addr === "object" && addr !== null && "port" in addr
|
||||
? addr.port
|
||||
: (addr as unknown as number);
|
||||
: /* v8 ignore next -- unreachable for a TCP listen: `address()`
|
||||
always returns an `AddressInfo` object with `port`. The
|
||||
string form only occurs for unix-socket/pipe listens, which
|
||||
this controller never performs. */
|
||||
(addr as unknown as number);
|
||||
sandboxUrl = `http://${host}:${actualPort}/sandbox`;
|
||||
settle({ port: actualPort, url: sandboxUrl });
|
||||
});
|
||||
|
|
|
|||
|
|
@ -481,6 +481,46 @@ describe("AppRenderer", () => {
|
|||
expect(first.close).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("rebuilds the bridge when only the tool changes (same factory and sandboxPath)", async () => {
|
||||
// Keeps bridgeFactory and sandboxPath stable while swapping the tool, so the
|
||||
// sameInputs short-circuit evaluates all the way to `prev.tool === tool` and
|
||||
// takes its false arm — driving a real rebuild, not a reuse.
|
||||
const first = createMockBridge();
|
||||
const second = createMockBridge();
|
||||
const factory = vi
|
||||
.fn<BridgeFactory>()
|
||||
.mockReturnValueOnce(asBridge(first))
|
||||
.mockReturnValueOnce(asBridge(second));
|
||||
const otherTool: Tool = {
|
||||
name: "other_app",
|
||||
title: "Other App",
|
||||
inputSchema: { type: "object" },
|
||||
};
|
||||
|
||||
const { rerender } = renderWithMantine(
|
||||
<AppRenderer
|
||||
sandboxPath="/sandbox.html"
|
||||
tool={tool}
|
||||
bridgeFactory={factory}
|
||||
/>,
|
||||
);
|
||||
await flushAsync();
|
||||
|
||||
rerender(
|
||||
<AppRenderer
|
||||
sandboxPath="/sandbox.html"
|
||||
tool={otherTool}
|
||||
bridgeFactory={factory}
|
||||
/>,
|
||||
);
|
||||
await flushAsync();
|
||||
|
||||
expect(factory).toHaveBeenCalledTimes(2);
|
||||
expect(factory.mock.calls[1]?.[1]).toBe(otherTool);
|
||||
expect(first.teardownResource).toHaveBeenCalledTimes(1);
|
||||
expect(first.close).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("swallows teardownResource errors but still closes the transport", async () => {
|
||||
const bridge = createMockBridge();
|
||||
bridge.teardownResource.mockRejectedValueOnce(new Error("teardown failed"));
|
||||
|
|
|
|||
|
|
@ -161,6 +161,13 @@ export function AppRenderer({
|
|||
// a synchronous re-setup. If the inputs are identical (StrictMode's
|
||||
// double-invoke, or a transient re-render) keep the live bridge: cancel the
|
||||
// disposal and re-deliver any buffered input/result to it.
|
||||
// This reuse path provably runs under React StrictMode's synchronous
|
||||
// setup→cleanup→setup double-invoke (the "builds a single bridge… StrictMode"
|
||||
// test proves the bridge is reused, not rebuilt — factory called once). v8
|
||||
// cannot attribute coverage to the body of an effect that React replays for
|
||||
// the StrictMode dev-only double-invoke, so the branch + its three
|
||||
// statements read as uncovered despite executing.
|
||||
/* v8 ignore next 4 */
|
||||
if (disposeScheduledRef.current && sameInputs) {
|
||||
disposeScheduledRef.current = false;
|
||||
flushPending();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,20 @@
|
|||
import { describe, it, expect } from "vitest";
|
||||
import { describe, it, expect, vi } from "vitest";
|
||||
import type { LoggingLevel } from "@modelcontextprotocol/sdk/types.js";
|
||||
import { renderWithMantine, screen } from "../../../test/renderWithMantine";
|
||||
import { LogLevelBadge } from "./LogLevelBadge";
|
||||
|
||||
// Drive the `colorScheme === "dark"` branch (which picks black vs white badge
|
||||
// text). `useComputedColorScheme` otherwise resolves to "light" under
|
||||
// happy-dom, leaving the dark arm of the ternary uncovered.
|
||||
const colorSchemeMock = vi.hoisted(() => ({
|
||||
value: "light" as "light" | "dark",
|
||||
}));
|
||||
vi.mock("@mantine/core", async () => {
|
||||
const actual =
|
||||
await vi.importActual<typeof import("@mantine/core")>("@mantine/core");
|
||||
return { ...actual, useComputedColorScheme: () => colorSchemeMock.value };
|
||||
});
|
||||
|
||||
describe("LogLevelBadge", () => {
|
||||
const levels: LoggingLevel[] = [
|
||||
"debug",
|
||||
|
|
@ -16,7 +28,17 @@ describe("LogLevelBadge", () => {
|
|||
];
|
||||
|
||||
it.each(levels)("renders the %s level label", (level) => {
|
||||
colorSchemeMock.value = "light";
|
||||
renderWithMantine(<LogLevelBadge level={level} />);
|
||||
expect(screen.getByText(level)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("uses black text in dark mode", () => {
|
||||
colorSchemeMock.value = "dark";
|
||||
// Rendering under the mocked dark scheme exercises the dark arm of the
|
||||
// text-color ternary (line 23); the badge still renders its label.
|
||||
renderWithMantine(<LogLevelBadge level="error" />);
|
||||
expect(screen.getByText("error")).toBeInTheDocument();
|
||||
colorSchemeMock.value = "light";
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -42,4 +42,25 @@ describe("SortToggle", () => {
|
|||
await user.click(await screen.findByText("Oldest First"));
|
||||
expect(onChange).toHaveBeenCalledWith("oldest-first");
|
||||
});
|
||||
|
||||
it("invokes onChange when picking the descending (newest-first) option", async () => {
|
||||
// Covers the `value === "newest-first"` arm of the isSortDirection guard.
|
||||
const user = userEvent.setup();
|
||||
const onChange = vi.fn();
|
||||
renderWithMantine(<SortToggle value="oldest-first" onChange={onChange} />);
|
||||
await user.click(screen.getByRole("textbox", { name: "Sort direction" }));
|
||||
await user.click(await screen.findByText("Newest First"));
|
||||
expect(onChange).toHaveBeenCalledWith("newest-first");
|
||||
});
|
||||
|
||||
it("does not invoke onChange when re-selecting the already-current option", async () => {
|
||||
// allowDeselect={false} means clicking the selected option is a no-op:
|
||||
// Mantine does not fire onChange, so the parent callback stays silent.
|
||||
const user = userEvent.setup();
|
||||
const onChange = vi.fn();
|
||||
renderWithMantine(<SortToggle value="newest-first" onChange={onChange} />);
|
||||
await user.click(screen.getByRole("textbox", { name: "Sort direction" }));
|
||||
await user.click(await screen.findByText("Newest First"));
|
||||
expect(onChange).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -31,6 +31,10 @@ export function SortToggle({
|
|||
data={OPTIONS}
|
||||
value={value}
|
||||
onChange={(next) => {
|
||||
// The guard's false arm is unreachable through the UI: Mantine's `data`
|
||||
// only holds the two valid SortDirection values and allowDeselect={false}
|
||||
// prevents a null deselect, so isSortDirection() is always true here.
|
||||
/* v8 ignore next */
|
||||
if (isSortDirection(next)) onChange(next);
|
||||
}}
|
||||
allowDeselect={false}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,21 @@
|
|||
import { describe, it, expect } from "vitest";
|
||||
import { describe, it, expect, vi } from "vitest";
|
||||
import type { TaskStatus } from "@modelcontextprotocol/sdk/types.js";
|
||||
import { renderWithMantine, screen } from "../../../test/renderWithMantine";
|
||||
import { TaskStatusBadge } from "./TaskStatusBadge";
|
||||
|
||||
// Drive the `colorScheme === "dark"` branch in TaskStatusBadge (which picks
|
||||
// black vs white badge text) deterministically. `useComputedColorScheme`
|
||||
// otherwise resolves to "light" under happy-dom, leaving the dark arm
|
||||
// uncovered.
|
||||
const colorSchemeMock = vi.hoisted(() => ({
|
||||
value: "light" as "light" | "dark",
|
||||
}));
|
||||
vi.mock("@mantine/core", async () => {
|
||||
const actual =
|
||||
await vi.importActual<typeof import("@mantine/core")>("@mantine/core");
|
||||
return { ...actual, useComputedColorScheme: () => colorSchemeMock.value };
|
||||
});
|
||||
|
||||
describe("TaskStatusBadge", () => {
|
||||
const cases: Array<[TaskStatus, string]> = [
|
||||
["working", "working"],
|
||||
|
|
@ -13,7 +26,17 @@ describe("TaskStatusBadge", () => {
|
|||
];
|
||||
|
||||
it.each(cases)("renders the label for %s", (status, label) => {
|
||||
colorSchemeMock.value = "light";
|
||||
renderWithMantine(<TaskStatusBadge status={status} />);
|
||||
expect(screen.getByText(label)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("uses black text in dark mode", () => {
|
||||
colorSchemeMock.value = "dark";
|
||||
renderWithMantine(<TaskStatusBadge status="working" />);
|
||||
// Rendering under the mocked dark scheme exercises the dark arm of the
|
||||
// text-color ternary (line 26); the badge still renders its label.
|
||||
expect(screen.getByText("working")).toBeInTheDocument();
|
||||
colorSchemeMock.value = "light";
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -97,6 +97,20 @@ describe("AppControls", () => {
|
|||
expect(screen.getByText("No matching apps")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("clears the search via the clear button, invoking onSearchChange with empty string", async () => {
|
||||
const user = userEvent.setup();
|
||||
const onSearchChange = vi.fn();
|
||||
renderWithMantine(
|
||||
<ControlledAppControls onSearchChange={onSearchChange} />,
|
||||
);
|
||||
const input = screen.getByPlaceholderText("Search apps...");
|
||||
await user.type(input, "git");
|
||||
// The clear button only renders once searchText is non-empty (line 67).
|
||||
const clearButton = screen.getByRole("button", { name: /clear/i });
|
||||
await user.click(clearButton);
|
||||
expect(onSearchChange).toHaveBeenLastCalledWith("");
|
||||
});
|
||||
|
||||
it("invokes onSelectApp when an unselected app is clicked", async () => {
|
||||
const user = userEvent.setup();
|
||||
const onSelectApp = vi.fn();
|
||||
|
|
|
|||
|
|
@ -72,3 +72,186 @@ describe("ClientSettingsForm EMA IdP session", () => {
|
|||
).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
describe("ClientSettingsForm interactions", () => {
|
||||
it("propagates accordion expand/collapse changes", async () => {
|
||||
const user = userEvent.setup();
|
||||
const onExpandedSectionsChange = vi.fn();
|
||||
renderWithMantine(
|
||||
<ClientSettingsForm
|
||||
settings={EMPTY_CLIENT_SETTINGS}
|
||||
expandedSections={["ema"]}
|
||||
onExpandedSectionsChange={onExpandedSectionsChange}
|
||||
onSettingsChange={vi.fn()}
|
||||
/>,
|
||||
);
|
||||
|
||||
// Clicking the accordion control toggles the open section. Since it starts
|
||||
// open, collapsing it should report an empty section list.
|
||||
await user.click(
|
||||
screen.getByRole("button", { name: /Enterprise-Managed Authorization/i }),
|
||||
);
|
||||
expect(onExpandedSectionsChange).toHaveBeenCalledWith([]);
|
||||
});
|
||||
|
||||
it("toggles the EMA enable checkbox via onSettingsChange", async () => {
|
||||
const user = userEvent.setup();
|
||||
const onSettingsChange = vi.fn();
|
||||
renderWithMantine(
|
||||
<ClientSettingsForm
|
||||
settings={EMPTY_CLIENT_SETTINGS}
|
||||
expandedSections={["ema"]}
|
||||
onExpandedSectionsChange={vi.fn()}
|
||||
onSettingsChange={onSettingsChange}
|
||||
/>,
|
||||
);
|
||||
|
||||
await user.click(
|
||||
screen.getByRole("checkbox", {
|
||||
name: "Enable enterprise IdP configuration",
|
||||
}),
|
||||
);
|
||||
expect(onSettingsChange).toHaveBeenCalledWith({
|
||||
...EMPTY_CLIENT_SETTINGS,
|
||||
emaEnabled: true,
|
||||
});
|
||||
});
|
||||
|
||||
it("edits the IdP text fields via onSettingsChange", async () => {
|
||||
const user = userEvent.setup();
|
||||
const onSettingsChange = vi.fn();
|
||||
renderWithMantine(
|
||||
<ClientSettingsForm
|
||||
settings={{ ...EMPTY_CLIENT_SETTINGS, emaEnabled: true }}
|
||||
expandedSections={["ema"]}
|
||||
onExpandedSectionsChange={vi.fn()}
|
||||
onSettingsChange={onSettingsChange}
|
||||
/>,
|
||||
);
|
||||
|
||||
await user.type(screen.getByLabelText("Client ID"), "x");
|
||||
expect(onSettingsChange).toHaveBeenLastCalledWith({
|
||||
...EMPTY_CLIENT_SETTINGS,
|
||||
emaEnabled: true,
|
||||
clientId: "x",
|
||||
});
|
||||
|
||||
onSettingsChange.mockClear();
|
||||
await user.type(screen.getByLabelText("Client Secret"), "s");
|
||||
expect(onSettingsChange).toHaveBeenLastCalledWith({
|
||||
...EMPTY_CLIENT_SETTINGS,
|
||||
emaEnabled: true,
|
||||
clientSecret: "s",
|
||||
});
|
||||
});
|
||||
|
||||
it("clears each populated IdP field via its clear button", async () => {
|
||||
const user = userEvent.setup();
|
||||
const onSettingsChange = vi.fn();
|
||||
const filled = {
|
||||
...EMPTY_CLIENT_SETTINGS,
|
||||
emaEnabled: true,
|
||||
issuer: "https://idp.test",
|
||||
clientId: "client-1",
|
||||
clientSecret: "secret-1",
|
||||
};
|
||||
renderWithMantine(
|
||||
<ClientSettingsForm
|
||||
settings={filled}
|
||||
expandedSections={["ema"]}
|
||||
onExpandedSectionsChange={vi.fn()}
|
||||
onSettingsChange={onSettingsChange}
|
||||
/>,
|
||||
);
|
||||
|
||||
// Each populated field renders a "Clear" button in its right section.
|
||||
const clearButtons = screen.getAllByRole("button", { name: "Clear" });
|
||||
expect(clearButtons).toHaveLength(3);
|
||||
|
||||
// Issuer clear -> patch({ issuer: "" })
|
||||
await user.click(clearButtons[0]);
|
||||
expect(onSettingsChange).toHaveBeenCalledWith({ ...filled, issuer: "" });
|
||||
|
||||
// Client ID clear -> patch({ clientId: "" })
|
||||
onSettingsChange.mockClear();
|
||||
await user.click(clearButtons[1]);
|
||||
expect(onSettingsChange).toHaveBeenCalledWith({ ...filled, clientId: "" });
|
||||
|
||||
// Client Secret clear -> patch({ clientSecret: "" })
|
||||
onSettingsChange.mockClear();
|
||||
await user.click(clearButtons[2]);
|
||||
expect(onSettingsChange).toHaveBeenCalledWith({
|
||||
...filled,
|
||||
clientSecret: "",
|
||||
});
|
||||
});
|
||||
|
||||
it("omits clear buttons when IdP fields are empty", () => {
|
||||
renderWithMantine(
|
||||
<ClientSettingsForm
|
||||
settings={{ ...EMPTY_CLIENT_SETTINGS, emaEnabled: true }}
|
||||
expandedSections={["ema"]}
|
||||
onExpandedSectionsChange={vi.fn()}
|
||||
onSettingsChange={vi.fn()}
|
||||
/>,
|
||||
);
|
||||
expect(
|
||||
screen.queryByRole("button", { name: "Clear" }),
|
||||
).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("hides the IdP section entirely when EMA is disabled", () => {
|
||||
renderWithMantine(
|
||||
<ClientSettingsForm
|
||||
settings={EMPTY_CLIENT_SETTINGS}
|
||||
expandedSections={["ema"]}
|
||||
onExpandedSectionsChange={vi.fn()}
|
||||
onSettingsChange={vi.fn()}
|
||||
/>,
|
||||
);
|
||||
expect(screen.queryByLabelText("Issuer")).not.toBeInTheDocument();
|
||||
expect(screen.queryByText(/IdP sign-in/i)).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("defaults emaIdpLoginState to none and shows the not-signed-in hint", () => {
|
||||
renderWithMantine(
|
||||
<ClientSettingsForm
|
||||
settings={{
|
||||
...EMPTY_CLIENT_SETTINGS,
|
||||
emaEnabled: true,
|
||||
issuer: "https://idp.test",
|
||||
}}
|
||||
expandedSections={["ema"]}
|
||||
onExpandedSectionsChange={vi.fn()}
|
||||
onSettingsChange={vi.fn()}
|
||||
/>,
|
||||
);
|
||||
// emaIdpLoginState prop omitted -> defaults to "none"; sign-in section
|
||||
// renders (issuer present) but with no sign-out button.
|
||||
expect(screen.getByText("IdP sign-in")).toBeInTheDocument();
|
||||
expect(screen.getByText(/Not signed in/i)).toBeInTheDocument();
|
||||
expect(
|
||||
screen.queryByRole("button", { name: "Sign out" }),
|
||||
).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("renders no sign-out button when logged in but onEmaIdpLogout is absent", () => {
|
||||
renderWithMantine(
|
||||
<ClientSettingsForm
|
||||
settings={{
|
||||
...EMPTY_CLIENT_SETTINGS,
|
||||
emaEnabled: true,
|
||||
issuer: "https://idp.test",
|
||||
}}
|
||||
expandedSections={["ema"]}
|
||||
onExpandedSectionsChange={vi.fn()}
|
||||
onSettingsChange={vi.fn()}
|
||||
emaIdpLoginState="logged_in"
|
||||
/>,
|
||||
);
|
||||
expect(screen.getByText("Signed in")).toBeInTheDocument();
|
||||
expect(
|
||||
screen.queryByRole("button", { name: "Sign out" }),
|
||||
).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,10 +2,16 @@ import { describe, it, expect } from "vitest";
|
|||
import {
|
||||
canPersistClientSettingsDraft,
|
||||
clientConfigToFormValues,
|
||||
EMPTY_CLIENT_SETTINGS,
|
||||
formValuesToClientConfig,
|
||||
} from "./clientSettingsValues";
|
||||
|
||||
describe("clientSettingsValues", () => {
|
||||
it("clientConfigToFormValues returns empty settings when there is no enterpriseManagedAuth", () => {
|
||||
// Exercises the `!idp` early return (line 24) via an absent EMA block.
|
||||
expect(clientConfigToFormValues({})).toEqual(EMPTY_CLIENT_SETTINGS);
|
||||
});
|
||||
|
||||
it("clientConfigToFormValues maps enterpriseManagedAuth.idp", () => {
|
||||
expect(
|
||||
clientConfigToFormValues({
|
||||
|
|
|
|||
|
|
@ -87,4 +87,48 @@ describe("ClientSettingsModal", () => {
|
|||
onSettingsChange.mock.calls[onSettingsChange.mock.calls.length - 1][0];
|
||||
expect(call.issuer).toBe("h");
|
||||
});
|
||||
|
||||
it("collapses then re-expands all sections via the list toggle", async () => {
|
||||
const user = userEvent.setup();
|
||||
renderWithMantine(
|
||||
<ClientSettingsModal
|
||||
opened
|
||||
settings={EMPTY_CLIENT_SETTINGS}
|
||||
onClose={vi.fn()}
|
||||
onSettingsChange={vi.fn()}
|
||||
/>,
|
||||
);
|
||||
|
||||
// Starts fully expanded (all sections open), so the toggle offers "Collapse all".
|
||||
const collapse = screen.getByRole("button", { name: "Collapse all" });
|
||||
expect(collapse).toBeInTheDocument();
|
||||
// The EMA section panel content is visible while expanded.
|
||||
expect(
|
||||
screen.getByText("Enable enterprise IdP configuration"),
|
||||
).toBeInTheDocument();
|
||||
|
||||
// Collapse all -> handleToggleAll sets expandedSections to [].
|
||||
await user.click(collapse);
|
||||
expect(
|
||||
screen.getByRole("button", { name: "Expand all" }),
|
||||
).toBeInTheDocument();
|
||||
|
||||
// Expand all -> handleToggleAll restores ALL_SECTIONS.
|
||||
await user.click(screen.getByRole("button", { name: "Expand all" }));
|
||||
expect(
|
||||
screen.getByRole("button", { name: "Collapse all" }),
|
||||
).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("does not render the modal body when closed", () => {
|
||||
renderWithMantine(
|
||||
<ClientSettingsModal
|
||||
opened={false}
|
||||
settings={EMPTY_CLIENT_SETTINGS}
|
||||
onClose={vi.fn()}
|
||||
onSettingsChange={vi.fn()}
|
||||
/>,
|
||||
);
|
||||
expect(screen.queryByText("Client Settings")).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue