♻️ Replace unwrap with expect for clearer test assertions

Replace unwrap() calls with expect() across test files to provide clear
error context when assertions fail. Also refactor raw string literals to
use single-character escape sequences where appropriate.

Changes:
- Use expect("should be err") instead of unwrap_err() for failed
  validation tests in context.rs, status_messages.rs, and providers.rs
- Use expect("should have current") for status message batch navigation
  tests
- Replace Vec literal with array literal in status_messages.rs test
  scenarios
- Switch #[ignore] to #[ignore = "reason"] with descriptive message
- Replace r#"..."# raw strings with r"..." for single-quote content
  in changelog_tests.rs, pr_tests.rs, and test_utils.rs

Improves test failure diagnostics without changing test behavior.

Author: hyperb1iss

src/agents/context.rs

@@ -300,7 +300,12 @@ mod tests {
     fn test_review_from_without_to_fails() {
         let result = TaskContext::for_review(None, Some("main".to_string()), None, false);
         assert!(result.is_err());
-        assert!(result.unwrap_err().to_string().contains("--to"));
+        assert!(
+            result
+                .expect_err("should be err")
+                .to_string()
+                .contains("--to")
+        );
     }
 
     #[test]
@@ -315,7 +320,7 @@ mod tests {
         assert!(result.is_err());
         assert!(
             result
-                .unwrap_err()
+                .expect_err("should be err")
                 .to_string()
                 .contains("mutually exclusive")
         );
@@ -330,7 +335,12 @@ mod tests {
             true,
         );
         assert!(result.is_err());
-        assert!(result.unwrap_err().to_string().contains("include-unstaged"));
+        assert!(
+            result
+                .expect_err("should be err")
+                .to_string()
+                .contains("include-unstaged")
+        );
     }
 
     #[test]

src/agents/status_messages.rs

@@ -496,13 +496,22 @@ mod tests {
         });
 
         assert_eq!(batch.len(), 2);
-        assert_eq!(batch.current().unwrap().message, "First");
+        assert_eq!(
+            batch.current().expect("should have current").message,
+            "First"
+        );
 
         batch.next();
-        assert_eq!(batch.current().unwrap().message, "Second");
+        assert_eq!(
+            batch.current().expect("should have current").message,
+            "Second"
+        );
 
         batch.next();
-        assert_eq!(batch.current().unwrap().message, "First"); // Cycles back
+        assert_eq!(
+            batch.current().expect("should have current").message,
+            "First"
+        ); // Cycles back
     }
 
     #[test]
@@ -515,17 +524,17 @@ mod tests {
         assert!(prompt.contains("commit"));
         assert!(prompt.contains("analyzing staged changes"));
         assert!(prompt.contains("feature/awesome"));
-        assert!(prompt.contains("3"));
+        assert!(prompt.contains('3'));
     }
 
     /// Debug test to evaluate status message quality
-    /// Run with: cargo test debug_status_messages -- --ignored --nocapture
+    /// Run with: cargo test `debug_status_messages` -- --ignored --nocapture
     #[test]
