Fix test

Author: simeg

src/commands/repository.rs

@@ -934,11 +934,7 @@ impl NewBranchCommand {
 impl Command for NewBranchCommand {
     fn execute(&self) -> Result<String> {
         // Validate branch name format and safety
-        if self.branch_name.is_empty() {
-            return Err(GitXError::GitCommand(
-                "Branch name cannot be empty".to_string(),
-            ));
-        }
+        crate::commands::stash::utils::validate_branch_name(&self.branch_name)?;
 
         // Check if branch already exists
         if self.branch_exists(&self.branch_name) {
@@ -968,11 +964,8 @@ impl Command for NewBranchCommand {
             Format::bold(&base_branch)
         ));
 
-        // Create the new branch
-        GitOperations::run_status(&["branch", &self.branch_name, &base_branch])?;
-
-        // Switch to the new branch (use checkout for better compatibility)
-        GitOperations::run_status(&["checkout", &self.branch_name])?;
+        // Create and switch to the new branch in one atomic operation
+        GitOperations::run_status(&["checkout", "-b", &self.branch_name, &base_branch])?;
 
         output.push(format!(
             "✅ Successfully created and switched to branch '{}'",

tests/test_new_branch.rs

@@ -164,7 +164,9 @@ fn test_new_branch_invalid_name_dash() {
         .current_dir(&repo_path)
         .assert()
         .success() // The command succeeds but shows validation error
-        .stderr(predicate::str::contains("unknown switch"));
+        .stderr(predicate::str::contains(
+            "Branch name cannot start with a dash",
+        ));
 }
 
 #[test]
@@ -176,7 +178,7 @@ fn test_new_branch_invalid_name_double_dot() {
         .current_dir(&repo_path)
         .assert()
         .success() // The command succeeds but shows validation error
-        .stderr(predicate::str::contains("not a valid branch name"));
+        .stderr(predicate::str::contains("Branch name cannot contain '..'"));
 }
 
 #[test]
@@ -188,7 +190,9 @@ fn test_new_branch_invalid_name_spaces() {
         .current_dir(&repo_path)
         .assert()
         .success() // The command succeeds but shows validation error
-        .stderr(predicate::str::contains("not a valid branch name"));
+        .stderr(predicate::str::contains(
+            "Branch name cannot contain spaces",
+        ));
 }
 
 #[test]