Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Add integration tests for post-merge command
Maximilian Roos65ef9944e6c1
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 95bd41496..b0240f8bd 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -1329,6 +1329,86 @@ deploy = "echo 'Deploying branch {{ branch }}' > deploy.txt");}+#[test]+fn test_merge_post_merge_runs_with_nothing_to_merge() {+ // Verify post-merge hooks run even when there's nothing to merge+ let mut repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.setup_remote("main");++ // Create project config with post-merge command+ let config_dir = repo.root_path().join(".config");+ fs::create_dir_all(&config_dir).unwrap();+ fs::write(+ config_dir.join("wt.toml"),+ r#"post-merge = "echo 'post-merge ran' > post-merge-ran.txt""#,+ )+ .unwrap();++ repo.commit("Add config");++ // Create a worktree for main (destination for post-merge commands)+ let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");+ let mut cmd = Command::new("git");+ repo.configure_git_cmd(&mut cmd);+ cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])+ .current_dir(repo.root_path())+ .output()+ .unwrap();++ // Create a feature worktree with NO commits (already up-to-date with main)+ let feature_wt = repo.add_worktree("feature", "feature");++ // Merge with --force - nothing to merge but post-merge should still run+ snapshot_merge(+ "merge_post_merge_runs_with_nothing_to_merge",+ &repo,+ &["main", "--force"],+ Some(&feature_wt),+ );++ // Verify the post-merge command ran in the main worktree+ let marker_file = repo.root_path().join("post-merge-ran.txt");+ assert!(+ marker_file.exists(),+ "Post-merge command should run even when nothing to merge"+ );+}++#[test]+fn test_merge_post_merge_runs_from_main_branch() {+ // Verify post-merge hooks run when merging from main to main (nothing to do)+ let mut repo = TestRepo::new();+ repo.commit("Initial commit");+ repo.setup_remote("main");++ // Create project config with post-merge command+ let config_dir = repo.root_path().join(".config");+ fs::create_dir_all(&config_dir).unwrap();+ fs::write(+ config_dir.join("wt.toml"),+ r#"post-merge = "echo 'post-merge ran from main' > post-merge-ran.txt""#,+ )+ .unwrap();++ repo.commit("Add config");++ // Run merge from main branch (repo root) - nothing to merge+ snapshot_merge(+ "merge_post_merge_runs_from_main_branch",+ &repo,+ &["--force"],+ None, // cwd = repo root = main branch+ );++ // Verify the post-merge command ran+ let marker_file = repo.root_path().join("post-merge-ran.txt");+ assert!(+ marker_file.exists(),+ "Post-merge command should run even when on main branch"+ );+}+#[test]fn test_merge_pre_commit_command_success() {let mut repo = TestRepo::new();diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snapnew file mode 100644index 000000000..f32beadb3--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap@@ -0,0 +1,31 @@+---+source: tests/integration_tests/merge.rs+info:+ program: wt+ args:+ - merge+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_BIN: ""+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+---+success: true+exit_code: 0+----- stdout -----+⚪ Already up to date with [1mmain[0m (no new commits, no rebase needed)+⚪ Worktree preserved (--no-remove)+🔄 [36mRunning post-merge:[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran from main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m++----- stderr -----+[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snapnew file mode 100644index 000000000..eb3374b37--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap@@ -0,0 +1,32 @@+---+source: tests/integration_tests/merge.rs+info:+ program: wt+ args:+ - merge+ - main+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_BIN: ""+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+---+success: true+exit_code: 0+----- stdout -----+⚪ Already up to date with [1mmain[0m (no new commits, no rebase needed)+🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+🔄 [36mRunning post-merge:[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m++----- stderr -----+[0m