Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Add end-to-end shell integration tests
Maximilian Roosddf356b83140
diff --git a/tests/integration_tests/e2e_shell.rs b/tests/integration_tests/e2e_shell.rsnew file mode 100644index 000000000..46fccd2b4--- /dev/null+++ b/tests/integration_tests/e2e_shell.rs@@ -0,0 +1,588 @@+use crate::common::TestRepo;+use insta_cmd::get_cargo_bin;+use std::process::Command;++/// Helper to check if a shell is available on the system+fn is_shell_available(shell: &str) -> bool {+ Command::new("which")+ .arg(shell)+ .output()+ .map(|o| o.status.success())+ .unwrap_or(false)+}++/// Execute a shell script in the given shell and return stdout+fn execute_shell_script(repo: &TestRepo, shell: &str, script: &str) -> String {+ let mut cmd = Command::new(shell);+ repo.clean_cli_env(&mut cmd);++ // Additional shell-specific isolation to prevent user config interference+ cmd.env_remove("BASH_ENV");+ cmd.env_remove("ENV"); // for sh/dash+ cmd.env_remove("ZDOTDIR"); // for zsh++ // Prevent loading user config files+ if shell == "fish" {+ cmd.arg("--no-config");+ }++ let output = cmd+ .arg("-c")+ .arg(script)+ .current_dir(repo.root_path())+ .output()+ .unwrap_or_else(|e| panic!("Failed to execute {} script: {}", shell, e));++ if !output.status.success() {+ panic!(+ "Shell script failed:\nstdout: {}\nstderr: {}",+ String::from_utf8_lossy(&output.stdout),+ String::from_utf8_lossy(&output.stderr)+ );+ }++ String::from_utf8(output.stdout).expect("Invalid UTF-8 in output")+}++/// Generate shell integration code for the given shell+fn generate_init_code(repo: &TestRepo, shell: &str) -> String {+ let mut cmd = Command::new(get_cargo_bin("wt"));+ repo.clean_cli_env(&mut cmd);++ let output = cmd+ .args(["init", shell])+ .current_dir(repo.root_path())+ .output()+ .expect("Failed to generate init code");++ if !output.status.success() {+ panic!(+ "Failed to generate init code:\nstderr: {}",+ String::from_utf8_lossy(&output.stderr)+ );+ }++ String::from_utf8(output.stdout).expect("Invalid UTF-8 in init code")+}++#[test]+fn test_bash_e2e_switch_changes_directory() {+ if !is_shell_available("bash") {+ eprintln!("Skipping test: bash not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let init_code = generate_init_code(&repo, "bash");++ // Create a script that:+ // 1. Sources the init code+ // 2. Runs wt-switch to create and switch to a new branch+ // 3. Prints the current directory+ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ wt-switch --create my-feature+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "bash", &script);++ // Verify that pwd shows we're in a worktree directory containing "my-feature"+ assert!(+ output.contains("my-feature"),+ "Expected pwd to show my-feature worktree, got: {}",+ output+ );+}++#[test]+fn test_bash_e2e_finish_returns_to_main() {+ if !is_shell_available("bash") {+ eprintln!("Skipping test: bash not available");+ return;+ }++ let mut repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.setup_remote("main");++ let init_code = generate_init_code(&repo, "bash");+ let repo_path = repo.root_path().to_string_lossy().to_string();++ // Create a script that:+ // 1. Sources the init code+ // 2. Switches to a feature branch+ // 3. Finishes the feature (returns to main)+ // 4. Prints the current directory+ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ wt-switch --create my-feature+ wt-finish+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "bash", &script);++ // Verify that pwd shows we're back in the main repo directory+ assert!(+ output.trim().ends_with(&repo_path),+ "Expected pwd to show main repo at {}, got: {}",+ repo_path,+ output+ );+}++#[test]+fn test_bash_e2e_switch_preserves_output() {+ if !is_shell_available("bash") {+ eprintln!("Skipping test: bash not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let init_code = generate_init_code(&repo, "bash");++ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ wt-switch --create test-branch 2>&1+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "bash", &script);++ // Verify that user-facing output is preserved (not just directives)+ assert!(+ output.contains("test-branch") || output.contains("Created") || output.contains("Switched"),+ "Expected informative output, got: {}",+ output+ );+ // Verify directives are NOT shown to user+ assert!(+ !output.contains("__WORKTRUNK_CD__"),+ "Directives should not be visible to user, got: {}",+ output+ );+}++#[test]+fn test_fish_e2e_switch_changes_directory() {+ if !is_shell_available("fish") {+ eprintln!("Skipping test: fish not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let init_code = generate_init_code(&repo, "fish");++ // Fish uses different syntax for sourcing code+ let script = format!(+ r#"+ set -x PATH {} $PATH+ {}+ wt-switch --create my-feature+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "fish", &script);++ // Verify that pwd shows we're in a worktree directory containing "my-feature"+ assert!(+ output.contains("my-feature"),+ "Expected pwd to show my-feature worktree, got: {}",+ output+ );+}++#[test]+fn test_fish_e2e_finish_returns_to_main() {+ if !is_shell_available("fish") {+ eprintln!("Skipping test: fish not available");+ return;+ }++ let mut repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.setup_remote("main");++ let init_code = generate_init_code(&repo, "fish");+ let repo_path = repo.root_path().to_string_lossy().to_string();++ let script = format!(+ r#"+ set -x PATH {} $PATH+ {}+ wt-switch --create my-feature+ wt-finish+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "fish", &script);++ // Verify that pwd shows we're back in the main repo directory+ assert!(+ output.trim().ends_with(&repo_path),+ "Expected pwd to show main repo at {}, got: {}",+ repo_path,+ output+ );+}++#[test]+fn test_zsh_e2e_switch_changes_directory() {+ if !is_shell_available("zsh") {+ eprintln!("Skipping test: zsh not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let init_code = generate_init_code(&repo, "zsh");++ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ wt-switch --create my-feature+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "zsh", &script);++ // Verify that pwd shows we're in a worktree directory containing "my-feature"+ assert!(+ output.contains("my-feature"),+ "Expected pwd to show my-feature worktree, got: {}",+ output+ );+}++#[test]+fn test_zsh_e2e_finish_returns_to_main() {+ if !is_shell_available("zsh") {+ eprintln!("Skipping test: zsh not available");+ return;+ }++ let mut repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.setup_remote("main");++ let init_code = generate_init_code(&repo, "zsh");+ let repo_path = repo.root_path().to_string_lossy().to_string();++ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ wt-switch --create my-feature+ wt-finish+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "zsh", &script);++ // Verify that pwd shows we're back in the main repo directory+ assert!(+ output.trim().ends_with(&repo_path),+ "Expected pwd to show main repo at {}, got: {}",+ repo_path,+ output+ );+}++#[test]+fn test_bash_e2e_custom_prefix() {+ if !is_shell_available("bash") {+ eprintln!("Skipping test: bash not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ // Generate init code with custom prefix+ let mut cmd = Command::new(get_cargo_bin("wt"));+ repo.clean_cli_env(&mut cmd);+ let output = cmd+ .args(["init", "bash", "--cmd", "custom"])+ .current_dir(repo.root_path())+ .output()+ .expect("Failed to generate init code");++ let init_code = String::from_utf8(output.stdout).expect("Invalid UTF-8 in init code");++ // Test that custom-switch works+ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ custom-switch --create my-feature+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "bash", &script);++ // Verify that pwd shows we're in a worktree directory+ assert!(+ output.contains("my-feature"),+ "Expected pwd to show my-feature worktree with custom prefix, got: {}",+ output+ );+}++#[test]+fn test_bash_e2e_error_handling() {+ if !is_shell_available("bash") {+ eprintln!("Skipping test: bash not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let init_code = generate_init_code(&repo, "bash");++ // Try to switch to a branch twice (should error on second attempt)+ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ wt-switch --create test-feature+ wt-switch --create test-feature 2>&1 || echo "ERROR_CAUGHT"+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "bash", &script);++ // Verify that error is caught and handled+ assert!(+ output.contains("ERROR_CAUGHT")+ || output.contains("already exists")+ || output.contains("error"),+ "Expected error output when switching to same branch twice, got: {}",+ output+ );+}++#[test]+fn test_bash_e2e_prompt_hook() {+ if !is_shell_available("bash") {+ eprintln!("Skipping test: bash not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ // Generate init code with prompt hook+ let mut cmd = Command::new(get_cargo_bin("wt"));+ repo.clean_cli_env(&mut cmd);+ let output = cmd+ .args(["init", "bash", "--hook", "prompt"])+ .current_dir(repo.root_path())+ .output()+ .expect("Failed to generate init code");++ let init_code = String::from_utf8(output.stdout).expect("Invalid UTF-8");++ // Verify prompt hook function exists and can be called+ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ type _wt_prompt_hook 2>&1+ _wt_prompt_hook 2>&1+ echo "HOOK_EXECUTED"+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "bash", &script);++ // Verify hook function exists+ assert!(+ output.contains("_wt_prompt_hook is a function") || output.contains("function"),+ "Expected prompt hook function to be defined, got: {}",+ output+ );++ // Verify hook executed successfully+ assert!(+ output.contains("HOOK_EXECUTED"),+ "Expected prompt hook to execute without error, got: {}",+ output+ );+}++#[test]+fn test_fish_e2e_prompt_hook() {+ if !is_shell_available("fish") {+ eprintln!("Skipping test: fish not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ // Generate init code with prompt hook+ let mut cmd = Command::new(get_cargo_bin("wt"));+ repo.clean_cli_env(&mut cmd);+ let output = cmd+ .args(["init", "fish", "--hook", "prompt"])+ .current_dir(repo.root_path())+ .output()+ .expect("Failed to generate init code");++ let init_code = String::from_utf8(output.stdout).expect("Invalid UTF-8");++ // Verify prompt hook function exists and can be called+ let script = format!(+ r#"+ set -x PATH {} $PATH+ {}+ type _wt_prompt_hook 2>&1+ _wt_prompt_hook 2>&1+ echo "HOOK_EXECUTED"+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "fish", &script);++ // Verify hook function exists+ assert!(+ output.contains("_wt_prompt_hook is a function") || output.contains("function"),+ "Expected prompt hook function to be defined, got: {}",+ output+ );++ // Verify hook executed successfully+ assert!(+ output.contains("HOOK_EXECUTED"),+ "Expected prompt hook to execute without error, got: {}",+ output+ );+}++#[test]+fn test_bash_e2e_switch_to_existing_worktree() {+ if !is_shell_available("bash") {+ eprintln!("Skipping test: bash not available");+ return;+ }++ let repo = TestRepo::new();+ repo.commit("Initial commit");++ let init_code = generate_init_code(&repo, "bash");++ // Create worktree, move away, then switch back to it (without --create)+ let script = format!(+ r#"+ export PATH="{}:$PATH"+ {}+ wt-switch --create existing-branch+ pwd+ cd /tmp+ wt-switch existing-branch+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "bash", &script);++ // Should show the existing-branch path twice (once after creation, once after switching back)+ let count = output.matches("existing-branch").count();+ assert!(+ count >= 2,+ "Expected to see existing-branch path at least twice, got: {}",+ output+ );+}++#[test]+fn test_bash_e2e_aliases() {+ if !is_shell_available("bash") {+ eprintln!("Skipping test: bash not available");+ return;+ }++ let mut repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.setup_remote("main");++ let init_code = generate_init_code(&repo, "bash");++ // Test that short aliases work+ let script = format!(+ r#"+ shopt -s expand_aliases+ export PATH="{}:$PATH"+ {}+ wt-sw --create test-alias+ pwd+ wt-fin+ pwd+ "#,+ get_cargo_bin("wt").parent().unwrap().to_string_lossy(),+ init_code+ );++ let output = execute_shell_script(&repo, "bash", &script);++ // Should have switched to test-alias+ assert!(+ output.contains("test-alias"),+ "Expected wt-sw alias to work, got: {}",+ output+ );++ // Should have returned to main (wt-fin should work)+ assert!(+ output.contains("main"),+ "Expected wt-fin alias to work, got: {}",+ output+ );+}diff --git a/tests/integration_tests/mod.rs b/tests/integration_tests/mod.rsindex 695d5be8f..09824466d 100644--- a/tests/integration_tests/mod.rs+++ b/tests/integration_tests/mod.rs@@ -1,5 +1,6 @@pub mod default_branch;pub mod directives;+pub mod e2e_shell;pub mod finish;pub mod init;pub mod list;