Skip to content

Add Events Calendar-shaped merge smoke coverage#318

Merged
adamziel merged 1 commit into
trunkfrom
codex/merge-planner-next
May 18, 2026
Merged

Add Events Calendar-shaped merge smoke coverage#318
adamziel merged 1 commit into
trunkfrom
codex/merge-planner-next

Conversation

@adamziel
Copy link
Copy Markdown
Contributor

@adamziel adamziel commented May 18, 2026

What it does

Adds fast tests/cow/merge_smoke.php regressions for an Events Calendar-shaped plugin graph: tribe_events, tribe_venue, tribe_organizer, event metadata, tribe_events_cat, and option JSON with branch-local object IDs.

Rationale

ForkPress already covers generic CPT graphs, but event plugins tend to keep one logical object spread across several WordPress tables and JSON references. These tests catch regressions where one side's event graph disappears, ID-band assumptions break embedded event/venue/organizer IDs, or edit/delete cases stop being reviewable.

Implementation

The smoke fixtures now cover:

  • independent source and target event graph inserts merging with status: completed and zero conflicts;
  • event metadata that keeps branch-local _EventVenueID and _EventOrganizerID refs;
  • category relationships and option JSON surviving without ID rewrite;
  • same-event source edit vs. target delete returning completed_with_conflicts with target deletion preserved before review;
  • merge audit rows for source/target graph inserts and target-wins review defaults.

The roadmap evidence in docs/merge-reliability.md names this coverage explicitly.

Testing instructions

php tests/cow/merge_smoke.php

Local result: COW merge smoke tests passed (768 assertions).

@adamziel adamziel force-pushed the codex/merge-planner-next branch from c03ecb7 to ca1e482 Compare May 18, 2026 10:45
@adamziel adamziel marked this pull request as ready for review May 18, 2026 10:47
@adamziel adamziel merged commit c1a5d44 into trunk May 18, 2026
7 checks passed
@adamziel adamziel deleted the codex/merge-planner-next branch May 18, 2026 10:47
@adamziel adamziel mentioned this pull request May 18, 2026
adamziel added a commit that referenced this pull request May 18, 2026
## Release `v0.1.35`

Version bump and release metadata update for `v0.1.35`.

**Changelog draft:**
* Extend merge revalidation and WordPress semantic guards
([#313](#313))
* Add Events Calendar-shaped merge smoke coverage
([#318](#318))
* Extend semantic E2E with Site Editor objects
([#317](#317))
* Add thin SSH remote clone command
([#315](#315))
* Update release gate evidence for v0.1.34
([#319](#319))
* Guard plugin children behind logical identity collisions
([#320](#320))
* Hold case-insensitive upload path collisions
([#322](#322))
* Cover scoped crash recovery
([#323](#323))
* Hold malformed attachment metadata shapes
([#324](#324))
* Cover thin remote clone branch metadata
([#326](#326))
* Cover source-added trigger view dependencies
([#321](#321))
* Cover WooCommerce duplicate address semantics
([#325](#325))
* Cover Events Calendar organizer validator semantics
([#327](#327))
* Cover Elementor widget media validator semantics
([#328](#328))
* Reject duplicate attachment upload metadata rows
([#329](#329))
* Cover existing branch Git update crash recovery
([#330](#330))
* Mark WordPress media repairs review-only
([#331](#331))
* Cover backup attachment metadata drift
([#332](#332))
* Limit release verification for COW-only PRs
([#335](#335))
* Batch merge reliability roadmap coverage
([#336](#336))
* Cover WordPress upload MIME drift
([#333](#333))
* Add branch merge history commands
([#334](#334))
* Show restored stale-audit reviews
([#337](#337))
* Cover Yoast duplicate indexable permalinks
([#338](#338))
* Cover Yoast indexable hierarchy drift
([#339](#339))
* Cover revision parent semantic drift
([#340](#340))
* Expose merge history in branch switcher
([#341](#341))
* Cover ACF relationship validator drift
([#342](#342))
* Show merge history on branch admin page
([#343](#343))
* Drill into conflicts from branch admin history
([#344](#344))
* Expose branch tree on admin page
([#345](#345))
* Resolve conflicts from branch admin page
([#346](#346))
* Document conflict review workflow
([#347](#347))

**Full changelog:**
v0.1.34...release/v0.1.35

## Next steps

1. **Review** the changes in this pull request.
2. **Push** any additional edits to this branch (`release/v0.1.35`).
3. **Merge** this pull request to publish `v0.1.35`.

Merging will automatically build ForkPress binaries, create a GitHub
release, and update the Homebrew formula.

Co-authored-by: Codex <codex@openai.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants