Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat(tests): Add config write helpers to TestRepo
Maximilian Roosa78eeec7b53b
diff --git a/tests/common/mod.rs b/tests/common/mod.rsindex 5c3c0bce7..76376a975 100644--- a/tests/common/mod.rs+++ b/tests/common/mod.rs@@ -197,6 +197,18 @@ impl TestRepo {&self.test_config_path}+ /// Write project-specific config (`.config/wt.toml`) under the repo root.+ pub fn write_project_config(&self, contents: &str) {+ let config_dir = self.root_path().join(".config");+ std::fs::create_dir_all(&config_dir).expect("Failed to create .config dir");+ std::fs::write(config_dir.join("wt.toml"), contents).expect("Failed to write wt.toml");+ }++ /// Overwrite the isolated WORKTRUNK_CONFIG_PATH used during tests.+ pub fn write_test_config(&self, contents: &str) {+ std::fs::write(&self.test_config_path, contents).expect("Failed to write test config");+ }+/// Get the path to a named worktreepub fn worktree_path(&self, name: &str) -> &Path {self.worktreesdiff --git a/tests/integration_tests/approval_ui.rs b/tests/integration_tests/approval_ui.rsindex 2bb839ebe..2f2cdb7b6 100644--- a/tests/integration_tests/approval_ui.rs+++ b/tests/integration_tests/approval_ui.rs@@ -47,13 +47,7 @@ fn test_approval_single_command() {let repo = TestRepo::new();repo.commit("Initial commit");- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-create-command = "echo 'Worktree path: {worktree}'""#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-create-command = "echo 'Worktree path: {worktree}'""#);repo.commit("Add config");@@ -70,18 +64,14 @@ fn test_approval_multiple_commands() {let repo = TestRepo::new();repo.commit("Initial commit");- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-create-command = ["echo 'Branch: {branch}'","echo 'Worktree: {worktree}'","echo 'Repo: {main-worktree}'","cd {worktree} && pwd"]"#,- )- .expect("Failed to write config");+ );repo.commit("Add config");@@ -98,32 +88,24 @@ fn test_approval_mixed_approved_unapproved() {let repo = TestRepo::new();repo.commit("Initial commit");- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-create-command = ["echo 'First command'","echo 'Second command'","echo 'Third command'"]"#,- )- .expect("Failed to write config");+ );repo.commit("Add config");// Pre-approve the second commandlet project_id = repo.root_path().file_name().unwrap().to_str().unwrap();- fs::write(- repo.test_config_path(),- format!(- r#"[projects."{}"]+ repo.write_test_config(&format!(+ r#"[projects."{}"]approved-commands = ["echo 'Second command'"]"#,- project_id- ),- )- .expect("Failed to write test config");+ project_id+ ));snapshot_approval("approval_mixed_approved_unapproved",@@ -138,13 +120,7 @@ fn test_force_flag_does_not_save_approvals() {let repo = TestRepo::new();repo.commit("Initial commit");- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-create-command = "echo 'test command' > output.txt""#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-create-command = "echo 'test command' > output.txt""#);repo.commit("Add config");@@ -183,28 +159,18 @@ fn test_already_approved_commands_skip_prompt() {let repo = TestRepo::new();repo.commit("Initial commit");- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-create-command = "echo 'approved' > output.txt""#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-create-command = "echo 'approved' > output.txt""#);repo.commit("Add config");// Pre-approve the commandlet project_id = repo.root_path().file_name().unwrap().to_str().unwrap();- fs::write(- repo.test_config_path(),- format!(- r#"[projects."{}"]+ repo.write_test_config(&format!(+ r#"[projects."{}"]approved-commands = ["echo 'approved' > output.txt"]"#,- project_id- ),- )- .expect("Failed to write test config");+ project_id+ ));// Should execute without promptinglet settings = setup_snapshot_settings(&repo);@@ -219,17 +185,13 @@ fn test_decline_approval_skips_only_unapproved() {let repo = TestRepo::new();repo.commit("Initial commit");- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-create-command = ["echo 'First command'","echo 'Second command'","echo 'Third command'"]"#,- )- .expect("Failed to write config");+ );repo.commit("Add config");@@ -259,17 +221,13 @@ fn test_approval_named_commands() {let repo = TestRepo::new();repo.commit("Initial commit");- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"[post-create-command]install = "echo 'Installing dependencies...'"build = "echo 'Building project...'"test = "echo 'Running tests...'""#,- )- .expect("Failed to write config");+ );repo.commit("Add config");@@ -294,13 +252,7 @@ fn test_permission_error_user_output() {repo.commit("Initial commit");// Set up project config with post-create command- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-create-command = "echo 'test command'""#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-create-command = "echo 'test command'""#);repo.commit("Add config");diff --git a/tests/integration_tests/post_start_commands.rs b/tests/integration_tests/post_start_commands.rsindex 3ab8a14d6..58d59d422 100644--- a/tests/integration_tests/post_start_commands.rs+++ b/tests/integration_tests/post_start_commands.rs@@ -47,26 +47,18 @@ fn test_post_create_single_command() {repo.commit("Initial commit");// Create project config with a single command (string format)- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-create-command = "echo 'Setup complete'""#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-create-command = "echo 'Setup complete'""#);repo.commit("Add config");// Pre-approve the command by writing to the isolated test config- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]approved-commands = ["echo 'Setup complete'"]"#,- )- .expect("Failed to write test config");+ );// Command should execute without promptingsnapshot_switch(@@ -82,19 +74,12 @@ fn test_post_create_multiple_commands_array() {repo.commit("Initial commit");// Create project config with multiple commands (array format)- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-create-command = ["echo 'First'", "echo 'Second'"]"#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-create-command = ["echo 'First'", "echo 'Second'"]"#);repo.commit("Add config with multiple commands");// Pre-approve both commands in temp HOME- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]@@ -103,8 +88,7 @@ approved-commands = ["echo 'Second'",]"#,- )- .expect("Failed to write user config");+ );// Both commands should execute sequentiallysnapshot_switch(@@ -120,22 +104,17 @@ fn test_post_create_named_commands() {repo.commit("Initial commit");// Create project config with named commands (table format)- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"[post-create-command]install = "echo 'Installing deps'"setup = "echo 'Running setup'""#,- )- .expect("Failed to write config");+ );repo.commit("Add config with named commands");// Pre-approve both commands in temp HOME- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]@@ -144,8 +123,7 @@ approved-commands = ["echo 'Running setup'",]"#,- )- .expect("Failed to write user config");+ );// Commands should execute sequentiallysnapshot_switch(@@ -161,26 +139,18 @@ fn test_post_create_failing_command() {repo.commit("Initial commit");// Create project config with a command that will fail- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-create-command = "exit 1""#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-create-command = "exit 1""#);repo.commit("Add config with failing command");// Pre-approve the command in temp HOME- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]approved-commands = ["exit 1"]"#,- )- .expect("Failed to write user config");+ );// Should show warning but continue (worktree should still be created)snapshot_switch(@@ -196,25 +166,20 @@ fn test_post_create_template_expansion() {repo.commit("Initial commit");// Create project config with template variables- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-create-command = ["echo 'Repo: {main-worktree}' > info.txt","echo 'Branch: {branch}' >> info.txt","echo 'Worktree: {worktree}' >> info.txt","echo 'Root: {repo_root}' >> info.txt"]"#,- )- .expect("Failed to write config");+ );repo.commit("Add config with templates");// Pre-approve all commands in isolated test configlet repo_name = "test-repo";- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]@@ -225,8 +190,7 @@ approved-commands = ["echo 'Root: {repo_root}' >> info.txt",]"#,- )- .expect("Failed to write test config");+ );// Commands should execute with expanded templatessnapshot_switch(@@ -273,26 +237,20 @@ fn test_post_start_single_background_command() {repo.commit("Initial commit");// Create project config with a background command- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-start-command = "sleep 1 && echo 'Background task done' > background.txt""#,- )- .expect("Failed to write config");+ );repo.commit("Add background command");// Pre-approve the command- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]approved-commands = ["sleep 1 && echo 'Background task done' > background.txt"]"#,- )- .expect("Failed to write user config");+ );// Command should spawn in background (wt exits immediately)snapshot_switch(@@ -324,22 +282,17 @@ fn test_post_start_multiple_background_commands() {repo.commit("Initial commit");// Create project config with multiple background commands (table format)- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"[post-start-command]task1 = "echo 'Task 1 running' > task1.txt"task2 = "echo 'Task 2 running' > task2.txt""#,- )- .expect("Failed to write config");+ );repo.commit("Add multiple background commands");// Pre-approve both commands- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]@@ -348,8 +301,7 @@ approved-commands = ["echo 'Task 2 running' > task2.txt",]"#,- )- .expect("Failed to write user config");+ );// Commands should spawn in parallelsnapshot_switch(@@ -373,23 +325,18 @@ fn test_both_post_create_and_post_start() {repo.commit("Initial commit");// Create project config with both command types- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-create-command = "echo 'Setup done' > setup.txt"[post-start-command]server = "sleep 0.5 && echo 'Server running' > server.txt""#,- )- .expect("Failed to write config");+ );repo.commit("Add both command types");// Pre-approve all commands- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]@@ -398,8 +345,7 @@ approved-commands = ["sleep 0.5 && echo 'Server running' > server.txt",]"#,- )- .expect("Failed to write user config");+ );// Post-create should run first (blocking), then post-start (background)snapshot_switch("both_create_and_start", &repo, &["--create", "feature"]);@@ -427,13 +373,7 @@ fn test_invalid_toml() {repo.commit("Initial commit");// Create invalid TOML- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- "post-create-command = [invalid syntax\n",- )- .expect("Failed to write config");+ repo.write_project_config("post-create-command = [invalid syntax\n");repo.commit("Add invalid config");@@ -451,26 +391,20 @@ fn test_post_start_log_file_captures_output() {repo.commit("Initial commit");// Create command that writes to both stdout and stderr- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-start-command = "echo 'stdout output' && echo 'stderr output' >&2""#,- )- .expect("Failed to write config");+ );repo.commit("Add command with stdout/stderr");// Pre-approve the command- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]approved-commands = ["echo 'stdout output' && echo 'stderr output' >&2"]"#,- )- .expect("Failed to write user config");+ );snapshot_switch("post_start_log_captures_output",@@ -517,26 +451,18 @@ fn test_post_start_invalid_command_handling() {repo.commit("Initial commit");// Create command with syntax error (missing quote)- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-start-command = "echo 'unclosed quote""#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-start-command = "echo 'unclosed quote""#);repo.commit("Add invalid command");// Pre-approve the command- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]approved-commands = ["echo 'unclosed quote"]"#,- )- .expect("Failed to write user config");+ );// wt should still complete successfully even if background command has errorssnapshot_switch(@@ -559,23 +485,18 @@ fn test_post_start_multiple_commands_separate_logs() {repo.commit("Initial commit");// Create multiple background commands with distinct output- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"[post-start-command]task1 = "echo 'TASK1_OUTPUT'"task2 = "echo 'TASK2_OUTPUT'"task3 = "echo 'TASK3_OUTPUT'""#,- )- .expect("Failed to write config");+ );repo.commit("Add three background commands");// Pre-approve all commands- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]@@ -585,8 +506,7 @@ approved-commands = ["echo 'TASK3_OUTPUT'",]"#,- )- .expect("Failed to write user config");+ );snapshot_switch("post_start_separate_logs", &repo, &["--create", "feature"]);@@ -652,26 +572,18 @@ fn test_execute_flag_with_post_start_commands() {repo.commit("Initial commit");// Create post-start command- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),- r#"post-start-command = "echo 'Background task' > background.txt""#,- )- .expect("Failed to write config");+ repo.write_project_config(r#"post-start-command = "echo 'Background task' > background.txt""#);repo.commit("Add background command");// Pre-approve the command- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]approved-commands = ["echo 'Background task' > background.txt"]"#,- )- .expect("Failed to write user config");+ );// Use --execute flag along with post-start commandsnapshot_switch(@@ -709,26 +621,20 @@ fn test_post_start_complex_shell_commands() {repo.commit("Initial commit");// Create command with pipes and redirects- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-start-command = "echo 'line1\nline2\nline3' | grep line2 > filtered.txt""#,- )- .expect("Failed to write config");+ );repo.commit("Add complex shell command");// Pre-approve the command- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]approved-commands = ["echo 'line1\nline2\nline3' | grep line2 > filtered.txt"]"#,- )- .expect("Failed to write user config");+ );snapshot_switch("post_start_complex_shell", &repo, &["--create", "feature"]);@@ -753,18 +659,14 @@ fn test_post_start_multiline_commands_with_newlines() {repo.commit("Initial commit");// Create command with actual newlines (using TOML triple-quoted string)- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-start-command = """echo 'first line' > multiline.txtecho 'second line' >> multiline.txtecho 'third line' >> multiline.txt""""#,- )- .expect("Failed to write config");+ );repo.commit("Add multiline command with actual newlines");@@ -773,19 +675,15 @@ echo 'third line' >> multiline.txtecho 'second line' >> multiline.txtecho 'third line' >> multiline.txt";- fs::write(- repo.test_config_path(),- format!(- r#"worktree-path = "../{{main-worktree}}.{{branch}}"+ repo.write_test_config(&format!(+ r#"worktree-path = "../{{main-worktree}}.{{branch}}"[projects."test-repo"]approved-commands = ["""{}"""]"#,- multiline_cmd- ),- )- .expect("Failed to write user config");+ multiline_cmd+ ));snapshot_switch("post_start_multiline_with_newlines",@@ -818,10 +716,7 @@ fn test_post_create_multiline_with_control_structures() {repo.commit("Initial commit");// Test multiline command with if-else control structure- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-create-command = """if [ ! -f test.txt ]; thenecho 'File does not exist' > result.txt@@ -830,8 +725,7 @@ elsefi""""#,- )- .expect("Failed to write config");+ );repo.commit("Add multiline control structure");@@ -842,19 +736,15 @@ elseecho 'File exists' > result.txtfi";- fs::write(- repo.test_config_path(),- format!(- r#"worktree-path = "../{{main-worktree}}.{{branch}}"+ repo.write_test_config(&format!(+ r#"worktree-path = "../{{main-worktree}}.{{branch}}"[projects."test-repo"]approved-commands = ["""{}"""]"#,- multiline_cmd- ),- )- .expect("Failed to write user config");+ multiline_cmd+ ));snapshot_switch("post_create_multiline_control_structure",@@ -888,26 +778,20 @@ fn test_post_start_skipped_on_existing_worktree() {repo.commit("Initial commit");// Create project config with post-start command- let config_dir = repo.root_path().join(".config");- fs::create_dir_all(&config_dir).expect("Failed to create .config dir");- fs::write(- config_dir.join("wt.toml"),+ repo.write_project_config(r#"post-start-command = "echo 'POST-START-RAN' > post_start_marker.txt""#,- )- .expect("Failed to write config");+ );repo.commit("Add post-start config");// Pre-approve the command- fs::write(- repo.test_config_path(),+ repo.write_test_config(r#"worktree-path = "../{main-worktree}.{branch}"[projects."test-repo"]approved-commands = ["echo 'POST-START-RAN' > post_start_marker.txt"]"#,- )- .expect("Failed to write test config");+ );// First: Create worktree - post-start SHOULD runsnapshot_switch(