Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
test(help): route all help snapshots through one settings builder (#3009)
Maximilian Roos3f3c05bd4923
diff --git a/tests/integration_tests/help.rs b/tests/integration_tests/help.rsindex 02c05e48f..d5ac23ce4 100644--- a/tests/integration_tests/help.rs+++ b/tests/integration_tests/help.rs@@ -16,10 +16,22 @@ use insta::Settings;use insta_cmd::assert_cmd_snapshot;use rstest::rstest;-fn snapshot_help(test_name: &str, args: &[&str]) {+/// Insta settings shared by every help / version / usage snapshot: the+/// standard env redactions plus the snapshot path. Routing all of them through+/// one builder is deliberate — a test that constructs its own `Settings` and+/// forgets `add_standard_env_redactions` leaks host-specific env (e.g.+/// `LLVM_PROFILE_FILE`'s temp path) into the recorded `env:` block, which then+/// diffs whenever the snapshot is regenerated on another machine. Callers layer+/// extra filters (e.g. the version-string filter) on the returned value.+fn help_settings() -> Settings {let mut settings = Settings::clone_current();settings.set_snapshot_path("../snapshots");add_standard_env_redactions(&mut settings);+ settings+}++fn snapshot_help(test_name: &str, args: &[&str]) {+ let settings = help_settings();settings.bind(|| {let mut cmd = wt_command();cmd.args(args);@@ -99,8 +111,7 @@ fn test_help(#[case] test_name: &str, #[case] args_str: &str) {#[test]fn test_version() {- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");+ let mut settings = help_settings();// Filter out version number for stable snapshots// Formats:// - wt v0.4.0-25-gc9bcf6c0 (version with git commit info)@@ -186,9 +197,7 @@ fn test_version_goes_to_stdout() {#[test]fn test_help_md() {- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");- settings.bind(|| {+ help_settings().bind(|| {let mut cmd = wt_command();cmd.args(["--help-md"]);assert_cmd_snapshot!("help_md_root", cmd);@@ -197,9 +206,7 @@ fn test_help_md() {#[test]fn test_help_md_subcommand() {- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");- settings.bind(|| {+ help_settings().bind(|| {let mut cmd = wt_command();cmd.args(["merge", "--help-md"]);assert_cmd_snapshot!("help_md_merge", cmd);@@ -211,10 +218,7 @@ fn test_help_md_subcommand() {/// rather than wrap incorrectly.#[test]fn test_help_list_narrow_terminal() {- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");- add_standard_env_redactions(&mut settings);- settings.bind(|| {+ help_settings().bind(|| {let mut cmd = wt_command();cmd.env("COLUMNS", "80");cmd.args(["list", "--help"]);@@ -287,9 +291,7 @@ fn test_nested_subcommand_suggestion(#[case] subcommand: &str,#[case] expected_suggestion: &str,) {- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");- settings.bind(|| {+ help_settings().bind(|| {let mut cmd = wt_command();cmd.arg(subcommand);let output = cmd.output().expect("failed to run wt");diff --git a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap b/tests/snapshots/integration__integration_tests__help__help_md_merge.snapindex 8007d3025..7a1fa705c 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap@@ -11,14 +11,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"NO_COLOR: ""PSModulePath: ""SHELL: ""TERM: alacritty- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_BASH_INSTALLED: "0"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_CODEX_INSTALLED: "0"diff --git a/tests/snapshots/integration__integration_tests__help__help_md_root.snap b/tests/snapshots/integration__integration_tests__help__help_md_root.snapindex cf4ccd9e0..b8e8a1906 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_root.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_root.snap@@ -10,14 +10,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"NO_COLOR: ""PSModulePath: ""SHELL: ""TERM: alacritty- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_BASH_INSTALLED: "0"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_CODEX_INSTALLED: "0"diff --git a/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_merge.snap b/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_merge.snapindex 1bb90d17a..955e03cc0 100644--- a/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_merge.snap@@ -10,21 +10,27 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"NO_COLOR: ""PSModulePath: ""- RUST_LOG: warnSHELL: ""TERM: alacritty- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"---success: falseexit_code: 2diff --git a/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_start.snap b/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_start.snapindex abf2e4538..47ff86758 100644--- a/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_start.snap+++ b/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_start.snap@@ -10,15 +10,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"NO_COLOR: ""PSModulePath: ""- RUST_LOG: warnSHELL: ""TERM: alacritty- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_BASH_INSTALLED: "0"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_CODEX_INSTALLED: "0"diff --git a/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_commit.snap b/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_commit.snapindex e50aa79f5..274f5242d 100644--- a/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_commit.snap+++ b/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_commit.snap@@ -10,21 +10,27 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"NO_COLOR: ""PSModulePath: ""- RUST_LOG: warnSHELL: ""TERM: alacritty- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"---success: falseexit_code: 2diff --git a/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_squash.snap b/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_squash.snapindex c0587ba63..3930e9a05 100644--- a/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_squash.snap+++ b/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_squash.snap@@ -10,21 +10,27 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"NO_COLOR: ""PSModulePath: ""- RUST_LOG: warnSHELL: ""TERM: alacritty- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"---success: falseexit_code: 2diff --git a/tests/snapshots/integration__integration_tests__help__version.snap b/tests/snapshots/integration__integration_tests__help__version.snapindex 37574da6b..a715b0894 100644--- a/tests/snapshots/integration__integration_tests__help__version.snap+++ b/tests/snapshots/integration__integration_tests__help__version.snap@@ -10,21 +10,27 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"NO_COLOR: ""PSModulePath: ""- RUST_LOG: warnSHELL: ""TERM: alacritty- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"---success: trueexit_code: 0