Repository navigation
Commit aee298b
test(t3x): move fork settings coverage out of the upstream test file
`packages/contracts/src/settings.test.ts` is upstream-owned and churns hard
(8 commits in 30 days). The fork's `notifyOnNeedsInput` block was inserted at
the same `describe("ClientSettings glass opacity")` anchor that upstream keeps
appending to, which produced a plain add/add rebase conflict on the daily
upstream sync — the exact failure reported in issue #29 (upstream 362f127 vs
fork a2ea115).
Moving the three cases into a fork-owned file removes that file from the
conflict surface permanently. `settings.test.ts` is now byte-identical to
upstream again, so this class of conflict cannot recur there.
The two decode helpers are re-declared rather than imported because the
upstream test file keeps them module-local.
No behaviour change; 27 tests still pass across both files.
Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>1 parent 6feb09f commit aee298b
1 file changed
Lines changed: 34 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
0 commit comments