7c8b5aeb23
Add per-planet cargo routes (COL/CAP/MAT/EMP) to the inspector with a renderer-driven destination picker (faded out-of-reach planets, cursor-line anchor, hover-highlight) and per-route arrows on the map. The pick-mode primitives are exposed via `MapPickService` so ship-group dispatch in Phase 19/20 can reuse the same surface. Pass A — generic map foundation: - hit-test now sizes the click zone to `pointRadiusPx + slopPx` so the visible disc is always part of the target. - `RendererHandle` gains `onPointerMove`, `onHoverChange`, `setPickMode`, `getPickState`, `getPrimitiveAlpha`, `setExtraPrimitives`, `getPrimitives`. The click dispatcher is centralised: pick-mode swallows clicks atomically so the standard selection consumers do not race against teardown. - `MapPickService` (`lib/map-pick.svelte.ts`) wraps the renderer contract in a promise-shaped `pick(...)`. The in-game shell layout owns the service so sidebar and bottom-sheet inspectors see the same instance. - Debug-surface registry exposes `getMapPrimitives`, `getMapPickState`, `getMapCamera` to e2e specs without spawning a separate debug page after navigation. Pass B — cargo-route feature: - `CargoLoadType`, `setCargoRoute`, `removeCargoRoute` typed variants with `(source, loadType)` collapse rule on the order draft; round-trip through the FBS encoder/decoder. - `GameReport` decodes `routes` and the local player's drive tech for the inline reach formula (40 × drive). `applyOrderOverlay` upserts/drops route entries for valid/submitting/applied commands. - `lib/inspectors/planet/cargo-routes.svelte` renders the four-slot section. `Add` / `Edit` call `MapPickService.pick`, `Remove` emits `removeCargoRoute`. - `map/cargo-routes.ts` builds shaft + arrowhead primitives per cargo type; the map view pushes them through `setExtraPrimitives` so the renderer never re-inits Pixi on route mutations (Pixi 8 doesn't support that on a reused canvas). Docs: - `docs/cargo-routes-ux.md` covers engine semantics + UI map. - `docs/renderer.md` documents pick mode and the debug surface. - `docs/calc-bridge.md` records the Phase 16 reach waiver. - `PLAN.md` rewrites Phase 16 to reflect the foundation + feature split and the decisions baked in (map-driven picker, inline reach, optimistic overlay via `setExtraPrimitives`). Tests: - `tests/map-pick-mode.test.ts` — pure overlay-spec helper. - `tests/map-cargo-routes.test.ts` — `buildCargoRouteLines`. - `tests/inspector-planet-cargo-routes.test.ts` — slot rendering, picker invocation, collapse, cancel, remove. - Extensions to `order-draft`, `submit`, `order-load`, `order-overlay`, `state-binding`, `inspector-planet`, `inspector-overlay`, `game-shell-sidebar`, `game-shell-header`. - `tests/e2e/cargo-routes.spec.ts` — Playwright happy path: add COL, add CAP, remove COL, asserting both the inspector and the arrow count via `__galaxyDebug.getMapPrimitives()`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
192 lines
6.0 KiB
TypeScript
192 lines
6.0 KiB
TypeScript
// Component tests for the in-game shell header. The header composes
|
|
// the headline strip (`<race> @ <game>, turn N`, falling back to `?`
|
|
// while the lobby / report calls are in flight), the view-menu, and
|
|
// the account-menu. The tests assert the headline copy, that every
|
|
// view-menu entry dispatches `goto` with the right URL, and that the
|
|
// Logout entry of the account-menu calls `session.signOut("user")`.
|
|
|
|
import "@testing-library/jest-dom/vitest";
|
|
import { fireEvent, render } from "@testing-library/svelte";
|
|
import {
|
|
afterEach,
|
|
beforeEach,
|
|
describe,
|
|
expect,
|
|
test,
|
|
vi,
|
|
} from "vitest";
|
|
|
|
import { i18n } from "../src/lib/i18n/index.svelte";
|
|
import { session } from "../src/lib/session-store.svelte";
|
|
import Header from "../src/lib/header/header.svelte";
|
|
import {
|
|
GAME_STATE_CONTEXT_KEY,
|
|
GameStateStore,
|
|
} from "../src/lib/game-state.svelte";
|
|
|
|
function withGameState(opts: {
|
|
gameName?: string;
|
|
race?: string;
|
|
turn?: number;
|
|
} = {}): Map<unknown, unknown> {
|
|
const store = new GameStateStore();
|
|
store.gameName = opts.gameName ?? "";
|
|
if (opts.race !== undefined || opts.turn !== undefined) {
|
|
store.report = {
|
|
turn: opts.turn ?? 0,
|
|
mapWidth: 1000,
|
|
mapHeight: 1000,
|
|
planetCount: 0,
|
|
planets: [],
|
|
race: opts.race ?? "",
|
|
localShipClass: [],
|
|
routes: [],
|
|
localPlayerDrive: 0,
|
|
};
|
|
store.status = "ready";
|
|
}
|
|
return new Map<unknown, unknown>([[GAME_STATE_CONTEXT_KEY, store]]);
|
|
}
|
|
|
|
const gotoSpy = vi.fn(async (..._args: unknown[]) => {});
|
|
vi.mock("$app/navigation", () => ({
|
|
goto: (...args: unknown[]) => gotoSpy(...args),
|
|
}));
|
|
|
|
beforeEach(() => {
|
|
i18n.resetForTests("en");
|
|
gotoSpy.mockReset();
|
|
vi.spyOn(session, "signOut").mockResolvedValue(undefined);
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.restoreAllMocks();
|
|
});
|
|
|
|
describe("game-shell header", () => {
|
|
test("renders fall-back placeholders before the lobby / report data lands", () => {
|
|
const onToggleSidebar = vi.fn();
|
|
const ui = render(Header, {
|
|
props: { gameId: "g1", sidebarOpen: false, onToggleSidebar },
|
|
context: withGameState(),
|
|
});
|
|
expect(ui.getByTestId("game-shell-headline")).toHaveTextContent(
|
|
"? @ ?, turn ?",
|
|
);
|
|
expect(ui.getByTestId("view-menu-trigger")).toBeInTheDocument();
|
|
expect(ui.getByTestId("account-menu-trigger")).toBeInTheDocument();
|
|
});
|
|
|
|
test("renders the live race / game / turn from GameStateStore", () => {
|
|
const ui = render(Header, {
|
|
props: { gameId: "g1", sidebarOpen: false, onToggleSidebar: () => {} },
|
|
context: withGameState({
|
|
gameName: "Phase 14",
|
|
race: "Federation",
|
|
turn: 7,
|
|
}),
|
|
});
|
|
expect(ui.getByTestId("game-shell-headline")).toHaveTextContent(
|
|
"Federation @ Phase 14, turn 7",
|
|
);
|
|
});
|
|
|
|
test("partial data still falls back gracefully (race known, game unknown)", () => {
|
|
const ui = render(Header, {
|
|
props: { gameId: "g1", sidebarOpen: false, onToggleSidebar: () => {} },
|
|
context: withGameState({ race: "Federation", turn: 3 }),
|
|
});
|
|
expect(ui.getByTestId("game-shell-headline")).toHaveTextContent(
|
|
"Federation @ ?, turn 3",
|
|
);
|
|
});
|
|
|
|
test("clicking the sidebar toggle invokes the prop callback", async () => {
|
|
const onToggleSidebar = vi.fn();
|
|
const ui = render(Header, {
|
|
props: { gameId: "g1", sidebarOpen: false, onToggleSidebar },
|
|
});
|
|
await fireEvent.click(ui.getByTestId("sidebar-toggle"));
|
|
expect(onToggleSidebar).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
test("view-menu navigates to every IA destination", async () => {
|
|
const ui = render(Header, {
|
|
props: { gameId: "g1", sidebarOpen: false, onToggleSidebar: () => {} },
|
|
});
|
|
|
|
const destinations: Array<[string, string]> = [
|
|
["view-menu-item-map", "/games/g1/map"],
|
|
["view-menu-item-report", "/games/g1/report"],
|
|
["view-menu-item-battle", "/games/g1/battle"],
|
|
["view-menu-item-mail", "/games/g1/mail"],
|
|
[
|
|
"view-menu-item-designer-ship-class",
|
|
"/games/g1/designer/ship-class",
|
|
],
|
|
[
|
|
"view-menu-item-designer-science",
|
|
"/games/g1/designer/science",
|
|
],
|
|
];
|
|
|
|
for (const [testId, href] of destinations) {
|
|
await fireEvent.click(ui.getByTestId("view-menu-trigger"));
|
|
await fireEvent.click(ui.getByTestId(testId));
|
|
expect(gotoSpy).toHaveBeenLastCalledWith(href);
|
|
}
|
|
});
|
|
|
|
test("view-menu Tables sub-list navigates to every entity", async () => {
|
|
const ui = render(Header, {
|
|
props: { gameId: "g1", sidebarOpen: false, onToggleSidebar: () => {} },
|
|
});
|
|
const tableEntities: Array<[string, string]> = [
|
|
["view-menu-item-table-planets", "/games/g1/table/planets"],
|
|
[
|
|
"view-menu-item-table-ship-classes",
|
|
"/games/g1/table/ship-classes",
|
|
],
|
|
[
|
|
"view-menu-item-table-ship-groups",
|
|
"/games/g1/table/ship-groups",
|
|
],
|
|
["view-menu-item-table-fleets", "/games/g1/table/fleets"],
|
|
["view-menu-item-table-sciences", "/games/g1/table/sciences"],
|
|
["view-menu-item-table-races", "/games/g1/table/races"],
|
|
];
|
|
for (const [testId, href] of tableEntities) {
|
|
await fireEvent.click(ui.getByTestId("view-menu-trigger"));
|
|
// Open the Tables sub-disclosure each iteration; the menu
|
|
// closes on every navigation.
|
|
const summary = ui
|
|
.getByTestId("view-menu-tables")
|
|
.querySelector("summary");
|
|
if (summary !== null) {
|
|
await fireEvent.click(summary);
|
|
}
|
|
await fireEvent.click(ui.getByTestId(testId));
|
|
expect(gotoSpy).toHaveBeenLastCalledWith(href);
|
|
}
|
|
});
|
|
|
|
test("account-menu Logout triggers session.signOut('user')", async () => {
|
|
const ui = render(Header, {
|
|
props: { gameId: "g1", sidebarOpen: false, onToggleSidebar: () => {} },
|
|
});
|
|
await fireEvent.click(ui.getByTestId("account-menu-trigger"));
|
|
await fireEvent.click(ui.getByTestId("account-menu-logout"));
|
|
expect(session.signOut).toHaveBeenCalledWith("user");
|
|
});
|
|
|
|
test("account-menu language picker switches the i18n locale", async () => {
|
|
const ui = render(Header, {
|
|
props: { gameId: "g1", sidebarOpen: false, onToggleSidebar: () => {} },
|
|
});
|
|
await fireEvent.click(ui.getByTestId("account-menu-trigger"));
|
|
const select = ui.getByTestId("account-menu-language-select");
|
|
await fireEvent.change(select, { target: { value: "ru" } });
|
|
expect(i18n.locale).toBe("ru");
|
|
});
|
|
});
|