Add more tests

Author: simeg

.claude/settings.local.json

@@ -38,7 +38,10 @@
       "Bash(timeout 10 cargo test test_prune_branches_run_function --test test_prune_branches)",
       "Bash(echo $?)",
       "Bash(git branch:*)",
-      "Bash(./target/debug/git-x stash-branch --help)"
+      "Bash(./target/debug/git-x stash-branch --help)",
+      "Bash(timeout 15 cargo test --test test_interactive)",
+      "Bash(timeout 30 cargo test --test test_interactive -- --test-threads=1)",
+      "Bash(timeout 20 cargo test --test test_interactive -- --test-threads=1)"
     ],
     "deny": []
   }

SAFETY_TESTS.md

@@ -0,0 +1,63 @@
+# Safety Tests Documentation
+
+## Overview
+
+The `tests/test_safety.rs` module contains tests for git-x's safety and backup functionality. Some of these tests perform **DESTRUCTIVE git operations** that can modify your working directory.
+
+## Destructive Operations
+
+The following operations are considered destructive and are conditionally run:
+
+- **Creating backup branches**: Adds new git branches to your repository
+- **Creating checkpoints**: Creates git stashes that modify stash state
+- **Restoring checkpoints**: Pops git stashes, potentially changing working directory
+- **Cleaning up branches**: Can delete backup branches (though limited to very old ones)
+
+## Test Execution Modes
+
+### Local Development (Default - Safe Mode)
+```bash
+cargo test test_safety
+```
+- Destructive tests are **SKIPPED** automatically
+- Only safe tests run (method signatures, builders, validation)
+- Your git repository remains unchanged
+
+### CI Environment (Automatic)
+```bash
+# In GitHub Actions or other CI
+cargo test test_safety
+```
+- All tests run automatically (detected via `CI` or `GITHUB_ACTIONS` env vars)
+- Safe for CI because repositories are disposable
+
+### Manual Override (Use with Caution)
+```bash
+ENABLE_DESTRUCTIVE_TESTS=1 cargo test test_safety
+```
+- Forces ALL tests to run locally
+- **WARNING**: Will modify your git repository
+- Only use in test repositories or when you understand the risks
+
+## Detection Logic
+
+Tests are skipped locally unless one of these conditions is met:
+- `CI` environment variable is set
+- `GITHUB_ACTIONS` environment variable is set  
+- `ENABLE_DESTRUCTIVE_TESTS` environment variable is set
+
+## Safety Measures
+
+Even when destructive tests run:
+- Backup creation uses timestamp-based names to avoid conflicts
+- Cleanup operations target only very old backups (365+ days)
+- All operations use non-interactive mode to prevent hanging
+- Tests are designed to be as safe as possible while still testing functionality
+
+## Development Guidelines
+
+When adding new safety tests:
+1. Wrap potentially destructive operations with `if !should_run_destructive_tests() { return; }`
+2. Use descriptive test names that indicate destructive nature
+3. Test the minimal necessary functionality to verify behavior
+4. Prefer testing business logic over actual git operations when possible

src/commands/repository.rs

@@ -588,8 +588,8 @@ impl Command for NewBranchCommand {
         // Create the new branch
         GitOperations::run_status(&["branch", &self.branch_name, &base_branch])?;
 
-        // Switch to the new branch
-        GitOperations::run_status(&["switch", &self.branch_name])?;
+        // Switch to the new branch (use checkout for better compatibility)
+        GitOperations::run_status(&["checkout", &self.branch_name])?;
 
         output.push(format!(
             "✅ Successfully created and switched to branch '{}'",

src/lib.rs

@@ -13,9 +13,6 @@ pub mod commands;
 // CLI interface
 pub mod cli;
 
-// Test utilities for direct command testing (improves test coverage)
-pub mod test_utils;
-
 // Examples showing architecture migration
 #[cfg(test)]
 pub mod examples;

tests/common/mod.rs

@@ -206,7 +206,7 @@ pub fn repo_with_merged_branch(feature_branch: &str, main_branch: &str) -> TestR
     let path = temp.path().to_path_buf();
 
     StdCommand::new("git")
-        .arg("init")
+        .args(["init", &format!("--initial-branch={main_branch}")])
         .current_dir(&path)
         .assert()
         .success();
@@ -217,13 +217,6 @@ pub fn repo_with_merged_branch(feature_branch: &str, main_branch: &str) -> TestR
     };
     repo.configure_git_identity();
 
-    // Create the requested main branch
-    StdCommand::new("git")
-        .args(["checkout", "-b", main_branch])
-        .current_dir(&path)
-        .assert()
-        .success();
-
     // Initial commit
     fs::write(path.join("README.md"), "# test").unwrap();
     StdCommand::new("git")