Replace subprocess calls with method calls in tests

Author: simeg

tests/test_bisect.rs

@@ -501,10 +501,6 @@ fn test_bisect_start_same_commits() {
     // Git will handle this case - it's a valid scenario where no bisect is needed
 }
 
-// Unit tests for helper functions (these test the internal logic)
-
-// Error handling tests
-
 #[test]
 fn test_bisect_start_with_tags() {
     let (_temp_dir, repo_path) = create_test_repo();

tests/test_contributors.rs

@@ -8,14 +8,22 @@ mod common;
 
 #[test]
 fn test_contributors_in_non_git_repo() {
+    use git_x::commands::analysis::ContributorsCommand;
+    use git_x::core::traits::Command as CommandTrait;
+
     let temp_dir = TempDir::new().expect("Failed to create temp dir");
+    let original_dir = std::env::current_dir().unwrap();
 
-    let mut cmd = Command::cargo_bin("git-x").expect("Failed to find binary");
-    cmd.current_dir(temp_dir.path())
-        .arg("contributors")
-        .assert()
-        .success()
-        .stderr(predicate::str::contains("Git command failed"));
+    std::env::set_current_dir(temp_dir.path()).unwrap();
+
+    let cmd = ContributorsCommand::new(None);
+    let result = cmd.execute();
+
+    // Should fail in non-git directory
+    assert!(result.is_err());
+
+    // Restore original directory
+    let _ = std::env::set_current_dir(&original_dir);
 }
 
 #[test]
@@ -42,12 +50,18 @@ fn test_contributors_in_empty_git_repo() {
         .output()
         .expect("Failed to set git user email");
 
-    let mut cmd = Command::cargo_bin("git-x").expect("Failed to find binary");
-    cmd.current_dir(temp_dir.path())
-        .arg("contributors")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("No contributors found"));
+    let original_dir = std::env::current_dir().unwrap();
+    std::env::set_current_dir(temp_dir.path()).unwrap();
+
+    let cmd = git_x::commands::analysis::ContributorsCommand::new(None);
+    let result = cmd.execute();
+
+    assert!(result.is_ok());
+    let output = result.unwrap();
+    assert!(output.contains("No contributors found"));
+
+    // Restore original directory
+    let _ = std::env::set_current_dir(&original_dir);
 }
 
 #[test]
@@ -88,17 +102,24 @@ fn test_contributors_with_single_contributor() {
         .output()
         .expect("Failed to commit");
 
-    let mut cmd = Command::cargo_bin("git-x").expect("Failed to find binary");
-    cmd.current_dir(temp_dir.path())
-        .arg("contributors")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("Repository Contributors"))
-        .stdout(predicate::str::contains("Alice Smith"))
-        .stdout(predicate::str::contains("alice@example.com"))
-        .stdout(predicate::str::contains("🥇"))
-        .stdout(predicate::str::contains("1 commits"))
-        .stdout(predicate::str::contains("100.0%"));
+    let original_dir = std::env::current_dir().unwrap();
+    std::env::set_current_dir(temp_dir.path()).unwrap();
+
+    let cmd = git_x::commands::analysis::ContributorsCommand::new(None);
+    let result = cmd.execute();
+
+    assert!(result.is_ok());
+    let output = result.unwrap();
+    assert!(output.contains("Repository Contributors"));
+    assert!(output.contains("Alice Smith"));
+    assert!(output.contains("alice@example.com"));
+    assert!(output.contains("🥇"));
+    assert!(output.contains("1 commits"));
+
+    assert!(output.contains("100.0%"));
+
+    // Restore original directory
+    let _ = std::env::set_current_dir(&original_dir);
 }
 
 #[test]
@@ -192,21 +213,28 @@ fn test_contributors_with_multiple_contributors() {
         .output()
         .expect("Failed to commit");
 
-    let mut cmd = Command::cargo_bin("git-x").expect("Failed to find binary");
-    cmd.current_dir(temp_dir.path())
-        .arg("contributors")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("Repository Contributors"))
-        .stdout(predicate::str::contains("3 total commits"))
-        .stdout(predicate::str::contains("Alice Smith"))
-        .stdout(predicate::str::contains("Bob Jones"))
-        .stdout(predicate::str::contains("🥇")) // Alice should be first with 2 commits
-        .stdout(predicate::str::contains("🥈")) // Bob should be second with 1 commit
-        .stdout(predicate::str::contains("2 commits"))
-        .stdout(predicate::str::contains("1 commits"))
-        .stdout(predicate::str::contains("66.7%")) // Alice: 2/3 commits
-        .stdout(predicate::str::contains("33.3%")); // Bob: 1/3 commits
+    let original_dir = std::env::current_dir().unwrap();
+    std::env::set_current_dir(temp_dir.path()).unwrap();
+
+    let cmd = git_x::commands::analysis::ContributorsCommand::new(None);
+    let result = cmd.execute();
+
+    assert!(result.is_ok());
+    let output = result.unwrap();
+    assert!(output.contains("Repository Contributors"));
+    assert!(output.contains("3 total commits"));
+    assert!(output.contains("Alice Smith"));
+    assert!(output.contains("Bob Jones"));
+    assert!(output.contains("🥇")); // Alice should be first with 2 commits
+    assert!(output.contains("🥈")); // Bob should be second with 1 commit
+    assert!(output.contains("2 commits"));
+    assert!(output.contains("1 commits"));
+
+    assert!(output.contains("66.7%")); // Alice: 2/3 commits
+    assert!(output.contains("33.3%")); // Bob: 1/3 commits
+
+    // Restore original directory
+    let _ = std::env::set_current_dir(&original_dir);
 }
 
 #[test]

