Refactor journey model tests to remove legacy handling of stopIds and waypoints. Update type definitions and normalize test cases to focus on stops[]. Clean up unused assertions and improve clarity in test descriptions.

Author: ndelangen

src/modules/journey-model.test.ts

@@ -13,55 +13,35 @@ import {
   type JourneyResolutionContext,
   type JourneyStopLeg,
   type PackJourney,
-  type PackWithOptionalJourney,
 } from "./journey-model";
 
 describe("ensurePackJourneyNormalized", () => {
   it("creates pack.journey when absent and normalizes", () => {
-    const pack: PackWithOptionalJourney = {};
+    const pack: { journey?: unknown } = {};
     ensurePackJourneyNormalized(pack);
     expect(pack.journey).toEqual({ stops: [] });
   });
 });
 
 describe("normalizePackJourney", () => {
-  it("keeps unknown keys and yields empty stops when stops[] is absent", () => {
+  it("yields empty stops when stops[] is absent", () => {
     const j: Record<string, unknown> = {
-      points: [[10, 20], [30, 40]],
-      stopIds: [],
-      waypoints: [],
+      foo: "bar",
     };
     normalizePackJourney(j);
-    expect(j.points).toEqual([[10, 20], [30, 40]]);
-    expect(j.stopIds).toEqual([]);
-    expect(j.waypoints).toEqual([]);
     const normalized = j as unknown as PackJourney;
     expect(normalized.stops).toEqual([]);
     expect(journeyResolvedCoordinates(normalized)).toEqual([]);
   });
 
-  it("uses only stops[] as source of truth", () => {
+  it("uses stops[] as source of truth", () => {
     const j = {
       stops: [{ kind: "burg" as const, id: 1 }],
-      stopIds: ["burg:99"],
-      waypoints: [{ id: "x" }],
+      foo: "bar",
     };
     normalizePackJourney(j);
     expect(j.stops.length).toBe(1);
     expect(j.stops[0]).toEqual({ kind: "burg", id: 1 });
-    expect(j.stopIds).toEqual(["burg:99"]);
-    expect(j.waypoints).toEqual([{ id: "x" }]);
-  });
-
-  it("does not infer stops from stopIds / waypoints", () => {
-    const j: Record<string, unknown> = {
-      stopIds: ["wp_skip", "burg:3", "marker:7"],
-      waypoints: [{ id: "wp_skip", name: "A", x: 1, y: 2 }],
-    };
-    normalizePackJourney(j);
-    expect((j as unknown as PackJourney).stops).toEqual([]);
-    expect(j.stopIds).toEqual(["wp_skip", "burg:3", "marker:7"]);
-    expect(j.waypoints).toEqual([{ id: "wp_skip", name: "A", x: 1, y: 2 }]);
   });
 
   it("filters malformed stops entries only", () => {

src/modules/journey-model.ts

@@ -119,8 +119,7 @@ function sanitizeStopsArray(raw: unknown[]): JourneyStopLeg[] {
   return out;
 }
 
-/** Pack slice used when ensuring `pack.journey` exists and is sanitized. */
-export type PackWithOptionalJourney = {
+type PackWithOptionalJourney = {
   journey?: unknown;
 };
 

tests/e2e/journey-layer.spec.ts

@@ -68,28 +68,6 @@ test.describe("Journey layer", () => {
     expect(disp).toBe("none");
   });
 
-  test("drawJourney ignores stray points key and leaves empty stops", async ({ page }) => {
-    const snap = await page.evaluate((pts) => {
-      const w = window as unknown as {
-        layerIsOn: (id: string) => boolean;
-        toggleJourney: () => void;
-        pack: { journey: Record<string, unknown> };
-        drawJourney: () => void;
-      };
-      if (!w.layerIsOn("toggleJourney")) w.toggleJourney();
-      w.pack.journey = { points: pts };
-      w.drawJourney();
-      const j = w.pack.journey;
-      return {
-        pointsPresent: Object.prototype.hasOwnProperty.call(j, "points"),
-        stopsLen: Array.isArray(j.stops) ? j.stops.length : -1,
-      };
-    }, BACKTRACK_JOURNEY_POINTS);
-
-    expect(snap.pointsPresent).toBe(true);
-    expect(snap.stopsLen).toBe(0);
-  });
-
   test("drawJourney resolves a burg stop ref using pack.burgs positions", async ({ page }) => {
     await page.evaluate(() => {
       const w = window as unknown as {