Skip to content

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

test(merge): actually stage the file in test_step_commit_show_prompt (#2525)

Worktrunk Bot82da61459ab9
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index bb14ce56d..fb9ecaa4d 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -2321,7 +2321,10 @@ fn test_merge_error_conflicting_changes_in_target(mut repo_with_alternate_primar
fn test_step_commit_show_prompt(repo: TestRepo) {
// Create some staged changes so there's a diff to include in the prompt
fs::write(repo.root_path().join("new_file.txt"), "new content").expect("Failed to write file");
- repo.git_command().args(["add", "new_file.txt"]);
+ repo.git_command()
+ .args(["add", "new_file.txt"])
+ .run()
+ .expect("git add failed");
// The prompt should be written to stdout
assert_cmd_snapshot!(make_snapshot_cmd(
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_show_prompt.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_show_prompt.snap
index d8800e5e3..9be6aea8e 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_show_prompt.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_show_prompt.snap
@@ -58,10 +58,20 @@ exit_code: 0
</style>
<diffstat>
+ new_file.txt | 1 +
+ 1 file changed, 1 insertion(+)
</diffstat>
<diff>
+diff --git a/new_file.txt b/new_file.txt
+new file mode 100644
+index 0000000..47d2739
+--- /dev/null
++++ b/new_file.txt
+@@ -0,0 +1 @@
++new content
+\ No newline at end of file
</diff>