refactor(rust): share test scaffolding via mergify-test-support crate by jd · Pull Request #1439 · Mergifyio/mergify-cli

jd · 2026-05-19T12:06:48Z

Every command crate's test module re-rolled the same ~30 LOC of
SharedBytes / SharedWriter / Captured / make_output glue —
about 350 LOC of pure boilerplate across 15 files, drifting over
time (some Captured had stderr, some didn't; one file even
carried a _stderr_accessor_lives dead-code stub just to silence
the resulting warning).

Extract the canonical version into a new mergify-test-support
crate that other crates pull in as a dev-dependencies. The new
Captured API exposes human() / new(mode) constructors and
stdout() / stderr() accessors, so the common pattern shrinks
from a 12-line String::from_utf8(cap.stdout.lock().unwrap().clone())
to let s = cap.stdout().

Net -418 / +114 lines across the workspace. Behavior unchanged;
all 233 tests pass.

The crate is publish = false and only ever appears under
[dev-dependencies], so the test-only types never leak into a
production build.

Co-Authored-By: Claude Opus 4.7 noreply@anthropic.com

Depends-On: #1464

jd · 2026-05-19T12:06:53Z

This pull request is part of a Mergify stack:

#	Pull Request	Link
1	fix(cli): accept --debug on the Rust binary and actually toggle it in Python	#1464
2	refactor(rust): share test scaffolding via mergify-test-support crate	#1439	👈
3	refactor(core): introduce CommandContext for the queue+freeze prelude	#1441
4	refactor(ci): consolidate the CI-env scrubber into a shared testing module	#1442
5	refactor: drop stale Phase X.Y doc markers and one inline color branch	#1443
6	refactor(tui): share StyledGlyph across queue show/status renderers	#1444
7	refactor(queue): drop indexmap, group_by_scope returns a Vec<(K, V)>	#1445
8	refactor(ci): swap uuid for getrandom in the GHA heredoc delimiter	#1446
9	refactor(config): standardize the workspace on serde_yaml_ng for YAML parsing	#1447
10	test(ci): add live smoke test for `ci scopes` select-all path	#1460
11	feat(rust): port `ci scopes` to native Rust	#1461
12	feat(ci): parse JUnit XML reports in native Rust	#1465
13	feat(ci): encode JUnit cases as OTLP and upload to Mergify CI Insights	#1466
14	feat(ci): promote `ci junit-process` from shim to native Rust	#1467
15	feat(ci): promote `ci junit-upload` from shim to native as a deprecated alias	#1468
16	fix(ci): prefer GitHub Actions PR-event head SHA over GITHUB_SHA	#1469

mergify · 2026-05-19T12:07:07Z

jd · 2026-05-19T13:04:19Z

Revision history

#	Type	Changes	Date
1	initial	`32628b4`	2026-05-19 13:04 UTC
2	content	`32628b4 → d7feae3`	2026-05-19 13:04 UTC
3	rebase	`d7feae3 → bdea5bb` (rebase only)	2026-05-19 14:15 UTC
4	rebase	`bdea5bb → 64bc36f` (rebase only)	2026-05-20 08:42 UTC
5	rebase	`64bc36f → 7d303a1` (rebase only)	2026-05-20 09:05 UTC
6	rebase	`7d303a1 → e8a93b3` (rebase only)	2026-05-21 07:25 UTC
7	rebase	`e8a93b3 → ac60092` (rebase only)	2026-05-21 07:56 UTC
8	rebase	`ac60092 → 20762f6` (rebase only)	2026-05-21 12:39 UTC
9	content	`20762f6 → 53fc9fd` (raw)	2026-05-22 07:10 UTC
10	rebase	`53fc9fd → d62619b` (rebase only)	2026-05-22 14:40 UTC
11	rebase	`d62619b → d61820b` (rebase only)	2026-05-27 07:53 UTC
12	content	`d61820b → 32a71f8` (raw)	2026-05-27 08:27 UTC

Copilot

Pull request overview

This PR refactors the Rust workspace’s test code by extracting repeated output-capture scaffolding (shared buffers + Write adapters + helpers) into a dedicated mergify-test-support crate that is only used via dev-dependencies, reducing boilerplate and keeping test-only types out of production builds.

Changes:

Added a new crates/mergify-test-support crate providing Captured, SharedBytes, and SharedWriter for consistent stdout/stderr capture in tests.
Updated multiple command-crate test modules to use mergify_test_support::Captured instead of local duplicated implementations.
Wired the new crate into relevant crates’ dev-dependencies and updated Cargo.lock.

Reviewed changes

