Skip to content

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

test: add cross-platform PTY infrastructure for Windows shell tests (#670)

Maximilian Roosf584cf78338b
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index b4df2e8ab..86b5fc704 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -42,8 +42,8 @@ pub mod list_snapshots;
// Progressive output tests use PTY and are Unix-only for now
#[cfg(unix)]
pub mod progressive_output;
-// Shell integration tests are Unix-only for now (Windows support planned)
-#[cfg(all(unix, feature = "shell-integration-tests"))]
+// Shell integration tests - cross-platform with PTY support
+#[cfg(feature = "shell-integration-tests")]
pub mod shell;
// Cross-platform mock command helpers
@@ -351,19 +351,23 @@ pub fn merge_scenario_multi_commit(mut repo: TestRepo) -> (TestRepo, PathBuf) {
(repo, feature_wt)
}
-/// Returns a PTY system with a guard that restores the TTY foreground pgrp on drop.
+/// Returns a PTY system with platform-appropriate setup.
///
-/// Use this instead of `portable_pty::native_pty_system()` directly to ensure:
-/// 1. PTY tests work in background process groups (signals blocked)
-/// 2. SIGTTIN/SIGTTOU are blocked to prevent test processes from being stopped
+/// On Unix, this blocks SIGTTIN/SIGTTOU signals to prevent test processes from
+/// being stopped when PTY operations interact with terminal control.
+///
+/// On Windows, this returns the native ConPTY system directly.
+///
+/// Use this instead of `portable_pty::native_pty_system()` directly to ensure
+/// PTY tests work correctly across platforms.
///
/// NOTE: PTY tests are behind the `shell-integration-tests` feature because they can
/// trigger a nextest bug where its InputHandler cleanup receives SIGTTOU. This happens
/// when tests spawn interactive shells (zsh -ic, bash -ic) which take control of the
/// foreground process group. See https://github.com/nextest-rs/nextest/issues/2878
/// Workaround: run with NEXTEST_NO_INPUT_HANDLER=1. See CLAUDE.md for details.
-#[cfg(unix)]
pub fn native_pty_system() -> Box<dyn portable_pty::PtySystem> {
+ #[cfg(unix)]
ignore_tty_signals();
portable_pty::native_pty_system()
}
@@ -371,13 +375,11 @@ pub fn native_pty_system() -> Box<dyn portable_pty::PtySystem> {
/// Open a PTY pair with default size (48 rows x 200 cols).
///
/// Most PTY tests use this standard size. Returns the master/slave pair.
-#[cfg(unix)]
pub fn open_pty() -> portable_pty::PtyPair {
open_pty_with_size(48, 200)
}
/// Open a PTY pair with specified size.
-#[cfg(unix)]
pub fn open_pty_with_size(rows: u16, cols: u16) -> portable_pty::PtyPair {
native_pty_system()
.openpty(portable_pty::PtySize {
diff --git a/tests/common/shell.rs b/tests/common/shell.rs
index 4428a58fa..18eecf29b 100644
--- a/tests/common/shell.rs
+++ b/tests/common/shell.rs
@@ -15,7 +15,8 @@ pub fn get_shell_binary(shell: &str) -> &str {
///
/// Uses a PTY so that stdout appears as a terminal to the shell. This simulates
/// real terminal behavior for shell wrapper tests (combined stdout/stderr, ANSI codes).
-#[cfg(unix)]
+///
+/// Works on both Unix (bash/zsh/fish) and Windows (PowerShell, Git Bash).
pub fn execute_shell_script(repo: &TestRepo, shell: &str, script: &str) -> String {
use portable_pty::CommandBuilder;
use std::io::Read;
@@ -29,9 +30,22 @@ pub fn execute_shell_script(repo: &TestRepo, shell: &str, script: &str) -> Strin
// Set minimal required environment for shells to function
cmd.env("HOME", repo.home_path().to_string_lossy().to_string());
+ // Windows: Also set USERPROFILE for PowerShell and Git Bash
+ #[cfg(windows)]
+ cmd.env(
+ "USERPROFILE",
+ repo.home_path().to_string_lossy().to_string(),
+ );
+
+ // Use platform-appropriate PATH
+ #[cfg(unix)]
+ let default_path = "/usr/bin:/bin";
+ #[cfg(windows)]
+ let default_path = std::env::var("PATH").unwrap_or_default();
+
cmd.env(
"PATH",
- std::env::var("PATH").unwrap_or_else(|_| "/usr/bin:/bin".to_string()),
+ std::env::var("PATH").unwrap_or_else(|_| default_path.to_string()),
);
cmd.env("USER", "testuser");
cmd.env("SHELL", get_shell_binary(shell));
@@ -69,8 +83,18 @@ pub fn execute_shell_script(repo: &TestRepo, shell: &str, script: &str) -> Strin
// PTY combines stdout/stderr at the terminal device level, so we don't need
// explicit redirection. Redirecting would break the shell wrapper protocol:
// wt_exec() captures stdout for directives, and stderr must stay separate.
- cmd.arg("-c");
- cmd.arg(script);
+ //
+ // PowerShell uses -Command, all other shells use -c
+ match shell {
+ "powershell" | "pwsh" => {
+ cmd.arg("-Command");
+ cmd.arg(script);
+ }
+ _ => {
+ cmd.arg("-c");
+ cmd.arg(script);
+ }
+ }
cmd.cwd(repo.root_path());
// Pass through LLVM coverage env vars for subprocess coverage collection
@@ -144,7 +168,7 @@ pub fn path_export_syntax(shell: &str, bin_path: &str) -> String {
match shell {
"fish" => format!(r#"set -x PATH {} $PATH"#, bin_path),
"nushell" => format!(r#"$env.PATH = ($env.PATH | prepend "{}")"#, bin_path),
- "powershell" => format!(r#"$env:PATH = "{}:$env:PATH""#, bin_path),
+ "powershell" => format!(r#"$env:PATH = "{};$env:PATH""#, bin_path),
"elvish" => format!(r#"set E:PATH = {}:$E:PATH"#, bin_path),
"xonsh" => format!(r#"$PATH.insert(0, "{}")"#, bin_path),
_ => format!(r#"export PATH="{}:$PATH""#, bin_path),
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index 7efc2b006..74ad768f4 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -23,20 +23,26 @@
//! - Project root paths
// All shell integration tests and infrastructure gated by feature flag
-// Unix-only for now - Windows shell integration is planned
-#![cfg(all(unix, feature = "shell-integration-tests"))]
+// Supports both Unix (bash/zsh/fish) and Windows (PowerShell)
+#![cfg(feature = "shell-integration-tests")]
+// =============================================================================
+// Imports
+// =============================================================================
+
+// Shared imports (both platforms)
use crate::common::TestRepo;
-use crate::common::canonicalize;
-use crate::common::wait_for_file_content;
-use crate::common::{add_pty_filters, add_pty_tmpdir_filters};
-use insta::assert_snapshot;
use insta_cmd::get_cargo_bin;
-use std::fs;
-use std::path::PathBuf;
use std::process::Command;
-use std::sync::LazyLock;
-use worktrunk::shell;
+
+// Unix-only imports
+#[cfg(unix)]
+use {
+ crate::common::{add_pty_filters, add_pty_tmpdir_filters, canonicalize, wait_for_file_content},
+ insta::assert_snapshot,
+ std::{fs, path::PathBuf, sync::LazyLock},
+ worktrunk::shell,
+};
/// Output from executing a command through a shell wrapper
#[derive(Debug)]
@@ -49,6 +55,7 @@ struct ShellOutput {
/// Regex for detecting bash job control messages
/// Matches patterns like "[1] 12345" (job start) and "[1]+ Done" (job completion)
+#[cfg(unix)]
static JOB_CONTROL_REGEX: LazyLock<regex::Regex> =
LazyLock::new(|| regex::Regex::new(r"\[\d+\][+-]?\s+(Done|\d+)").unwrap());
@@ -72,6 +79,7 @@ impl ShellOutput {
/// Job control messages like "[1] 12345" (job start) and "[1]+ Done ..." (job completion)
/// should not appear in user-facing output. These are internal shell artifacts from
/// background process management that leak implementation details.
+ #[cfg(unix)]
fn assert_no_job_control_messages(&self) {
assert!(
!JOB_CONTROL_REGEX.is_match(&self.combined),
@@ -81,6 +89,7 @@ impl ShellOutput {
}
/// Assert command exited successfully (exit code 0)
+ #[cfg(unix)]
fn assert_success(&self) {
assert_eq!(
self.exit_code, 0,
@@ -96,6 +105,7 @@ impl ShellOutput {
/// - PTY-specific artifacts (CRLF, ^D control sequences, ANSI resets)
/// - Temporary directory paths
/// - Project root paths (for fixture references)
+#[cfg(unix)]
fn shell_wrapper_settings() -> insta::Settings {
let mut settings = insta::Settings::clone_current();
settings.set_snapshot_path("../snapshots");
@@ -150,6 +160,7 @@ fn generate_wrapper(repo: &TestRepo, shell: &str) -> String {
///
/// Note: Fish completions are custom (use $WORKTRUNK_BIN to bypass shell wrapper).
/// Bash and Zsh use inline lazy loading in the init script.
+#[cfg(unix)]
fn generate_completions(_repo: &TestRepo, shell: &str) -> String {
match shell {
"fish" => {
@@ -180,6 +191,12 @@ fn shell_quote(s: &str) -> String {
format!("'{}'", s.replace('\'', "'\\''"))
}
+/// Quote a path for PowerShell (escape backticks and single quotes)
+fn powershell_quote(s: &str) -> String {
+ // PowerShell string escaping: use single quotes and escape embedded single quotes by doubling
+ format!("'{}'", s.replace('\'', "''"))
+}
+
/// Build a shell script that sources the wrapper and runs a command
fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&str]) -> String {
let wt_bin = get_cargo_bin("wt");
@@ -217,6 +234,17 @@ fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&s
));
script.push_str("export CLICOLOR_FORCE=1\n");
}
+ "powershell" | "pwsh" => {
+ // PowerShell uses $env: for environment variables
+ let wt_bin_ps = powershell_quote(&wt_bin.display().to_string());
+ let config_path_ps = powershell_quote(&repo.test_config_path().display().to_string());
+ script.push_str(&format!("$env:WORKTRUNK_BIN = {}\n", wt_bin_ps));
+ script.push_str(&format!(
+ "$env:WORKTRUNK_CONFIG_PATH = {}\n",
+ config_path_ps
+ ));
+ script.push_str("$env:CLICOLOR_FORCE = '1'\n");
+ }
_ => {
// bash
script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));
@@ -228,16 +256,37 @@ fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&s
}
}
- // Source the wrapper
- script.push_str(&wrapper_script);
- script.push('\n');
+ // Source the wrapper (PowerShell uses . for sourcing inline code via Invoke-Expression)
+ match shell {
+ "powershell" | "pwsh" => {
+ // The wrapper_script is PowerShell code; we include it directly
+ script.push_str(&wrapper_script);
+ script.push('\n');
+ }
+ _ => {
+ script.push_str(&wrapper_script);
+ script.push('\n');
+ }
+ }
// Build the command
script.push_str("wt ");
script.push_str(subcommand);
for arg in args {
script.push(' ');
- script.push_str(&quote_arg(arg));
+ match shell {
+ "powershell" | "pwsh" => {
+ // PowerShell argument quoting
+ if arg.contains(' ') || arg.contains(';') || arg.contains('\'') {
+ script.push_str(&powershell_quote(arg));
+ } else {
+ script.push_str(arg);
+ }
+ }
+ _ => {
+ script.push_str(&quote_arg(arg));
+ }
+ }
}
script.push('\n');
@@ -259,6 +308,11 @@ fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&s
// allowing tests to catch these leaks.
format!("exec 2>&1\n{}", script)
}
+ "powershell" | "pwsh" => {
+ // PowerShell: use & to run script block with merged output
+ // Wrap the script in a script block and redirect stderr (2) to stdout (1)
+ format!("& {{\n{}\n}} 2>&1", script)
+ }
_ => {
// zsh uses parentheses for subshell grouping
format!("( {} ) 2>&1", script)
@@ -295,6 +349,14 @@ fn normalize_newlines(s: &str) -> String {
/// );
/// // The output will show: "Allow? [y/N] y"
/// ```
+/// Get the actual shell binary name (handles powershell -> pwsh mapping)
+fn get_shell_binary(shell: &str) -> &str {
+ match shell {
+ "powershell" => "pwsh",
+ _ => shell,
+ }
+}
+
#[cfg(test)]
fn exec_in_pty_interactive(
shell: &str,
@@ -308,43 +370,66 @@ fn exec_in_pty_interactive(
let pair = crate::common::open_pty();
- let mut cmd = CommandBuilder::new(shell);
+ let shell_binary = get_shell_binary(shell);
+ let mut cmd = CommandBuilder::new(shell_binary);
// Clear inherited environment for test isolation
cmd.env_clear();
// Set minimal required environment for shells to function
- cmd.env(
- "HOME",
- home::home_dir().unwrap().to_string_lossy().to_string(),
- );
+ let home_dir = home::home_dir().unwrap().to_string_lossy().to_string();
+ cmd.env("HOME", &home_dir);
+ // Windows: Also set USERPROFILE for PowerShell
+ #[cfg(windows)]
+ cmd.env("USERPROFILE", &home_dir);
+
+ // Use platform-appropriate default PATH
+ #[cfg(unix)]
+ let default_path = "/usr/bin:/bin";
+ #[cfg(windows)]
+ let default_path = std::env::var("PATH").unwrap_or_default();
+
cmd.env(
"PATH",
- std::env::var("PATH").unwrap_or_else(|_| "/usr/bin:/bin".to_string()),
+ std::env::var("PATH").unwrap_or_else(|_| default_path.to_string()),
);
cmd.env("USER", "testuser");
- cmd.env("SHELL", shell);
+ cmd.env("SHELL", shell_binary);
// Run in interactive mode to simulate real user environment.
// This ensures tests catch job control message leaks like "[1] 12345" and "[1]+ Done".
// Interactive shells have job control enabled by default.
- if shell == "zsh" {
- // Isolate from user rc files
- cmd.env("ZDOTDIR", "/dev/null");
- cmd.arg("-i");
- cmd.arg("--no-rcs");
- cmd.arg("-o");
- cmd.arg("NO_GLOBAL_RCS");
- cmd.arg("-o");
- cmd.arg("NO_RCS");
- }
-
- if shell == "bash" {
- cmd.arg("-i");
+ match shell {
+ "zsh" => {
+ // Isolate from user rc files
+ cmd.env("ZDOTDIR", "/dev/null");
+ cmd.arg("-i");
+ cmd.arg("--no-rcs");
+ cmd.arg("-o");
+ cmd.arg("NO_GLOBAL_RCS");
+ cmd.arg("-o");
+ cmd.arg("NO_RCS");
+ cmd.arg("-c");
+ cmd.arg(script);
+ }
+ "bash" => {
+ cmd.arg("-i");
+ cmd.arg("-c");
+ cmd.arg(script);
+ }
+ "powershell" | "pwsh" => {
+ // PowerShell uses -NoProfile to skip user profile
+ cmd.arg("-NoProfile");
+ cmd.arg("-Command");
+ cmd.arg(script);
+ }
+ _ => {
+ // fish and other shells
+ cmd.arg("-c");
+ cmd.arg(script);
+ }
}
- cmd.arg("-c");
- cmd.arg(script);
cmd.cwd(working_dir);
// Add test-specific environment variables (convert &str tuples to String tuples)
@@ -388,7 +473,7 @@ fn exec_in_pty_interactive(
///
/// The setup_script is written to a temp file and sourced. Then final_cmd is run
/// directly at the prompt (where job notifications appear).
-#[cfg(test)]
+#[cfg(all(test, unix))]
fn exec_bash_truly_interactive(
setup_script: &str,
final_cmd: &str,
@@ -618,7 +703,18 @@ fn build_test_env_vars(config_path: &str) -> Vec<(&str, &str)> {
env_vars
}
-mod tests {
+// =============================================================================
+// Unix Shell Tests (bash/zsh/fish)
+// =============================================================================
+//
+// All Unix shell integration tests are in this module, gated by #[cfg(unix)].
+// This includes tests for bash, zsh, and fish shells.
+//
+// Shared infrastructure (exec_through_wrapper, ShellOutput, etc.) is defined
+// above and works on both platforms.
+
+#[cfg(unix)]
+mod unix_tests {
use super::*;
use crate::common::repo;
use rstest::rstest;
@@ -1324,7 +1420,6 @@ approved-commands = ["echo 'background task'"]
// Fish uses `string collect` to join command substitution output into
// a single string before eval (fish splits on newlines by default).
- #[cfg(unix)]
#[rstest]
fn test_fish_wrapper_preserves_progress_messages(repo: TestRepo) {
// Configure a post-start background command that will trigger progress output
@@ -1358,7 +1453,6 @@ approved-commands = ["echo 'fish background task'"]
shell_wrapper_settings().bind(|| assert_snapshot!(&output.combined));
}
- #[cfg(unix)]
#[rstest]
fn test_fish_multiline_command_execution(repo: TestRepo) {
// Test that Fish wrapper handles multi-line commands correctly
@@ -1394,7 +1488,6 @@ approved-commands = ["echo 'fish background task'"]
shell_wrapper_settings().bind(|| assert_snapshot!(&output.combined));
}
- #[cfg(unix)]
#[rstest]
fn test_fish_wrapper_handles_empty_chunks(repo: TestRepo) {
// Test edge case: command that produces minimal output
@@ -3212,3 +3305,85 @@ echo "SCRIPT_COMPLETED"
);
}
}
+
+// =============================================================================
+// Windows PowerShell Tests
+// =============================================================================
+//
+// All Windows-specific tests are in this module, gated by #[cfg(windows)].
+// This keeps platform-specific tests clearly separated.
+
+#[cfg(windows)]
+mod windows_tests {
+ use super::*;
+ use crate::common::repo;
+ use rstest::rstest;
+
+ /// Test that PowerShell shell integration works for switch --create
+ #[rstest]
+ #[ignore = "PowerShell PTY tests timeout in CI - needs investigation"]
+ fn test_powershell_switch_create(repo: TestRepo) {
+ let output = exec_through_wrapper("powershell", &repo, "switch", &["--create", "feature"]);
+
+ assert_eq!(output.exit_code, 0, "PowerShell: Command should succeed");
+ output.assert_no_directive_leaks();
+
+ assert!(
+ output.combined.contains("Created branch") && output.combined.contains("and worktree"),
+ "PowerShell: Should show success message.\nOutput:\n{}",
+ output.combined
+ );
+ }
+
+ /// Test that PowerShell shell integration handles command failures correctly
+ #[rstest]
+ #[ignore = "PowerShell PTY tests timeout in CI - needs investigation"]
+ fn test_powershell_command_failure(mut repo: TestRepo) {
+ // Create a worktree that already exists
+ repo.add_worktree("existing");
+
+ // Try to create it again - should fail
+ let output = exec_through_wrapper("powershell", &repo, "switch", &["--create", "existing"]);
+
+ assert_eq!(
+ output.exit_code, 1,
+ "PowerShell: Command should fail with exit code 1"
+ );
+ output.assert_no_directive_leaks();
+ assert!(
+ output.combined.contains("already exists"),
+ "PowerShell: Error message should mention 'already exists'.\nOutput:\n{}",
+ output.combined
+ );
+ }
+
+ /// Test that PowerShell shell integration works for remove
+ #[rstest]
+ #[ignore = "PowerShell PTY tests timeout in CI - needs investigation"]
+ fn test_powershell_remove(mut repo: TestRepo) {
+ // Create a worktree to remove
+ repo.add_worktree("to-remove");
+
+ let output = exec_through_wrapper("powershell", &repo, "remove", &["to-remove"]);
+
+ assert_eq!(output.exit_code, 0, "PowerShell: Command should succeed");
+ output.assert_no_directive_leaks();
+ }
+
+ /// Test that PowerShell shell integration works for wt list
+ #[rstest]
+ #[ignore = "PowerShell PTY tests timeout in CI - needs investigation"]
+ fn test_powershell_list(repo: TestRepo) {
+ let output = exec_through_wrapper("powershell", &repo, "list", &[]);
+
+ assert_eq!(output.exit_code, 0, "PowerShell: Command should succeed");
+ output.assert_no_directive_leaks();
+
+ // Should show the main worktree
+ assert!(
+ output.combined.contains("main"),
+ "PowerShell: Should show main branch.\nOutput:\n{}",
+ output.combined
+ );
+ }
+}
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_completion_subcommands.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__bash_completion_subcommands.snap
similarity index 100%
rename from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_completion_subcommands.snap
rename to tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__bash_completion_subcommands.snap
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_completion_subcommands.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_completion_subcommands.snap
similarity index 100%
rename from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_completion_subcommands.snap
rename to tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_completion_subcommands.snap
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__zsh_completion_subcommands.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__zsh_completion_subcommands.snap
similarity index 100%
rename from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__zsh_completion_subcommands.snap
rename to tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__zsh_completion_subcommands.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__bash_shell_integration_hint_suppressed.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__bash_shell_integration_hint_suppressed.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__command_failure.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__command_failure.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_wrapper_handles_empty_chunks.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_wrapper_handles_empty_chunks.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_wrapper_preserves_progress_messages.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_wrapper_preserves_progress_messages.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_bash.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_bash.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_zsh.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_zsh.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_bash.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_bash.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_zsh.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_zsh.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_approval_prompt.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_approval_prompt.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_hooks_post_create.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_hooks_post_create.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_hooks_pre_merge.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_hooks_pre_merge.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_remove.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_remove.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_simple_switch.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_simple_switch.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_switch_back.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_switch_back.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__remove.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__remove.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__source_flag_error_passthrough.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__source_flag_error_passthrough.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__source_flag_error_passthrough.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__source_flag_error_passthrough.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__step_for_each.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__step_for_each.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__step_for_each.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__step_for_each.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_create.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_create.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_through_wrapper.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_through_wrapper.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_hooks_zsh.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_hooks_zsh.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_post_start_command_no_directive_leak.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_post_start_command_no_directive_leak.snap
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__wrapper_preserves_progress_messages.snap
similarity index 100%
rename from tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
rename to tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__wrapper_preserves_progress_messages.snap