Adds API + UI/e2e coverage for the cell-merge overlay introduced by
task #152 on the executive-meetings schedule. Two new test files,
no production code changes.
API tests (artifacts/api-server/tests/executive-meetings-merge.test.mjs):
- Setting a merge writes mergeStartColumn/mergeEndColumn/mergeText and
the row round-trips back through GET ?date=.
- Clearing with `merge: null` nulls all three columns while leaving the
rest of the row intact (combined with a titleEn change in the same
PATCH to prove only the merge fields move).
- Invalid range start>end is rejected with 400 and the row is unchanged
(also covers an unknown enum value).
- mergeText is sanitized: <script>, onerror, javascript:, and <img>
are stripped; visible text, <strong>, and the allowed inline color
style (rgb(220,38,38)) survive — locks the contract that Tiptap-style
formatting on the merged label is preserved.
- A non-mutate user (executive_viewer role) gets 403 on PATCH merge
and a follow-up DB SELECT confirms no fields changed.
UI / e2e tests (artifacts/tx-os/tests/executive-meetings-merge.spec.mjs):
- Two-tab realtime: separate browser contexts both open the same day;
applying a merge in tab A makes the merged cell appear in tab B
without a manual reload (relies on the existing
`executive_meetings_changed` Socket.IO emit + client invalidator).
- Hidden # column: with `em-schedule-cols-v1` localStorage flagging
number as invisible, the row-actions kebab still mounts on the next
visible cell and the Merge submenu is reachable.
- Non-contiguous reorder: a row with a stored merge spanning
meeting+attendees is loaded after reordering columns to
[number, meeting, time, attendees]. The merged cell is NOT rendered
(correct fallback) but the kebab still surfaces the Unmerge action,
and clicking it clears all three merge columns in the DB.
Both files clean up their own meeting rows + audit log entries +
seeded users in afterAll/after. All 5 API tests + 3 Playwright tests
pass against the running dev workflows.
Follow-ups proposed:
- #217 Show merged cells in the meeting PDF & archive views
- #218 Test the merge popover in Arabic / RTL
Replit-Task-Id: c696223a-209b-4111-9921-e0540e1e16a5
riyadhafraa