Copilot reviewed 20 out of 21 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
crates/mergify-test-support/src/lib.rs	Introduces shared capture types (`Captured`, `SharedWriter`) for Rust command tests.
crates/mergify-test-support/Cargo.toml	Defines the new non-published test-support crate and its dependency on `mergify-core`.
crates/mergify-queue/src/unpause.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-queue/src/status.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-queue/src/show.rs	Replaces local capture scaffolding in tests with `Captured` and removes dead-code stderr accessor workaround.
crates/mergify-queue/src/pause.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-queue/Cargo.toml	Adds `mergify-test-support` under `dev-dependencies`.
crates/mergify-freeze/src/update.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-freeze/src/list.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-freeze/src/delete.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-freeze/src/create.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-freeze/Cargo.toml	Adds `mergify-test-support` under `dev-dependencies`.
crates/mergify-config/src/validate.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-config/src/simulate.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-config/Cargo.toml	Adds `mergify-test-support` under `dev-dependencies`.
crates/mergify-ci/src/scopes_send.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-ci/src/queue_metadata.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-ci/src/queue_info.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-ci/src/git_refs.rs	Replaces local capture scaffolding in tests with `Captured`.
crates/mergify-ci/Cargo.toml	Adds `mergify-test-support` under `dev-dependencies`.
Cargo.lock	Records the new crate and dependency edges in the workspace lockfile.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

… Python Two coupled gaps the same user-visible bug was hiding: 1. The Rust binary never declared the top-level `--debug` flag the Python CLI accepts. Invocations like `mergify --debug ci git-refs` were rejected with `error: unexpected argument '--debug' found` the moment a command was promoted from shim to native. Add `debug: bool` as a `global = true` argument on `CliRoot`; native commands accept it as a no-op (no native code path consults the flag yet) and shimmed dispatches re-inject `--debug` at the front of the forwarded argv so the Python `cli` group still receives it. 2. The Python `cli.py` parsed `--debug` into `ctx.obj["debug"]` but never called `utils.set_debug(...)`, so the module-level `_DEBUG` toggle stayed `False` and the 6+ `if is_debug():` sites in `utils.py` / `stack/*` never fired regardless of the flag. Wire `set_debug(debug=debug)` from the root group so the flag has the effect users have always expected it to have. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Change-Id: I62ac941db12c55c988896086d7042c3dacf863af

Every command crate's test module re-rolled the same ~30 LOC of `SharedBytes` / `SharedWriter` / `Captured` / `make_output` glue — about 350 LOC of pure boilerplate across 15 files, drifting over time (some `Captured` had `stderr`, some didn't; one file even carried a `_stderr_accessor_lives` dead-code stub just to silence the resulting warning). Extract the canonical version into a new `mergify-test-support` crate that other crates pull in as a `dev-dependencies`. The new `Captured` API exposes `human()` / `new(mode)` constructors and `stdout()` / `stderr()` accessors, so the common pattern shrinks from a 12-line `String::from_utf8(cap.stdout.lock().unwrap().clone())` to `let s = cap.stdout()`. Net `-418 / +114` lines across the workspace. Behavior unchanged; all 233 tests pass. The crate is `publish = false` and only ever appears under `[dev-dependencies]`, so the test-only types never leak into a production build. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Change-Id: If9d688cdaf55360ba90f386d2020b52346c19b28

mergify · 2026-05-27T13:33:57Z

…#1441) Every `queue` and `freeze` command opens with the same four-line ritual: resolve repository slug, resolve token, resolve API URL, build a Mergify-flavored HTTP client. Wrap those into a `CommandContext::resolve(...)` constructor + `ctx.mergify_client()` builder living in a new `mergify_core::command_context` module. The eight queue/freeze command preludes shrink from let repository = auth::resolve_repository(opts.repository)?; let token = auth::resolve_token(opts.token)?; let api_url = auth::resolve_api_url(opts.api_url)?; let client = HttpClient::new(api_url, token, ApiFlavor::Mergify)?; to let ctx = CommandContext::resolve(opts.repository, opts.token, opts.api_url)?; let client = ctx.mergify_client()?; `auth::resolve_*` stay public for the specialized callers that don't fit the shape: `config validate` needs no repository, `config simulate` derives the repo from a PR URL, `ci scopes-send` resolves the repo from CI-env vars (different fallback chain). Those keep wiring up the lower-level helpers by hand. Net `-73 / +63` across 9 files; conceptually the bigger win is that "the prelude of a Mergify command" is now a named concept with one fix-it-once point. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Depends-On: #1439

mergify Bot had a problem deploying to Mergify Merge Protections May 19, 2026 12:06 Failure

This was referenced May 19, 2026

test(freeze): add live smoke test for freeze create/update/delete #1436

Merged

feat(rust): port freeze create/update/delete to native Rust #1437

Merged

jd temporarily deployed to func-tests-live May 19, 2026 12:06 — with GitHub Actions Inactive

This was referenced May 19, 2026

feat(rust): port freeze list to native Rust #1435

Merged

refactor(rust): dedupe emit-helper boilerplate across command crates #1438

Merged

mergify Bot requested a review from a team May 19, 2026 12:21

jd marked this pull request as ready for review May 19, 2026 12:49

This was referenced May 19, 2026

refactor(core): introduce CommandContext for the queue+freeze prelude #1441

