Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

test(config): cover which::which CLI detection fallback (#2823)

Maximilian Roos2610833425fe
diff --git a/src/testing/mod.rs b/src/testing/mod.rs
index 30d41178f..100889370 100644
--- a/src/testing/mod.rs
+++ b/src/testing/mod.rs
@@ -788,6 +788,9 @@ pub struct TestRepo {
opencode_installed: bool,
/// Whether Gemini CLI should be treated as installed
gemini_installed: bool,
+ /// Whether to drop the `WORKTRUNK_TEST_*_INSTALLED` overrides so
+ /// `is_*_available()` exercises its real `which::which` PATH lookup
+ detect_clis_via_path: bool,
}
impl TestRepo {
@@ -884,6 +887,7 @@ impl TestRepo {
codex_installed: false,
opencode_installed: false,
gemini_installed: false,
+ detect_clis_via_path: false,
};
// Mock gh/glab as authenticated to prevent CI hints in test output
@@ -936,6 +940,7 @@ impl TestRepo {
codex_installed: false,
opencode_installed: false,
gemini_installed: false,
+ detect_clis_via_path: false,
}
}
@@ -984,6 +989,7 @@ impl TestRepo {
codex_installed: false,
opencode_installed: false,
gemini_installed: false,
+ detect_clis_via_path: false,
}
}
@@ -1814,6 +1820,28 @@ impl TestRepo {
self.gemini_installed = true;
}
+ /// Make `claude`, `codex`, `opencode`, and `gemini` resolvable on `PATH`.
+ ///
+ /// The `setup_mock_*_installed` helpers force detection through the
+ /// `WORKTRUNK_TEST_*_INSTALLED` env overrides, so the `which::which`
+ /// lookup inside each `is_*_available()` never runs under test. This
+ /// helper instead drops those overrides and prepends real mock
+ /// executables, exercising the production PATH-detection path for all
+ /// four AI CLIs at once. Call `setup_mock_ci_tools_unauthenticated()`
+ /// first to create the mock bin directory.
+ pub fn setup_mock_clis_on_path(&mut self) {
+ let mock_bin = self
+ .mock_bin_path
+ .as_ref()
+ .expect("call setup_mock_ci_tools_unauthenticated() first");
+ // `wt config show` only `which`-detects these CLIs (never runs
+ // them), so the mocks need no command behavior.
+ for cli in ["claude", "codex", "opencode", "gemini"] {
+ MockConfig::new(cli).write(mock_bin);
+ }
+ self.detect_clis_via_path = true;
+ }
+
/// Setup the worktrunk extension as installed in Gemini CLI
///
/// `gemini extensions install` clones the extension into
@@ -2330,24 +2358,33 @@ impl TestRepo {
cmd.env(&path_var_name, new_path);
}
- // Override Claude installed status if setup_mock_claude_installed() was called
- if self.claude_installed {
- cmd.env("WORKTRUNK_TEST_CLAUDE_INSTALLED", "1");
- }
-
- // Override Codex installed status if setup_mock_codex_installed() was called
- if self.codex_installed {
- cmd.env("WORKTRUNK_TEST_CODEX_INSTALLED", "1");
- }
-
- // Override OpenCode installed status if setup_mock_opencode_installed() was called
- if self.opencode_installed {
- cmd.env("WORKTRUNK_TEST_OPENCODE_INSTALLED", "1");
- }
-
- // Override Gemini installed status if setup_mock_gemini_installed() was called
- if self.gemini_installed {
- cmd.env("WORKTRUNK_TEST_GEMINI_INSTALLED", "1");
+ // AI CLI detection. `setup_mock_clis_on_path()` drops the
+ // `WORKTRUNK_TEST_*_INSTALLED` overrides so `is_*_available()`
+ // exercises its real `which::which` PATH lookup against the mock
+ // executables prepended above. Otherwise each override forces
+ // detection on for the CLIs whose `setup_mock_*_installed()` ran.
+ if self.detect_clis_via_path {
+ for var in [
+ "WORKTRUNK_TEST_CLAUDE_INSTALLED",
+ "WORKTRUNK_TEST_CODEX_INSTALLED",
+ "WORKTRUNK_TEST_OPENCODE_INSTALLED",
+ "WORKTRUNK_TEST_GEMINI_INSTALLED",
+ ] {
+ cmd.env_remove(var);
+ }
+ } else {
+ if self.claude_installed {
+ cmd.env("WORKTRUNK_TEST_CLAUDE_INSTALLED", "1");
+ }
+ if self.codex_installed {
+ cmd.env("WORKTRUNK_TEST_CODEX_INSTALLED", "1");
+ }
+ if self.opencode_installed {
+ cmd.env("WORKTRUNK_TEST_OPENCODE_INSTALLED", "1");
+ }
+ if self.gemini_installed {
+ cmd.env("WORKTRUNK_TEST_GEMINI_INSTALLED", "1");
+ }
}
}
diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rs
index 25ccf6a8c..7def98d85 100644
--- a/tests/integration_tests/config_show.rs
+++ b/tests/integration_tests/config_show.rs
@@ -2404,6 +2404,38 @@ fn test_config_show_gemini_extension_installed(mut repo: TestRepo, temp_home: Te
});
}
+/// Each `is_*_available()` short-circuits on the `WORKTRUNK_TEST_*_INSTALLED`
+/// override the harness sets, so the production `which::which` PATH lookup is
+/// otherwise never exercised. `setup_mock_clis_on_path()` drops the overrides
+/// and prepends real mock executables, so this single run covers the
+/// PATH-detection path for all four AI CLIs at once.
+#[rstest]
+fn test_config_show_clis_detected_via_path(mut repo: TestRepo, temp_home: TempDir) {
+ repo.setup_mock_ci_tools_unauthenticated();
+ repo.setup_mock_clis_on_path();
+
+ let global_config_dir = temp_home.path().join(".config").join("worktrunk");
+ fs::create_dir_all(&global_config_dir).unwrap();
+ fs::write(
+ global_config_dir.join("config.toml"),
+ r#"worktree-path = "../{{ repo }}.{{ branch }}"
+"#,
+ )
+ .unwrap();
+
+ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);
+ settings.bind(|| {
+ let mut cmd = wt_command();
+ repo.configure_wt_cmd(&mut cmd);
+ repo.configure_mock_commands(&mut cmd);
+ cmd.arg("config").arg("show").current_dir(repo.root_path());
+ set_temp_home_env(&mut cmd, temp_home.path());
+ set_xdg_config_path(&mut cmd, temp_home.path());
+
+ assert_cmd_snapshot!(cmd);
+ });
+}
+
// =============================================================================
// OpenCode plugin install/uninstall
// =============================================================================
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap
new file mode 100644
index 000000000..a6a2215db
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap
@@ -0,0 +1,88 @@
+---
+source: tests/integration_tests/config_show.rs
+info:
+ program: wt
+ args:
+ - config
+ - show
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "500"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
+ GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
+ GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ 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: ""
+ WORKTRUNK_TEST_CODEX_INSTALLED: ""
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: ""
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_OPENCODE_INSTALLED: ""
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+USER CONFIG @ ~/.config/worktrunk/config.toml
+  worktree-path = "../{{ repo }}.{{ branch }}"
+↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+
+PROJECT CONFIG @ _REPO_/.config/wt.toml
+↳ Not found
+
+SHELL INTEGRATION
+▲ Shell integration not configured
+↳ To configure, run wt config shell install
+  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
+
+CLAUDE CODE
+↳ Plugin not installed. To install, run wt config plugins claude install
+↳ Statusline not configured. To configure, run wt config plugins claude install-statusline
+
+CODEX
+✓ Codex CLI available
+↳ If Worktrunk is not installed in /plugins yet, run wt config plugins codex install
+
+OPENCODE
+↳ Plugin not installed. To install, run wt config plugins opencode install
+
+GEMINI CLI
+↳ Extension not installed. To install, run gemini extensions install https://github.com/max-sixty/worktrunk
+
+OTHER
+○ wt: [VERSION]
+○ git: [VERSION]
+○ Hyperlinks: inactive
+
+----- stderr -----