Skip to content

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

refactor: add `TestRepo::bare()` and consolidate bare repo test creation (#2007)

Maximilian Rooscce9a9d0feae
diff --git a/src/git/recover.rs b/src/git/recover.rs
index f8bf0667b..6bf0f7717 100644
--- a/src/git/recover.rs
+++ b/src/git/recover.rs
@@ -207,7 +207,6 @@ fn paths_match(worktree_path: &Path, deleted_path: &Path) -> bool {
#[cfg(test)]
mod tests {
use super::*;
- use crate::shell_exec::Cmd;
use crate::testing::TestRepo;
use ansi_str::AnsiStr;
@@ -424,14 +423,8 @@ mod tests {
fn test_hint_for_repo_fallback_to_list() {
// A bare repo with no worktrees has no default branch worktree,
// so it should suggest `wt list` instead of `wt switch ^`.
- let tmp = tempfile::tempdir().unwrap();
- Cmd::new("git")
- .args(["init", "--bare", "--quiet"])
- .current_dir(tmp.path())
- .run()
- .unwrap();
- let repo = Repository::at(tmp.path()).unwrap();
- let hint = hint_for_repo(&repo);
+ let test = TestRepo::bare();
+ let hint = hint_for_repo(&test.repo);
insta::assert_snapshot!(hint.ansi_strip(), @"Current directory was removed. Run wt list to see worktrees");
}
}
diff --git a/src/testing/mod.rs b/src/testing/mod.rs
index 58ece6e55..355a08e4e 100644
--- a/src/testing/mod.rs
+++ b/src/testing/mod.rs
@@ -14,6 +14,7 @@
//!
//! - [`TestRepo::new()`] — lightweight: `git init` + identity. For unit tests.
//! - [`TestRepo::with_initial_commit()`] — lightweight + one commit.
+//! - [`TestRepo::bare()`] — bare repository (`git init --bare`). No working tree.
//! - [`TestRepo::at(path)`](TestRepo::at) — repo at a caller-specified path.
//! For tests needing multiple repos in a shared directory.
//! - [`TestRepo::standard()`] — copies pre-built fixture with remote + worktrees.
@@ -643,6 +644,14 @@ impl TestRepo {
test
}
+ /// Create a bare repository (`git init --bare`).
+ ///
+ /// Bare repos have no working tree — useful for testing error paths
+ /// and bare-repo-specific behavior (e.g., hint fallback to `wt list`).
+ pub fn bare() -> Self {
+ Self::init_repo(&["init", "--bare"])
+ }
+
/// Path to the repository working directory.
///
/// Alias for [`root_path()`](Self::root_path) for backward compatibility
diff --git a/tests/integration_tests/step_promote.rs b/tests/integration_tests/step_promote.rs
index 4785feebb..897e42d1e 100644
--- a/tests/integration_tests/step_promote.rs
+++ b/tests/integration_tests/step_promote.rs
@@ -267,19 +267,12 @@ fn test_promote_shows_mismatch_in_list(mut repo: TestRepo) {
/// Test error when run in a bare repository (no worktrees)
#[test]
fn test_promote_bare_repo_no_worktrees() {
- let temp_dir = tempfile::tempdir().unwrap();
- let bare_repo = temp_dir.path().join("bare.git");
-
- // Create a bare repository
- Cmd::new("git")
- .args(["init", "--bare", bare_repo.to_str().unwrap()])
- .run()
- .unwrap();
+ let test = TestRepo::bare();
// Try to run promote in the bare repo - fails with "No worktrees found"
- let output = wt_command()
+ let output = test
+ .wt_command()
.args(["step", "promote", "feature"])
- .current_dir(&bare_repo)
.output()
.unwrap();