Merged

refactor(ci): consolidate the CI-env scrubber into a shared testing module #1442

Merged

refactor: drop stale Phase X.Y doc markers and one inline color branch #1443

Merged

jd force-pushed the devs/jd/worktree-rust-port/dedupe-emit-helper-boilerplate-across-cmd-crates--ed32eef9 branch from 721eacd to a6bf822 Compare May 19, 2026 13:04

jd force-pushed the devs/jd/worktree-rust-port/share-test-scaffolding-via-mergify-test-support--f9d688cd branch from 32628b4 to d7feae3 Compare May 19, 2026 13:04

jd temporarily deployed to func-tests-live May 19, 2026 13:04 — with GitHub Actions Inactive

mergify Bot had a problem deploying to Mergify Merge Protections May 19, 2026 13:04 Failure

jd force-pushed the devs/jd/worktree-rust-port/share-test-scaffolding-via-mergify-test-support--f9d688cd branch from d7feae3 to bdea5bb Compare May 19, 2026 14:14

jd force-pushed the devs/jd/worktree-rust-port/dedupe-emit-helper-boilerplate-across-cmd-crates--ed32eef9 branch from a6bf822 to ac72c27 Compare May 19, 2026 14:14

jd mentioned this pull request May 19, 2026

refactor(tui): share StyledGlyph across queue show/status renderers #1444

Merged

jd temporarily deployed to func-tests-live May 19, 2026 14:15 — with GitHub Actions Inactive

mergify Bot had a problem deploying to Mergify Merge Protections May 19, 2026 14:15 Failure

mergify Bot had a problem deploying to Mergify Merge Protections May 27, 2026 07:53 Failure

mergify Bot removed the conflict label May 27, 2026

Copilot AI reviewed May 27, 2026

View reviewed changes

Comment thread crates/mergify-test-support/src/lib.rs Outdated

mergify Bot added the review threads unresolved label May 27, 2026

jd and others added 2 commits May 27, 2026 10:20

jd force-pushed the devs/jd/worktree-rust-port/accept-debug-rust-binary-actually-toggle-python--62ac941d branch from 83fc4d3 to fe3d611 Compare May 27, 2026 08:27

jd force-pushed the devs/jd/worktree-rust-port/share-test-scaffolding-via-mergify-test-support--f9d688cd branch from d61820b to 32a71f8 Compare May 27, 2026 08:27

jd temporarily deployed to func-tests-live May 27, 2026 08:27 — with GitHub Actions Inactive

mergify Bot removed the review threads unresolved label May 27, 2026

mergify Bot deployed to Mergify Merge Protections May 27, 2026 08:28 Active

Base automatically changed from devs/jd/worktree-rust-port/accept-debug-rust-binary-actually-toggle-python--62ac941d to main May 27, 2026 12:29

JulianMaurin approved these changes May 27, 2026

View reviewed changes

mergify Bot requested a review from a team May 27, 2026 13:17

kozlek approved these changes May 27, 2026

View reviewed changes

mergify Bot added a commit that referenced this pull request May 27, 2026

Merge of #1439

1278c48

mergify Bot added the queued label May 27, 2026

mergify Bot mentioned this pull request May 27, 2026

merge queue: embarking main (3a99878) and #1439 together #1471

Closed

38 tasks

mergify Bot merged commit 633b9ee into main May 27, 2026
50 of 52 checks passed

mergify Bot deleted the devs/jd/worktree-rust-port/share-test-scaffolding-via-mergify-test-support--f9d688cd branch May 27, 2026 13:50

mergify Bot removed the queued label May 27, 2026

mergify Bot mentioned this pull request May 27, 2026

merge queue: embarking main (633b9ee) and #1441 together #1473

Closed

38 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(rust): share test scaffolding via mergify-test-support crate#1439

refactor(rust): share test scaffolding via mergify-test-support crate#1439
mergify[bot] merged 2 commits into
mainfrom
devs/jd/worktree-rust-port/share-test-scaffolding-via-mergify-test-support--f9d688cd

jd commented May 19, 2026 •

edited

Loading

Uh oh!

jd commented May 19, 2026 •

edited

Loading

Uh oh!

mergify Bot commented May 19, 2026 •

edited

Loading

Uh oh!

jd commented May 19, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

mergify Bot commented May 27, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

Conversation

jd commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jd commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mergify Bot commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Protections

🟢 ⛓️ Depends-On Requirements

🟢 🤖 Continuous Integration

🟢 👀 Review Requirements

🟢 Enforce conventional commit

🟢 🔎 Reviews

🟢 📕 PR description

Uh oh!

jd commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Revision history

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

mergify Bot commented May 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Queue Status

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

jd commented May 19, 2026 •

edited

Loading

jd commented May 19, 2026 •

edited

Loading

mergify Bot commented May 19, 2026 •

edited

Loading

jd commented May 19, 2026 •

edited

Loading

mergify Bot commented May 27, 2026 •

edited

Loading