Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.
JavaScript apple-watchbodyweightdockerfitnessfitness-trackergymhealthiosmcpnodejspasskeysprogressive-web-applicationspwareactself-hostedself-hostingvitewebauthnweightliftingworkout-tracker
Tests: Plan's Undo comes back as a stamped change another device's merge keeps, and the accent syncs per field
Duarte Santos567396cc73bc
diff --git a/frontend/src/views/Plan.undo-sync.test.jsx b/frontend/src/views/Plan.undo-sync.test.jsxnew file mode 100644index 000000000..8b6e61ddd--- /dev/null+++ b/frontend/src/views/Plan.undo-sync.test.jsx@@ -0,0 +1,94 @@+// @vitest-environment happy-dom+// Plan's Undo (v1.3.11 swipe) meets the field-stamp sync (v1.3.11 sync). A routine deleted and put+// back with Undo must come back as a stamped change: the removal another device already pulled+// must not take it away again, whichever copy the merge counts as newer, and it keeps its place+// in the list and on its weekdays. An edit another device made meanwhile still wins its field.+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'+import { DEF, useStore } from '../store/useStore.js'+import { useUI } from '../store/useUI.js'+import { deleteRoutineWithUndo } from './Plan.jsx'+import { mergeStates, stampChange } from '../lib/sync-merge.js'++vi.mock('react-router-dom', () => ({ useNavigate: () => vi.fn() }))+vi.mock('../lib/sound.js', () => ({ beep: vi.fn(), chime: vi.fn(), vibrate: vi.fn(), alertBuzz: vi.fn(), unlock: vi.fn() }))+vi.mock('../lib/api.js', () => ({ api: vi.fn(() => Promise.resolve({})), beacon: vi.fn(), appBase: () => '/' }))++const clone = value => JSON.parse(JSON.stringify(value))+const routine = (id, name, ts) => ({ id, name, emoji: null, _ts: ts, ex: [{ id: '0025', sets: 3, reps: 5 }] })+const ids = list => list.map(r => r.id)+const S = () => useStore.getState().S+const undo = () => useUI.getState().runToastAction()++// The copy both devices share before anything happens.+const shared = () => Object.assign(clone(DEF), {+ _ts: 1000,+ routines: [routine('a', 'Push', 900), routine('b', 'Pull', 900), routine('c', 'Legs', 900)],+ week: { 1: ['a', 'b'], 3: ['b'], 5: ['c'] },+})+// Another device's change, stamped the way its store would stamp it.+const change = (prev, fn, wall) => { const next = clone(prev); fn(next); next._ts = stampChange(prev, next, wall); return next }++beforeEach(() => {+ localStorage.clear()+ useStore.setState({ S: shared(), user: null })+})+afterEach(() => { localStorage.clear() })++describe('Undo after a removal the other device has already pulled', () => {+ it('the routine stays, in its place and on its weekdays, in both merge directions', () => {+ expect(deleteRoutineWithUndo('b')).toBe(true)+ const deleted = clone(S())+ expect(deleted.deleted.routines.b).toBeGreaterThan(0)+ // The other device pulls the removal, then changes something unrelated later.+ const other = change(deleted, s => { s.restSec = 75 }, Date.now() + 60_000)+ undo()+ const here = S()+ const back = here.routines.find(r => r.id === 'b')+ expect(back).toBeTruthy()+ expect(back._ts).toBeGreaterThan(deleted.deleted.routines.b)+ expect(here.deleted.routines.b).toBeLessThan(0) // marked as added back+ for (const m of [mergeStates(here, other), mergeStates(other, here)]) {+ expect(ids(m.routines)).toEqual(['a', 'b', 'c'])+ expect(m.week[1]).toEqual(['a', 'b'])+ expect(m.week[3]).toEqual(['b'])+ expect(m.restSec).toBe(75)+ // and the next merge with the server's old removal does not drop it either+ expect(ids(mergeStates(m, deleted).routines)).toEqual(['a', 'b', 'c'])+ }+ })++ it('a rename the other device made before it saw the removal keeps its field', () => {+ const before = clone(S())+ const renamed = change(before, s => { s.routines[1].name = 'Pull heavy' }, Date.now() + 1)+ deleteRoutineWithUndo('b')+ undo()+ const m = mergeStates(S(), renamed)+ expect(m.routines.find(r => r.id === 'b').name).toBe('Pull heavy')+ })+})++describe('the accent colour syncs per field like any other setting', () => {+ it('your own colour picked here survives a later unrelated change elsewhere; a later preset there wins only the choice', () => {+ const base = shared()+ const phone = change(base, s => { s.accent = 'custom'; s.accentCustom = '#3366ff' }, 5000)+ const desk = change(base, s => { s.restSec = 90 }, 6000)+ for (const m of [mergeStates(phone, desk), mergeStates(desk, phone)]) {+ expect(m.accent).toBe('custom')+ expect(m.accentCustom).toBe('#3366ff')+ expect(m.restSec).toBe(90)+ }+ const desk2 = change(base, s => { s.accent = 'sky' }, 7000)+ for (const m of [mergeStates(phone, desk2), mergeStates(desk2, phone)]) {+ expect(m.accent).toBe('sky')+ expect(m.accentCustom).toBe('#3366ff') // kept for when you go back to it+ }+ })++ it('a malformed colour from the other copy never reaches the merge', () => {+ const base = shared()+ const bad = change(base, s => { s.accent = 'custom'; s.accentCustom = 'url(x)' }, 5000)+ const m = mergeStates(base, bad)+ expect(m.accentCustom).toBeUndefined()+ expect(m.accent).toBe('custom') // drawn as the default without a usable colour (accentKey)+ })+})