feat(team-race): one team race setup panel with auto split, car per team and start checks (1.67.0)
This commit is contained in:
1 parent
69a65748ce
commit
37076b8490
13 files changed
+344
-309
No files matched your search
+14
-18
@@ -104,25 +104,21 @@ export async function runRaceSetupSmoke({ evaluate, navigate, fill, savedState,
|
||||
const driver = current.drivers.find(item => item.name === "Browser Driver Updated");
|
||||
const car = current.cars.find(item => item.name === "Browser Car Updated");
|
||||
const raceState = () => findEvent("Browser Endurance Updated");
|
||||
await fill("teamForm", { teamName: "Browser Team" });
|
||||
await evaluate(`document.querySelector('[form="teamForm"][name="teamDriverIds"][value="${driver.id}"]').checked=true`);
|
||||
await submit("teamForm");
|
||||
await waitFor(async () => (await raceState()).raceConfig.teams.some(team => team.name === "Browser Team"), "team create");
|
||||
const team = (await raceState()).raceConfig.teams.find(item => item.name === "Browser Team");
|
||||
assert.deepEqual(team.driverIds, [driver.id]);
|
||||
await click("team-edit-" + team.id);
|
||||
await fill("teamEditForm", { teamName: "Browser Team Updated" });
|
||||
await evaluate(`document.querySelector('#teamEditForm [name="teamCarIds"][value="${car.id}"]').checked=true`);
|
||||
await pause(5500);
|
||||
assert.equal(await evaluate('document.getElementById("teamEditForm").elements.namedItem("teamName").value'), "Browser Team Updated");
|
||||
await click("teamEditSave");
|
||||
await waitFor(async () => (await raceState()).raceConfig.teams.some(item => item.name === "Browser Team Updated" && item.carIds.includes(car.id)), "team membership update");
|
||||
const setValue = (selector, value) => evaluate(`(() => { const node = document.querySelector(${JSON.stringify(selector)}); node.value = ${JSON.stringify(value)}; node.dispatchEvent(new Event("change", { bubbles: true })); })()`);
|
||||
await waitFor(async () => await evaluate(`Boolean(document.getElementById("teamSetupAdd"))`), "team race setup");
|
||||
await click("teamSetupAdd");
|
||||
await waitFor(async () => ((await raceState()).raceConfig.teams || []).length === 1, "team create");
|
||||
const team = (await raceState()).raceConfig.teams[0];
|
||||
await setValue(`[data-team-name="${team.id}"]`, "Browser Team Updated");
|
||||
await waitFor(async () => (await raceState()).raceConfig.teams.some(item => item.name === "Browser Team Updated"), "team rename");
|
||||
await setValue(`[data-team-add="${team.id}"]`, driver.id);
|
||||
await waitFor(async () => (await raceState()).raceConfig.teams[0].driverIds.includes(driver.id), "team driver");
|
||||
await setValue(`[data-team-car="${team.id}"]`, car.id);
|
||||
await waitFor(async () => (await raceState()).raceConfig.teams.some(item => item.name === "Browser Team Updated" && item.carIds.includes(car.id) && item.driverIds.includes(driver.id)), "team membership update");
|
||||
await navigate("race_setup", "raceWizardStepForm");
|
||||
await click("event-manage-" + race.id);
|
||||
await click("team-edit-" + team.id);
|
||||
assert.equal(await evaluate('document.getElementById("teamEditForm").elements.namedItem("teamName").value'), "Browser Team Updated");
|
||||
assert.ok(await evaluate(`document.querySelector('#teamEditForm [name="teamCarIds"][value="${car.id}"]').checked`));
|
||||
await click("teamEditCancel");
|
||||
await waitFor(async () => (await evaluate(`document.querySelector('[data-team-name="${team.id}"]')?.value || ""`)) === "Browser Team Updated", "team kept after reopening");
|
||||
assert.equal(await evaluate(`document.querySelector('[data-team-car="${team.id}"]').value`), car.id);
|
||||
|
||||
await fill("sessionForm", { name: "Editable Practice", type: "open_practice", durationMin: "5" });
|
||||
await submit("sessionForm");
|
||||
@@ -141,7 +137,7 @@ export async function runRaceSetupSmoke({ evaluate, navigate, fill, savedState,
|
||||
assert.equal(await evaluate('document.getElementById("sessionEditForm").elements.namedItem("type").value'), "team_race");
|
||||
await click("sessionEditCancel");
|
||||
assert.equal(await evaluate('document.getElementById("raceFormatForm").elements.namedItem("minLapSec").value'), "30.0");
|
||||
await click("team-delete-" + team.id);
|
||||
await evaluate(`document.querySelector('[data-team-delete="${team.id}"]').click()`);
|
||||
await waitFor(async () => !(await raceState()).raceConfig.teams.some(item => item.id === team.id), "team deletion");
|
||||
console.log("PASS race wizard/edit/reload, team create/member-edit/delete, session type/duration and lap limits");
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
// Regression coverage for a real bug the user reported: moving a driver from one team to
|
||||
// another (by ticking them on the new team's edit form - there is no separate "move"
|
||||
// action) used to only ever ADD the driver to the new team, never remove them from the
|
||||
// another (by picking them in the new team's "add driver" list in the team race setup) used to only ever ADD the driver to the new team, never remove them from the
|
||||
// old one, so the same driver ended up listed on two teams at once. Also covers the two
|
||||
// related findings from the same investigation: getTeamDriverPool used to ignore the
|
||||
// event's class/participant scoping entirely (showing every driver in the club), and
|
||||
@@ -39,28 +38,29 @@ export async function runTeamMembershipSmoke({ evaluate, navigate, savedState, w
|
||||
|
||||
await navigate("race_setup", "raceWizardStepForm");
|
||||
await click("event-manage-" + raceEvent.id);
|
||||
await waitFor(async () => await evaluate(`Boolean(document.getElementById("teamForm"))`), "teams section visible for a race-mode event with a team_race session");
|
||||
await waitFor(async () => await evaluate(`Boolean(document.getElementById("teamSetupAdd"))`), "team race setup visible for a race-mode event with a team_race session");
|
||||
const setValue = (selector, value) => evaluate(`(() => { const node = document.querySelector(${JSON.stringify(selector)}); node.value = ${JSON.stringify(value)}; node.dispatchEvent(new Event("change", { bubbles: true })); })()`);
|
||||
const teamsNow = async () => (await findEvent(raceEvent.id)).raceConfig.teams || [];
|
||||
|
||||
await evaluate(`(() => { const form = document.getElementById("teamForm"); form.elements.namedItem("teamName").value = "Membership Team A"; })()`);
|
||||
await evaluate(`document.querySelector('[form="teamForm"][name="teamDriverIds"][value="${driverA.id}"]').checked = true`);
|
||||
await submit("teamForm");
|
||||
await waitFor(async () => (await findEvent(raceEvent.id)).raceConfig.teams.some((team) => team.name === "Membership Team A"), "team A created");
|
||||
await click("teamSetupAdd");
|
||||
await waitFor(async () => (await teamsNow()).length === 1, "first team added");
|
||||
await click("teamSetupAdd");
|
||||
await waitFor(async () => (await teamsNow()).length === 2, "second team added");
|
||||
const [first, second] = await teamsNow();
|
||||
await setValue(`[data-team-name="${first.id}"]`, "Membership Team A");
|
||||
await waitFor(async () => (await teamsNow()).some((team) => team.name === "Membership Team A"), "team A renamed");
|
||||
await setValue(`[data-team-name="${second.id}"]`, "Membership Team B");
|
||||
await waitFor(async () => (await teamsNow()).some((team) => team.name === "Membership Team B"), "team B renamed");
|
||||
await setValue(`[data-team-add="${first.id}"]`, driverA.id);
|
||||
await waitFor(async () => (await teamsNow())[0].driverIds.includes(driverA.id), "driver A on team A");
|
||||
await setValue(`[data-team-add="${second.id}"]`, driverB.id);
|
||||
await waitFor(async () => (await teamsNow())[1].driverIds.includes(driverB.id), "driver B on team B");
|
||||
|
||||
await evaluate(`(() => { const form = document.getElementById("teamForm"); form.elements.namedItem("teamName").value = "Membership Team B"; })()`);
|
||||
await evaluate(`document.querySelector('[form="teamForm"][name="teamDriverIds"][value="${driverB.id}"]').checked = true`);
|
||||
await submit("teamForm");
|
||||
await waitFor(async () => (await findEvent(raceEvent.id)).raceConfig.teams.some((team) => team.name === "Membership Team B"), "team B created");
|
||||
const teamB = (await findEvent(raceEvent.id)).raceConfig.teams.find((team) => team.name === "Membership Team B");
|
||||
const hintText = await evaluate(`document.querySelector('[data-team-add="${second.id}"] option[value="${driverA.id}"]')?.textContent || ""`);
|
||||
assert.match(hintText, /Membership Team A/, "the add list names the other team a driver is currently on, before the move happens");
|
||||
|
||||
await click("team-edit-" + teamB.id);
|
||||
await waitFor(async () => await evaluate(`Boolean(document.getElementById("teamEditForm"))`), "team B edit form open");
|
||||
const hintText = await evaluate(`document.querySelector('#teamEditForm [name="teamDriverIds"][value="${driverA.id}"]')?.closest("label")?.textContent || ""`);
|
||||
assert.match(hintText, /Membership Team A/, "the edit form names the other team a driver is currently on, before the move happens");
|
||||
|
||||
await evaluate(`document.querySelector('#teamEditForm [name="teamDriverIds"][value="${driverA.id}"]').checked = true`);
|
||||
await pause(5500); // outlast the periodic version poll, matching the existing team-edit browser coverage
|
||||
await click("teamEditSave");
|
||||
await waitFor(async () => (await findEvent(raceEvent.id)).raceConfig.teams.find((team) => team.name === "Membership Team B").driverIds.includes(driverA.id), "driver A saved onto team B");
|
||||
await setValue(`[data-team-add="${second.id}"]`, driverA.id);
|
||||
await waitFor(async () => (await teamsNow()).find((team) => team.name === "Membership Team B").driverIds.includes(driverA.id), "driver A saved onto team B");
|
||||
|
||||
const afterMove = await findEvent(raceEvent.id);
|
||||
const teamA = afterMove.raceConfig.teams.find((team) => team.name === "Membership Team A");
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import "./auth.test.js";
|
||||
import "./team_race_logic.test.js";
|
||||
import "./race_overview.test.js";
|
||||
import "./leader_call_logic.test.js";
|
||||
import "./decoder_sim.test.js";
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { splitIntoTeams, moveDriverToTeam, setTeamCar, renameTeam, removeTeam, getTeamTransponders, findTeamRaceIssues, hasBlockingTeamIssues } from "../src/team_race_logic.js";
|
||||
|
||||
let n = 0;
|
||||
const uid = (prefix) => `${prefix}_${++n}`;
|
||||
const nameFor = (i) => `Team ${i}`;
|
||||
|
||||
test("splitIntoTeams deals drivers in turn and keeps existing teams' id, name and car", () => {
|
||||
const existing = [{ id: "t1", name: "Red", driverIds: ["x"], carIds: ["c1"] }];
|
||||
const teams = splitIntoTeams(["a", "b", "c", "d", "e"], 2, existing, { uid, nameFor });
|
||||
assert.deepEqual(teams.map((team) => [team.name, team.driverIds, team.carIds]), [["Red", ["a", "c", "e"], ["c1"]], ["Team 2", ["b", "d"], []]]);
|
||||
assert.equal(teams[0].id, "t1");
|
||||
});
|
||||
|
||||
test("moving a driver takes them off the old team; setting a car takes it off other teams", () => {
|
||||
let teams = [{ id: "t1", name: "A", driverIds: ["a"], carIds: ["c1"] }, { id: "t2", name: "B", driverIds: ["b"], carIds: [] }];
|
||||
teams = moveDriverToTeam(teams, "a", "t2");
|
||||
assert.deepEqual(teams.map((team) => team.driverIds), [[], ["b", "a"]]);
|
||||
teams = setTeamCar(teams, "t2", "c1");
|
||||
assert.deepEqual(teams.map((team) => team.carIds), [[], ["c1"]]);
|
||||
teams = moveDriverToTeam(teams, "b", "");
|
||||
assert.deepEqual(teams[1].driverIds, ["a"]);
|
||||
assert.equal(renameTeam(teams, "t1", " ")[0].name, "A");
|
||||
assert.equal(renameTeam(teams, "t1", "Blue")[0].name, "Blue");
|
||||
assert.equal(removeTeam(teams, "t1").length, 1);
|
||||
});
|
||||
|
||||
test("team transponders and the checks before the start", () => {
|
||||
const drivers = [{ id: "a", transponder: "11" }, { id: "b", transponder: "" }, { id: "c", transponder: "11" }, { id: "d", transponder: "" }];
|
||||
const cars = [{ id: "c1", transponder: "900" }];
|
||||
const teams = [
|
||||
{ id: "t1", name: "A", driverIds: ["a", "b"], carIds: ["c1"] },
|
||||
{ id: "t2", name: "B", driverIds: ["c"], carIds: [] },
|
||||
{ id: "t3", name: "C", driverIds: ["d"], carIds: [] },
|
||||
{ id: "t4", name: "D", driverIds: [], carIds: [] },
|
||||
];
|
||||
assert.deepEqual(getTeamTransponders(teams[0], { drivers, cars }), ["900", "11"]);
|
||||
const issues = findTeamRaceIssues(teams, { drivers, cars, driverIds: ["a", "b", "c", "d", "e"] });
|
||||
assert.deepEqual(issues.empty, ["D"]);
|
||||
assert.deepEqual(issues.noTransponder, ["C"]);
|
||||
assert.deepEqual(issues.shared, [{ transponder: "11", teams: ["A", "B"] }]);
|
||||
assert.deepEqual(issues.unplaced, ["e"]);
|
||||
assert.equal(hasBlockingTeamIssues(issues), true);
|
||||
const ok = findTeamRaceIssues([{ id: "t1", name: "A", driverIds: ["a"], carIds: [] }, { id: "t2", name: "B", driverIds: ["b"], carIds: ["c1"] }], { drivers, cars });
|
||||
assert.equal(hasBlockingTeamIssues(ok), false);
|
||||
});
|
||||
Reference in new issue
Block a user