Skip to content

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

Fix snapshot filters to match shell-escaped paths on Windows

Maximilian Roos366bb03c461a
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index bafe981de..4f3359b2f 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -1779,6 +1779,12 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
settings.add_filter(&regex::escape(&root_str.replace('\\', "/")), "[REPO]");
// Also add POSIX-style path for Git Bash (C:\foo\bar -> /c/foo/bar)
settings.add_filter(&regex::escape(&to_posix_path(root_str)), "[REPO]");
+ // Match single-quoted versions for shell_escape output (Windows paths need quoting)
+ settings.add_filter(&format!("'{}'", regex::escape(root_str)), "'[REPO]'");
+ settings.add_filter(
+ &format!("'{}'", regex::escape(&root_str.replace('\\', "/"))),
+ "'[REPO]'",
+ );
// In tests, HOME is set to the temp directory containing the repo. Commands being tested
// see HOME=temp_dir, so format_path_for_display() outputs ~/repo instead of the full path.
@@ -1787,6 +1793,9 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
// Filters are applied in order, so ~/repo.feature is replaced before ~/repo would match it.
settings.add_filter(r"~/repo(\.[a-zA-Z0-9_-]+)", "[REPO]$1");
settings.add_filter(r"~/repo", "[REPO]");
+ // Match single-quoted versions for shell_escape output (paths with ~ need quoting)
+ settings.add_filter(r"'~/repo(\.[a-zA-Z0-9_-]+)'", "'[REPO]$1'");
+ settings.add_filter(r"'~/repo'", "'[REPO]'");
// Also handle the case where the real home contains the temp directory (Windows/macOS)
// Note: canonicalize home_dir too, since on Windows home::home_dir() may return a short path
@@ -1797,19 +1806,39 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
let tilde_path = format!("~/{}", relative.display()).replace('\\', "/");
// Match exact repo path
settings.add_filter(&regex::escape(&tilde_path), "[REPO]");
+ // Match single-quoted versions
+ settings.add_filter(&format!("'{}'", regex::escape(&tilde_path)), "'[REPO]'");
// Match worktree paths
let tilde_worktree_pattern = format!(r"{}(\.[a-zA-Z0-9_-]+)", regex::escape(&tilde_path));
settings.add_filter(&tilde_worktree_pattern, "[REPO]$1");
+ // Match single-quoted worktree paths
+ let quoted_tilde_worktree_pattern =
+ format!(r"'{}(\.[a-zA-Z0-9_-]+)'", regex::escape(&tilde_path));
+ settings.add_filter(&quoted_tilde_worktree_pattern, "'[REPO]$1'");
}
for (name, path) in &repo.worktrees {
let canonical = canonicalize(path).unwrap_or_else(|_| path.clone());
let path_str = canonical.to_str().unwrap();
let replacement = format!("[WORKTREE_{}]", name.to_uppercase().replace('-', "_"));
+ let quoted_replacement = format!("'[WORKTREE_{}]'", name.to_uppercase().replace('-', "_"));
settings.add_filter(&regex::escape(path_str), &replacement);
settings.add_filter(&regex::escape(&path_str.replace('\\', "/")), &replacement);
// Also add POSIX-style path for Git Bash (C:\foo\bar -> /c/foo/bar)
settings.add_filter(&regex::escape(&to_posix_path(path_str)), &replacement);
+ // Match single-quoted versions for shell_escape output
+ settings.add_filter(
+ &format!("'{}'", regex::escape(path_str)),
+ &quoted_replacement,
+ );
+ settings.add_filter(
+ &format!("'{}'", regex::escape(&path_str.replace('\\', "/"))),
+ &quoted_replacement,
+ );
+ settings.add_filter(
+ &format!("'{}'", regex::escape(&to_posix_path(path_str))),
+ &quoted_replacement,
+ );
// Also add tilde-prefixed worktree path filter for Windows
if let Some(home) = home::home_dir().and_then(|h| canonicalize(&h).ok())
@@ -1817,6 +1846,11 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
{
let tilde_path = format!("~/{}", relative.display()).replace('\\', "/");
settings.add_filter(&regex::escape(&tilde_path), &replacement);
+ // Match single-quoted versions
+ settings.add_filter(
+ &format!("'{}'", regex::escape(&tilde_path)),
+ &quoted_replacement,
+ );
}
}
@@ -1828,12 +1862,19 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
// paths used in commands. MUST come after backslash normalization so paths have forward slashes.
// Pattern: ~/AppData/Local/Temp/.tmpXXXXXX/repo (where XXXXXX varies)
settings.add_filter(r"~/AppData/Local/Temp/\.tmp[^/]+/repo", "[REPO]");
+ // Match single-quoted versions (shell_escape quotes paths with ~)
+ settings.add_filter(r"'~/AppData/Local/Temp/\.tmp[^/]+/repo'", "'[REPO]'");
// Windows fallback for POSIX-style paths from Git Bash (used in hook template expansion).
// Pattern: /c/Users/.../Temp/.tmpXXXXXX/repo and worktrees like /c/.../repo.feature-test
settings.add_filter(
r"/[a-z]/Users/[^/]+/AppData/Local/Temp/\.tmp[^/]+/repo(\.[a-zA-Z0-9_/-]+)?",
"[REPO]$1",
);
+ // Match single-quoted versions
+ settings.add_filter(
+ r"'/[a-z]/Users/[^/]+/AppData/Local/Temp/\.tmp[^/]+/repo(\.[a-zA-Z0-9_/-]+)?'",
+ "'[REPO]$1'",
+ );
// Normalize WORKTRUNK_CONFIG_PATH temp paths in stdout/stderr output
// (metadata is handled via redactions below)