Skip to content

AAP-20047: add Detox 20.51.3 patch (resolve composeSessionConfig conflict)#6

Merged
rajpatta merged 1 commit into
mainfrom
AAP-20047-detox-20.51.3-patch
Jun 30, 2026
Merged

AAP-20047: add Detox 20.51.3 patch (resolve composeSessionConfig conflict)#6
rajpatta merged 1 commit into
mainfrom
AAP-20047-detox-20.51.3-patch

Conversation

@aditya711-code

Copy link
Copy Markdown
Collaborator

What

Adds patches/0002-cloud-detox-20.51.3-full.patch — the BrowserStack cloud-Detox patch reworked for upstream Detox 20.51.3 (current prod patch is 0001-…20.26.2).

Why

DetoxBstackPatchApply (UPSTREAM_TAG=20.51.3) failed because the 20.26.2-based patch conflicts when applied onto 20.51.3 — one file only: detox/src/configuration/composeSessionConfig.js. Between 20.26.2 and 20.51.3, upstream added ignoreUnexpectedMessages / ignoreUnexpectedWsMessages handling in the exact region where our patch inserts its if (isCloudSession) { … } cloud-caps validation → overlapping inserts → merge conflict → the job aborts on conflict markers.

What changed in this patch vs 0001

  • The composeSessionConfig.js hunks were regenerated against 20.51.3 context, keeping both upstream's ignoreUnexpectedMessages blocks and our cloud-caps validation (they're independent).
  • The other 25 files are unchanged from 0001 — they already 3-way-merge cleanly onto 20.51.3 (verified in DetoxBstackPatchApply build Missing the Detox-android folder in npm package #3, where only composeSessionConfig.js conflicted).

Verification

  • Applying the corrected composeSessionConfig.js hunk to the real upstream 20.51.3 file reproduces the intended merged result exactly.
  • The apply job picks the highest-versioned patch (sort -V), so 0002-…20.51.3 supersedes 0001-…20.26.2.

After merge

Re-run DetoxBstackPatchApply with UPSTREAM_TAG=20.51.3 → applies clean → pushes patched-20.51.3. (Follow-up: regenerate a fully 20.51.3-based patch from the merged tree as cleanup; not required to unblock.)

Ref: AAP-20047

🤖 Generated with Claude Code

@aditya711-code aditya711-code requested a review from a team as a code owner June 29, 2026 05:34
@rajpatta rajpatta merged commit 7bc24df into main Jun 30, 2026
4 checks passed
@rajpatta rajpatta deleted the AAP-20047-detox-20.51.3-patch branch June 30, 2026 05:40
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.

4 participants