tests/test_graph.rs

@@ -10,21 +10,26 @@ fn test_git_graph_runs_without_error() {
 
 #[test]
 fn test_git_graph_outputs_graph_symbols() {
-    use assert_cmd::Command;
+    use git_x::commands::analysis::GraphCommand;
+    use git_x::core::traits::Command;
 
     let repo = basic_repo();
-    let output = Command::cargo_bin("git-x")
-        .unwrap()
-        .arg("graph")
-        .current_dir(repo.path())
-        .output()
-        .unwrap();
-
-    let stdout = String::from_utf8_lossy(&output.stdout);
+    let original_dir = std::env::current_dir().unwrap();
+
+    std::env::set_current_dir(repo.path()).unwrap();
+
+    let cmd = GraphCommand::new();
+    let result = cmd.execute();
+
+    assert!(result.is_ok());
+    let stdout = result.unwrap();
     assert!(
         stdout.contains("*") || stdout.contains("|"),
         "Expected ASCII graph symbols in output"
     );
+
+    // Restore original directory
+    let _ = std::env::set_current_dir(&original_dir);
 }
 
 // Unit tests now handled by common module tests

tests/test_technical_debt.rs

@@ -12,13 +12,19 @@ use git_x::core::traits::Command as CommandTrait;
 #[test]
 fn test_technical_debt_in_non_git_repo() {
     let temp_dir = TempDir::new().expect("Failed to create temp dir");
+    let original_dir = std::env::current_dir().unwrap();
 
-    let mut cmd = Command::cargo_bin("git-x").expect("Failed to find binary");
-    cmd.current_dir(temp_dir.path())
-        .arg("technical-debt")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("Technical Debt Analysis"));
+    std::env::set_current_dir(temp_dir.path()).unwrap();
+
+    let cmd = TechnicalDebtCommand::new();
+    let result = cmd.execute();
+
+    assert!(result.is_ok());
+    let output = result.unwrap();
+    assert!(output.contains("Technical Debt Analysis"));
+
+    // Restore original directory
+    let _ = std::env::set_current_dir(&original_dir);
 }
 
 #[test]
@@ -45,12 +51,18 @@ fn test_technical_debt_in_empty_git_repo() {
         .output()
         .expect("Failed to configure git");
 
-    let mut cmd = Command::cargo_bin("git-x").expect("Failed to find binary");
-    cmd.current_dir(temp_dir.path())
-        .arg("technical-debt")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("Technical Debt Analysis"));
+    let original_dir = std::env::current_dir().unwrap();
+    std::env::set_current_dir(temp_dir.path()).unwrap();
+
+    let cmd = TechnicalDebtCommand::new();
+    let result = cmd.execute();
+
+    assert!(result.is_ok());
+    let output = result.unwrap();
+    assert!(output.contains("Technical Debt Analysis"));
+
+    // Restore original directory
+    let _ = std::env::set_current_dir(&original_dir);
 }
 
 #[test]
@@ -85,12 +97,18 @@ fn test_technical_debt_with_files() {
         .output()
         .expect("Failed to commit files");
 
-    let mut cmd = Command::cargo_bin("git-x").expect("Failed to find binary");
-    cmd.current_dir(repo.path())
-        .arg("technical-debt")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("Technical Debt Analysis"));
+    let original_dir = std::env::current_dir().unwrap();
+    std::env::set_current_dir(repo.path()).unwrap();
+
+    let cmd = TechnicalDebtCommand::new();
+    let result = cmd.execute();
+
+    assert!(result.is_ok());
+    let output = result.unwrap();
+    assert!(output.contains("Technical Debt Analysis"));
+
+    // Restore original directory
+    let _ = std::env::set_current_dir(&original_dir);
 }
 
 #[test]