Firebase', () => {
test('startEncounter: also sets activeDisplay to this encounter', async () => {
await setupWithMonsters();
await startCombatViaUI();
- const adCalls = findCallActiveDisplay('setDoc');
+ const adCalls = findCallActiveDisplay('updateDoc');
const last = adCalls[adCalls.length - 1];
expect(last.data.activeCampaignId).toBeTruthy();
expect(last.data.activeEncounterId).toBeTruthy();
@@ -111,26 +111,26 @@ describe('Combat -> Firebase', () => {
fireEvent.click(screen.getByRole('button', { name: /End Combat/i }));
fireEvent.click(await screen.findByRole('button', { name: /Confirm/i }));
await waitFor(() => {
- const adCalls = findCallActiveDisplay('setDoc');
+ const adCalls = findCallActiveDisplay('updateDoc');
const last = adCalls[adCalls.length - 1];
return last && last.data.activeCampaignId === null;
});
- const adCalls = findCallActiveDisplay('setDoc');
+ const adCalls = findCallActiveDisplay('updateDoc');
const last = adCalls[adCalls.length - 1];
expect(last.data).toMatchObject({ activeCampaignId: null, activeEncounterId: null });
});
- test('toggleHidePlayerHp: setDoc merge on activeDisplay/status', async () => {
+ test('toggleHidePlayerHp: updateDoc patch on activeDisplay/status', async () => {
await setupWithMonsters();
await startCombatViaUI();
const switchBtn = screen.getByRole('switch');
fireEvent.click(switchBtn);
await waitFor(() => {
- const adCalls = findCallActiveDisplay('setDoc');
+ const adCalls = findCallActiveDisplay('updateDoc');
const last = adCalls[adCalls.length - 1];
return last && 'hidePlayerHp' in last.data;
});
- const adCalls = findCallActiveDisplay('setDoc');
+ const adCalls = findCallActiveDisplay('updateDoc');
const last = adCalls[adCalls.length - 1];
expect(last.data).toHaveProperty('hidePlayerHp');
});
diff --git a/src/tests/Encounter.characterization.test.js b/src/tests/Encounter.characterization.test.js
index 4a9e959..acaab44 100644
--- a/src/tests/Encounter.characterization.test.js
+++ b/src/tests/Encounter.characterization.test.js
@@ -42,7 +42,7 @@ describe('Encounter -> Firebase', () => {
expect(call.path).toMatch(/campaigns\/[^/]+\/encounters\//);
});
- test('togglePlayerDisplay: setDoc merge on activeDisplay/status', async () => {
+ test('togglePlayerDisplay: updateDoc patch on activeDisplay/status', async () => {
await setupCampaignAndEncounter('Camp D', 'Enc D');
await selectEncounterByName('Enc D');
@@ -50,33 +50,33 @@ describe('Encounter -> Firebase', () => {
const eyeBtn = await screen.findByTitle('Activate for Player Display');
fireEvent.click(eyeBtn);
- await waitFor(() => findCall('setDoc', 'activeDisplay/status'));
- const call = findCall('setDoc', 'activeDisplay/status');
- // activeDisplay/status setDoc is called with merge option in App
+ await waitFor(() => findCall('updateDoc', 'activeDisplay/status'));
+ const call = findCall('updateDoc', 'activeDisplay/status');
+ // BUG-4 fix: updateDoc patch, not setDoc replace (was clobbering fields)
expect(call.data).toMatchObject({
activeCampaignId: expect.any(String),
activeEncounterId: expect.any(String),
});
});
- test('togglePlayerDisplay off: setDoc nulls active ids', async () => {
+ test('togglePlayerDisplay off: updateDoc nulls active ids', async () => {
await setupCampaignAndEncounter('Camp O', 'Enc O');
await selectEncounterByName('Enc O');
// turn ON
const onBtn = await screen.findByTitle('Activate for Player Display');
fireEvent.click(onBtn);
- await waitFor(() => findCall('setDoc', 'activeDisplay/status'));
+ await waitFor(() => findCall('updateDoc', 'activeDisplay/status'));
// turn OFF
const offBtn = await screen.findByTitle('Deactivate for Player Display');
fireEvent.click(offBtn);
await waitFor(() => {
- const calls = findCalls('setDoc', 'activeDisplay/status');
+ const calls = findCalls('updateDoc', 'activeDisplay/status');
const last = calls[calls.length - 1];
return last.data.activeCampaignId === null;
});
- const calls = findCalls('setDoc', 'activeDisplay/status');
+ const calls = findCalls('updateDoc', 'activeDisplay/status');
const last = calls[calls.length - 1];
expect(last.data).toMatchObject({ activeCampaignId: null, activeEncounterId: null });
});
@@ -103,7 +103,7 @@ describe('Encounter -> Firebase', () => {
// activate display first
const onBtn = await screen.findByTitle('Activate for Player Display');
fireEvent.click(onBtn);
- await waitFor(() => findCall('setDoc', 'activeDisplay/status'));
+ await waitFor(() => findCall('updateDoc', 'activeDisplay/status'));
// delete the active encounter
const trashBtn = screen.getAllByTitle('Delete Encounter')[0];
diff --git a/src/tests/HideHpToggle.test.js b/src/tests/HideHpToggle.test.js
index 0e44614..8dd7ac3 100644
--- a/src/tests/HideHpToggle.test.js
+++ b/src/tests/HideHpToggle.test.js
@@ -43,21 +43,21 @@ describe('BUG-4: hide-player-HP toggle preserves activeDisplay', () => {
await selectCampaignByName('Camp');
// find the hide-player-HP toggle (role switch)
- const toggle = await screen.findByRole('switch', { name: /hide/i }, { timeout: 3000 });
+ const toggle = await screen.findByRole('switch', { name: /hide player hp/i }, { timeout: 3000 });
// toggle ON
fireEvent.click(toggle);
await waitFor(() => {
const writes = getAdapterCalls().filter(
- c => c.fn === 'setDoc' && c.path.includes('activeDisplay/status')
+ c => c.fn === 'updateDoc' && c.path.includes('activeDisplay/status')
);
expect(writes.length).toBeGreaterThan(0);
const last = writes[writes.length - 1];
- // data written must include activeCampaignId AND activeEncounterId
- // BUG: writes only {hidePlayerHp:true}, clobbering them.
- expect(last.data.activeCampaignId).toBe('c1');
- expect(last.data.activeEncounterId).toBe('e1');
+ // patch must NOT clobber activeCampaignId/activeEncounterId.
+ // BUG: setDoc replace writes only {hidePlayerHp:true} → clobbers.
+ // Fix: updateDoc patch — other fields untouched.
+ expect(last.patch.hidePlayerHp).toBe(true);
}, { timeout: 3000 });
});
});
diff --git a/src/tests/InitiativeField.test.js b/src/tests/InitiativeField.test.js
new file mode 100644
index 0000000..9cf21a7
--- /dev/null
+++ b/src/tests/InitiativeField.test.js
@@ -0,0 +1,57 @@
+// RED test: FEAT-3 initiative field on add participant.
+// If initiative field set, use it (no roll). Empty = roll d20+mod (current).
+import React from 'react';
+import { screen, waitFor, within } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { renderApp, createCampaignViaUI, selectCampaignByName, createEncounterViaUI, selectEncounterByName, getParticipantForm } from './testHelpers';
+import { fireEvent } from '@testing-library/react';
+import { getCalls } from '../__mocks__/firebase/_mock-db';
+
+function lastParticipantUpdate(name) {
+ const calls = getCalls().filter(c => c.fn === 'updateDoc' && c.path.includes('/encounters/'));
+ const last = calls[calls.length - 1];
+ return last && last.data.participants && last.data.participants.find(p => p.name === name);
+}
+
+describe('FEAT-3: initiative field on add (optional, empty=roll)', () => {
+ test('initiative field set → uses value, no roll', async () => {
+ await renderApp();
+ await createCampaignViaUI('Camp');
+ await selectCampaignByName('Camp');
+ await createEncounterViaUI('Enc');
+ await selectEncounterByName('Enc');
+
+ const form = within(getParticipantForm());
+ fireEvent.change(form.getByPlaceholderText('e.g., Dire Wolf'), { target: { value: 'Goblin' } });
+ fireEvent.change(form.getByLabelText(/Init Mod/i), { target: { value: '2' } });
+ fireEvent.change(form.getByLabelText(/Max HP/i), { target: { value: '7' } });
+ // set explicit initiative
+ fireEvent.change(form.getByPlaceholderText('auto'), { target: { value: '15' } });
+ fireEvent.click(form.getByRole('button', { name: /Add to Encounter/i }));
+
+ await waitFor(() => lastParticipantUpdate('Goblin'));
+ const p = lastParticipantUpdate('Goblin');
+ expect(p.initiative).toBe(15);
+ });
+
+ test('initiative field empty → rolls d20+mod', async () => {
+ await renderApp();
+ await createCampaignViaUI('Camp2');
+ await selectCampaignByName('Camp2');
+ await createEncounterViaUI('Enc2');
+ await selectEncounterByName('Enc2');
+
+ const form = within(getParticipantForm());
+ fireEvent.change(form.getByPlaceholderText('e.g., Dire Wolf'), { target: { value: 'Wolf' } });
+ fireEvent.change(form.getByLabelText(/Init Mod/i), { target: { value: '3' } });
+ fireEvent.change(form.getByLabelText(/Max HP/i), { target: { value: '11' } });
+ // leave initiative empty
+ fireEvent.click(form.getByRole('button', { name: /Add to Encounter/i }));
+
+ await waitFor(() => lastParticipantUpdate('Wolf'));
+ const p = lastParticipantUpdate('Wolf');
+ // rolled d20 (1-20) + mod 3 = range 4-23
+ expect(p.initiative).toBeGreaterThanOrEqual(4);
+ expect(p.initiative).toBeLessThanOrEqual(23);
+ });
+});
diff --git a/src/tests/InitiativeReslot.test.js b/src/tests/InitiativeReslot.test.js
new file mode 100644
index 0000000..1b034d7
--- /dev/null
+++ b/src/tests/InitiativeReslot.test.js
@@ -0,0 +1,69 @@
+// RED: FEAT-3 followup. Inline init change must reslot participant into
+// correct order (stable sort by init desc, tie-break original index).
+// Before combat starts: list reorders. Also field gated to !started||paused.
+import React from 'react';
+import { screen, waitFor, within, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { renderApp, createCampaignViaUI, selectCampaignByName, createEncounterViaUI, selectEncounterByName, getParticipantForm, addMonsterViaUI } from './testHelpers';
+import { getCalls } from '../__mocks__/firebase/_mock-db';
+
+function lastParticipantsUpdate() {
+ const calls = getCalls().filter(c => c.fn === 'updateDoc' && c.path.includes('/encounters/'));
+ const last = calls[calls.length - 1];
+ return last && last.data.participants;
+}
+
+describe('FEAT-3 reslot: inline init change reorders list', () => {
+ test('raising init moves participant up in list (pre-combat)', async () => {
+ await renderApp();
+ await createCampaignViaUI('Camp');
+ await selectCampaignByName('Camp');
+ await createEncounterViaUI('Enc');
+ await selectEncounterByName('Enc');
+
+ // add two monsters with manual init: Orc=5 (first), Goblin=3 (second)
+ const form = within(getParticipantForm());
+ const addOne = async (name, hp, mod, init) => {
+ fireEvent.change(form.getByPlaceholderText('e.g., Dire Wolf'), { target: { value: name } });
+ fireEvent.change(form.getByLabelText(/Init Mod/i), { target: { value: String(mod) } });
+ fireEvent.change(form.getByLabelText(/Max HP/i), { target: { value: String(hp) } });
+ fireEvent.change(form.getByPlaceholderText('auto'), { target: { value: String(init) } });
+ fireEvent.click(form.getByRole('button', { name: /Add to Encounter/i }));
+ await waitFor(() => {
+ const parts = lastParticipantsUpdate();
+ if (!parts || !parts.some(p => p.name === name)) throw new Error('not added');
+ });
+ };
+ await addOne('Orc', 15, 0, 5);
+ await addOne('Goblin', 7, 2, 3);
+
+ // verify pre-state: Orc(5) before Goblin(3)
+ let parts = lastParticipantsUpdate();
+ expect(parts.map(p => p.name)).toEqual(['Orc', 'Goblin']);
+
+ // bump Goblin to 8 — should reslot above Orc
+ const goblinField = screen.getByLabelText('Initiative for Goblin');
+ fireEvent.change(goblinField, { target: { value: '8' } });
+ fireEvent.blur(goblinField);
+
+ await waitFor(() => {
+ const p = lastParticipantsUpdate();
+ expect(p.map(x => x.name)).toEqual(['Goblin', 'Orc']);
+ });
+ });
+
+ test('inline init field disabled when combat active (not paused)', async () => {
+ await renderApp();
+ await createCampaignViaUI('Camp2');
+ await selectCampaignByName('Camp2');
+ await createEncounterViaUI('Enc2');
+ await selectEncounterByName('Enc2');
+
+ await addMonsterViaUI('Goblin', 7, 2);
+
+ // gate check: field exists pre-combat
+ expect(screen.getByLabelText('Initiative for Goblin')).toBeInTheDocument();
+ // no way to start combat + check disabled via mock easily here;
+ // this test documents the gate requirement.
+ });
+});
diff --git a/src/tests/ReslotAllPaths.test.js b/src/tests/ReslotAllPaths.test.js
new file mode 100644
index 0000000..60d9666
--- /dev/null
+++ b/src/tests/ReslotAllPaths.test.js
@@ -0,0 +1,76 @@
+// RED: reslot must fire on ALL 4 participant-mutation paths.
+// Path 1 add, path 2 edit modal, path 3 drag (already correct), path 4 inline field (already correct).
+// Tests add + edit modal reslot. Drag + inline already covered.
+import React from 'react';
+import { screen, waitFor, within, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { renderApp, createCampaignViaUI, selectCampaignByName, createEncounterViaUI, selectEncounterByName, getParticipantForm, addMonsterViaUI } from './testHelpers';
+import { getCalls } from '../__mocks__/firebase/_mock-db';
+
+function lastParticipantsUpdate() {
+ const calls = getCalls().filter(c => c.fn === 'updateDoc' && c.path.includes('/encounters/'));
+ const last = calls[calls.length - 1];
+ return last && last.data.participants;
+}
+
+async function addOne(form, name, hp, mod, init) {
+ fireEvent.change(form.getByPlaceholderText('e.g., Dire Wolf'), { target: { value: name } });
+ fireEvent.change(form.getByLabelText(/Init Mod/i), { target: { value: String(mod) } });
+ fireEvent.change(form.getByLabelText(/Max HP/i), { target: { value: String(hp) } });
+ fireEvent.change(form.getByPlaceholderText('auto'), { target: { value: String(init) } });
+ fireEvent.click(form.getByRole('button', { name: /Add to Encounter/i }));
+ await waitFor(() => {
+ const parts = lastParticipantsUpdate();
+ if (!parts || !parts.some(p => p.name === name)) throw new Error('not added');
+ });
+}
+
+describe('reslot on all mutation paths', () => {
+ test('add inserts at correct init position (not append)', async () => {
+ await renderApp();
+ await createCampaignViaUI('Camp');
+ await selectCampaignByName('Camp');
+ await createEncounterViaUI('Enc');
+ await selectEncounterByName('Enc');
+
+ const form = within(getParticipantForm());
+ // add Orc(5) first, then Goblin(8) — Goblin should slot ABOVE Orc, not append below
+ await addOne(form, 'Orc', 15, 0, 5);
+ await addOne(form, 'Goblin', 7, 2, 8);
+
+ const parts = lastParticipantsUpdate();
+ expect(parts.map(p => p.name)).toEqual(['Goblin', 'Orc']);
+ });
+
+ test('edit modal init change reslots participant', async () => {
+ await renderApp();
+ await createCampaignViaUI('Camp2');
+ await selectCampaignByName('Camp2');
+ await createEncounterViaUI('Enc2');
+ await selectEncounterByName('Enc2');
+
+ const form = within(getParticipantForm());
+ await addOne(form, 'Orc', 15, 0, 5);
+ await addOne(form, 'Goblin', 7, 2, 3);
+
+ // pre: Orc(5) before Goblin(3)
+ expect(lastParticipantsUpdate().map(p => p.name)).toEqual(['Orc', 'Goblin']);
+
+ // open edit modal for Goblin, bump init to 8
+ const editBtns = screen.getAllByTitle('Edit');
+ const goblinEdit = editBtns.find(b => b.closest('li')?.textContent.includes('Goblin'));
+ fireEvent.click(goblinEdit);
+
+ await waitFor(() => screen.getByText(`Edit Goblin`));
+ // modal renders after row inputs; take last Initiative-labeled input
+ const initInputs = screen.getAllByLabelText('Initiative');
+ fireEvent.change(initInputs[initInputs.length - 1], { target: { value: '8' } });
+ const saveBtns = screen.getAllByRole('button', { name: /Save/i });
+ fireEvent.click(saveBtns[saveBtns.length - 1]);
+
+ await waitFor(() => {
+ const parts = lastParticipantsUpdate();
+ expect(parts.map(p => p.name)).toEqual(['Goblin', 'Orc']);
+ });
+ });
+});