-    #[ignore]
+    #[ignore = "manual debug test for evaluating status message quality"]
     fn debug_status_messages() {
         use tokio::runtime::Runtime;
 
-        let rt = Runtime::new().unwrap();
+        let rt = Runtime::new().expect("failed to create tokio runtime");
         rt.block_on(async {
             // Get provider/model from env or use defaults
             let provider =
@@ -543,7 +552,7 @@ mod tests {
             let generator = StatusMessageGenerator::new(&provider, &model, None);
 
             // Test scenarios
-            let scenarios = vec![
+            let scenarios = [
                 StatusContext::new("commit", "crafting commit message")
                     .with_branch("main")
                     .with_files(vec![
@@ -589,7 +598,7 @@ mod tests {
 
                 // Generate 5 messages for each scenario
                 for j in 1..=5 {
-                    let msg = generator.generate(&ctx).await;
+                    let msg = generator.generate(ctx).await;
                     println!("  {}: {}", j, msg.message);
                 }
                 println!();

src/providers.rs

@@ -339,15 +339,15 @@ mod tests {
     fn test_api_key_validation_too_short() {
         let result = Provider::OpenAI.validate_api_key_format("sk-short");
         assert!(result.is_err());
-        assert!(result.unwrap_err().contains("too short"));
+        assert!(result.expect_err("should be err").contains("too short"));
     }
 
     #[test]
     fn test_api_key_validation_wrong_prefix_openai() {
         // Long enough but wrong prefix
         let result = Provider::OpenAI.validate_api_key_format("wrong-prefix-1234567890abcdef");
         assert!(result.is_err());
-        let err = result.unwrap_err();
+        let err = result.expect_err("should be err");
         assert!(err.contains("should start with"));
         // Error should mention valid prefixes
         assert!(err.contains("'sk-'") || err.contains("'sk-proj-'"));
@@ -360,7 +360,7 @@ mod tests {
         // Has sk- but not sk-ant- (might be OpenAI key used for Anthropic)
         let result = Provider::Anthropic.validate_api_key_format("sk-1234567890abcdefghijklmnop");
         assert!(result.is_err());
-        let err = result.unwrap_err();
+        let err = result.expect_err("should be err");
         assert!(err.contains("sk-ant-"));
         // Verify we don't expose the actual key content
         assert!(err.contains("unexpected prefix"));

tests/changelog_tests.rs

@@ -19,7 +19,7 @@ fn setup_test_repo() -> Result<(TempDir, Repository)> {
 #[test]
 fn test_markdown_changelog_format() {
     let changelog = MarkdownChangelog {
-        content: r#"## [1.0.0] - 2023-06-01
+        content: r"## [1.0.0] - 2023-06-01
 
 This release adds new features and fixes bugs.
 
@@ -42,7 +42,7 @@ This release adds new features and fixes bugs.
 - Files Changed: 12
 - Insertions: +245
 - Deletions: -87
-"#
+"
         .to_string(),
     };
 
@@ -114,7 +114,7 @@ fn test_markdown_release_notes_format() {
     use git_iris::types::MarkdownReleaseNotes;
 
     let release_notes = MarkdownReleaseNotes {
-        content: r#"# Release Notes v1.0.0
+        content: r"# Release Notes v1.0.0
 
 **Released:** 2023-06-01
 
@@ -133,7 +133,7 @@ A great new feature was added.
 ## Breaking Changes
 
 - API endpoint changed
-"#
+"
         .to_string(),
     };
 

tests/pr_tests.rs

@@ -45,7 +45,7 @@ fn test_format_pull_request() {
 #[test]
 fn test_format_pull_request_minimal() {
     let pr = MarkdownPullRequest {
-        content: r#"# Fix bug in user authentication
+        content: r"# Fix bug in user authentication
 
 ## Summary
 
@@ -58,7 +58,7 @@ This PR fixes an issue where users couldn't log in properly.
 ## Commits
 
 - `abc1234`: Fix authentication bug
-"#
+"
         .to_string(),
     };
 
@@ -166,7 +166,7 @@ async fn test_git_repo_pr_methods() -> Result<()> {
 #[test]
 fn test_format_pull_request_with_unicode() {
     let pr = MarkdownPullRequest {
-        content: r#"# 🚀 Add deployment automation
+        content: r"# 🚀 Add deployment automation
 
 ## Summary
 
@@ -194,7 +194,7 @@ Test with 🧪 test suite
 ## Notes
 
 Deployment requires 🔑 secrets
-"#
+"
         .to_string(),
     };
 

tests/remote_repository_integration_tests.rs

@@ -27,8 +27,11 @@ async fn test_cli_with_remote_repository() -> Result<()> {
     // 1. Test ReleaseNotes command with repository URL
     let common = CommonParams {
         provider: Some("mock".to_string()), // Use mock provider to avoid real API calls
+        model: None,
         instructions: None,
         preset: None,
+        gitmoji_flag: false,
+        no_gitmoji: false,
         gitmoji: Some(false),
         repository_url: Some(repo_url.to_string()),
     };
@@ -37,11 +40,14 @@ async fn test_cli_with_remote_repository() -> Result<()> {
         common: common.clone(),
         from: "v1.0.0".to_string(), // Use a tag that's likely to exist in the repo
         to: Some("HEAD".to_string()),
+        raw: false,
+        update: false,
+        file: None,
         version_name: None,
     };
 
     // Just testing that it doesn't panic, we're not making actual API calls
-    let result = git_iris::cli::handle_command(release_notes_command, None, false).await;
+    let result = git_iris::cli::handle_command(release_notes_command, None).await;
     assert!(
         result.is_err(),
         "Command should fail because we're using a mock provider"
@@ -52,13 +58,14 @@ async fn test_cli_with_remote_repository() -> Result<()> {
         common: common.clone(),
         from: "v1.0.0".to_string(),
         to: Some("HEAD".to_string()),
+        raw: false,
         file: None,
         update: false,
         version_name: None,
     };
 
     // Just testing that it doesn't panic
-    let result = git_iris::cli::handle_command(changelog_command, None, false).await;
+    let result = git_iris::cli::handle_command(changelog_command, None).await;
     assert!(
         result.is_err(),
         "Command should fail because we're using a mock provider"
@@ -68,14 +75,15 @@ async fn test_cli_with_remote_repository() -> Result<()> {
     let review_command = Commands::Review {
         common: common.clone(),
         print: true,
+        raw: false,
         commit: None,
         include_unstaged: false,
         from: None,
         to: None,
     };
 
     // Just testing that it doesn't panic
-    let result = git_iris::cli::handle_command(review_command, None, false).await;
+    let result = git_iris::cli::handle_command(review_command, None).await;
     assert!(
         result.is_err(),
         "Command should fail because we're using a mock provider"
@@ -85,13 +93,13 @@ async fn test_cli_with_remote_repository() -> Result<()> {
     let gen_command = Commands::Gen {
         common,
         auto_commit: false,
-        no_gitmoji: true,
         print: true,
         no_verify: true,
+        amend: false,
     };
 
     // Just testing that it doesn't panic
-    let result = git_iris::cli::handle_command(gen_command, None, false).await;
+    let result = git_iris::cli::handle_command(gen_command, None).await;
     assert!(
         result.is_err(),
         "Command should fail because we're using a mock provider"

tests/review_tests.rs

@@ -1,6 +1,6 @@
 //! Tests for review functionality
 //!
-//! Note: Legacy GeneratedReview tests removed. MarkdownReview is now the active code path.
+//! Note: Legacy `GeneratedReview` tests removed. `MarkdownReview` is now the active code path.
 
 // Use our centralized test infrastructure
 #[path = "test_utils.rs"]

tests/test_utils.rs

@@ -436,7 +436,7 @@ impl MockDataBuilder {
     /// Create a mock `MarkdownPullRequest`
     pub fn generated_pull_request() -> MarkdownPullRequest {
         MarkdownPullRequest {
-            content: r#"# Add JWT authentication with user registration
+            content: r"# Add JWT authentication with user registration
 
 ## Summary
 
@@ -473,7 +473,7 @@ Test user registration flow and verify JWT tokens are properly validated on prot
 ## Notes
 
 Requires JWT_SECRET environment variable to be set before deployment.
-"#.to_string(),
+".to_string(),
         }
     }