Fix test

Author: simeg

CLAUDE.md

@@ -14,6 +14,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 - `make test` - Run unit and integration tests
 - `cargo test` - Alternative test command
 - `cargo test <test_name>` - Run specific test
+- `make coverage` - Generate test coverage using tarpaulin
 
 ### Code Quality
 - `make fmt` - Format code with rustfmt
@@ -41,11 +42,16 @@ Each Git workflow command is implemented as a separate module:
 - Error handling uses `expect()` with descriptive messages
 
 ### Key Dependencies
-- `clap` - Command-line parsing with derive macros
-- `clap_complete` - Shell completion generation
-- `console` - Terminal output formatting
+- `clap` - Command-line parsing with derive macros and subcommands
+- `console` - Terminal output formatting with colors and emojis
 - `chrono` - Date/time handling for summary command
 
+### Dev Dependencies
+- `assert_cmd` - CLI testing framework for integration tests
+- `tempfile` - Temporary Git repositories for testing
+- `predicates` - Assertion helpers for test conditions
+- `criterion` - Benchmarking framework
+
 ### Testing
 - Integration tests in `tests/` directory
 - Each command has corresponding `test_<command>.rs` file
@@ -54,5 +60,10 @@ Each Git workflow command is implemented as a separate module:
 ### Git Plugin Integration
 The binary name `git-x` enables Git's plugin system - any executable named `git-<name>` can be invoked as `git <name>`. Commands like `git x info` work automatically once installed.
 
-### Completion System
-Shell completions are generated via `--generate-completions <shell>` flag using `clap_complete`. The README provides setup instructions for bash, zsh, fish, PowerShell, and Elvish.
+### Error Handling and Types
+- Common error type `GitXError` defined in `src/lib.rs` with variants for Git commands, IO, and parsing
+- Most commands use `expect()` with descriptive messages for quick failure feedback
+- Type alias `Result<T>` available for consistent error handling
+
+### Shell Completion Generation
+Shell completions can be generated via `--generate-completions <shell>` flag using `clap_complete`. The README provides setup instructions for bash, zsh, fish, PowerShell, and Elvish.

tests/test_sync.rs

@@ -212,10 +212,33 @@ fn test_get_current_branch_success() {
 fn test_get_current_branch_not_git_repo() {
     let temp_dir = TempDir::new().expect("Failed to create temp directory");
 
-    std::env::set_current_dir(temp_dir.path()).expect("Failed to change directory");
+    // Create a completely isolated directory that definitely isn't a git repo
+    let isolated_dir = temp_dir.path().join("isolated");
+    std::fs::create_dir(&isolated_dir).expect("Failed to create isolated directory");
+
+    // Unset GIT_DIR and GIT_WORK_TREE to ensure git doesn't find parent repos
+    let original_git_dir = std::env::var("GIT_DIR").ok();
+    let original_git_work_tree = std::env::var("GIT_WORK_TREE").ok();
+    unsafe {
+        std::env::remove_var("GIT_DIR");
+        std::env::remove_var("GIT_WORK_TREE");
+    }
+
+    let original_dir = std::env::current_dir().expect("Failed to get current directory");
+    std::env::set_current_dir(&isolated_dir).expect("Failed to change directory");
 
     let result = get_current_branch();
-    std::env::set_current_dir("/").expect("Failed to reset directory");
+
+    // Restore original directory and environment
+    std::env::set_current_dir(&original_dir).expect("Failed to reset directory");
+    unsafe {
+        if let Some(git_dir) = original_git_dir {
+            std::env::set_var("GIT_DIR", git_dir);
+        }
+        if let Some(git_work_tree) = original_git_work_tree {
+            std::env::set_var("GIT_WORK_TREE", git_work_tree);
+        }
+    }
 
     assert!(result.is_err());
     assert_eq!(result.unwrap_err(), "Not in a git repository");
@@ -545,9 +568,33 @@ fn test_get_current_branch_comprehensive() {
 
     // Test error case
     let temp_dir = TempDir::new().expect("Failed to create temp directory");
-    std::env::set_current_dir(temp_dir.path()).expect("Failed to change directory");
+
+    // Create a completely isolated directory that definitely isn't a git repo
+    let isolated_dir = temp_dir.path().join("isolated");
+    std::fs::create_dir(&isolated_dir).expect("Failed to create isolated directory");
+
+    // Unset GIT_DIR and GIT_WORK_TREE to ensure git doesn't find parent repos
+    let original_git_dir = std::env::var("GIT_DIR").ok();
+    let original_git_work_tree = std::env::var("GIT_WORK_TREE").ok();
+    unsafe {
+        std::env::remove_var("GIT_DIR");
+        std::env::remove_var("GIT_WORK_TREE");
+    }
+
+    let original_dir = std::env::current_dir().expect("Failed to get current directory");
+    std::env::set_current_dir(&isolated_dir).expect("Failed to change directory");
     let result_error = get_current_branch();
-    std::env::set_current_dir("/").expect("Failed to reset directory");
+
+    // Restore original directory and environment
+    std::env::set_current_dir(&original_dir).expect("Failed to reset directory");
+    unsafe {
+        if let Some(git_dir) = original_git_dir {
+            std::env::set_var("GIT_DIR", git_dir);
+        }
+        if let Some(git_work_tree) = original_git_work_tree {
+            std::env::set_var("GIT_WORK_TREE", git_work_tree);
+        }
+    }
 
     assert!(result_error.is_err());
     assert_eq!(result_error.unwrap_err(), "Not in a git repository");

tests/test_upstream.rs

@@ -593,10 +593,33 @@ fn test_get_current_branch_success() {
 fn test_get_current_branch_not_git_repo() {
     let temp_dir = TempDir::new().expect("Failed to create temp directory");
 
-    std::env::set_current_dir(temp_dir.path()).expect("Failed to change directory");
+    // Create a completely isolated directory that definitely isn't a git repo
+    let isolated_dir = temp_dir.path().join("isolated");
+    std::fs::create_dir(&isolated_dir).expect("Failed to create isolated directory");
+
+    // Unset GIT_DIR and GIT_WORK_TREE to ensure git doesn't find parent repos
+    let original_git_dir = std::env::var("GIT_DIR").ok();
+    let original_git_work_tree = std::env::var("GIT_WORK_TREE").ok();
+    unsafe {
+        std::env::remove_var("GIT_DIR");
+        std::env::remove_var("GIT_WORK_TREE");
+    }
+
+    let original_dir = std::env::current_dir().expect("Failed to get current directory");
+    std::env::set_current_dir(&isolated_dir).expect("Failed to change directory");
 
     let result = get_current_branch();
-    std::env::set_current_dir("/").expect("Failed to reset directory");
+
+    // Restore original directory and environment
+    std::env::set_current_dir(&original_dir).expect("Failed to reset directory");
+    unsafe {
+        if let Some(git_dir) = original_git_dir {
+            std::env::set_var("GIT_DIR", git_dir);
+        }
+        if let Some(git_work_tree) = original_git_work_tree {
+            std::env::set_var("GIT_WORK_TREE", git_work_tree);
+        }
+    }
 
     assert!(result.is_err());
 }