- add test coverage

Author: dougj-contrast

test/test_git_handler.py

@@ -50,6 +50,7 @@
 # Import with testing=True
 from src.config import get_config, reset_config  # noqa: E402
 from src import git_handler  # noqa: E402
+from src.coding_agents import CodingAgents  # noqa: E402
 
 
 class TestGitHandler(unittest.TestCase):
@@ -206,7 +207,8 @@ def test_create_issue_failure(self, mock_log, mock_ensure_label, mock_run_comman
     @patch('src.git_handler.ensure_label')
     @patch('src.git_handler.log')
     @patch('src.git_handler.debug_log')
-    def test_reset_issue_success(self, mock_debug_log, mock_log, mock_ensure_label, mock_find_open_pr, mock_run_command, mock_check_issues):
+    @patch('src.git_handler.config')
+    def test_reset_issue_success(self, mock_config, mock_debug_log, mock_log, mock_ensure_label, mock_find_open_pr, mock_run_command, mock_check_issues):
         """Test resetting a GitHub issue when successful"""
         # Setup
         issue_number = 42
@@ -215,6 +217,10 @@ def test_reset_issue_success(self, mock_debug_log, mock_log, mock_ensure_label,
         # Mock that no open PR exists
         mock_find_open_pr.return_value = None
         mock_check_issues.return_value = True
+        
+        # Explicitly configure for SMARTFIX agent
+        mock_config.CODING_AGENT = CodingAgents.SMARTFIX.name
+        mock_config.GITHUB_REPOSITORY = 'mock/repo'
 
         # Mock successful issue view with labels
         mock_run_command.side_effect = [
@@ -298,6 +304,111 @@ def test_reset_issue_with_open_pr(self, mock_log, mock_find_open_pr):
             "Cannot reset issue #42 because it has an open PR #123: https://github.com/mock/repo/pull/123",
             is_error=True
         )
+        
+    @patch('src.git_handler.check_issues_enabled')
+    @patch('src.git_handler.run_command')
+    @patch('src.git_handler.find_open_pr_for_issue')
+    @patch('src.git_handler.ensure_label')
+    @patch('src.git_handler.log')
+    @patch('src.git_handler.debug_log')
+    @patch('src.git_handler.config')
+    def test_reset_issue_claude_code(self, mock_config, mock_debug_log, mock_log, mock_ensure_label, mock_find_open_pr, mock_run_command, mock_check_issues):
+        """Test resetting a GitHub issue when using Claude Code agent"""
+        # Setup
+        issue_number = 42
+        remediation_label = "smartfix-id:5678"
+
+        # Mock that no open PR exists
+        mock_find_open_pr.return_value = None
+        mock_check_issues.return_value = True
+        
+        # Configure the mock to use CLAUDE_CODE
+        mock_config.CODING_AGENT = CodingAgents.CLAUDE_CODE.name
+        mock_config.GITHUB_REPOSITORY = 'mock/repo'
+
+        # Mock successful issue view with labels and other API calls
+        mock_run_command.side_effect = [
+            # First call - issue view response
+            json.dumps({"labels": [{"name": "contrast-vuln-id:VULN-1234"}, {"name": "smartfix-id:OLD-REM"}]}),
+            # Second call - remove label response
+            "",
+            # Third call - add label response
+            "",
+            # Fourth call - comment with @claude tag
+            ""
+        ]
+        mock_ensure_label.return_value = True
+
+        # Execute
+        result = git_handler.reset_issue(issue_number, remediation_label)
+
+        # Assert
+        mock_check_issues.assert_called_once()
+        self.assertEqual(mock_run_command.call_count, 4)  # Should call run_command 4 times (view, remove label, add label, add comment)
+        self.assertTrue(result)
+        
+        # Check that Claude-specific logic was executed
+        mock_debug_log.assert_any_call("CLAUDE_CODE agent detected need to add a comment and tag @claude for reprocessing")
+        mock_log.assert_any_call(f"Added new comment tagging @claude to issue #{issue_number}")
+        
+        # Verify the comment command
+        comment_command_call = mock_run_command.call_args_list[3]
+        comment_command = comment_command_call[0][0]
+        
+        # Verify command structure
+        self.assertEqual(comment_command[0], "gh")
+        self.assertEqual(comment_command[1], "issue")
+        self.assertEqual(comment_command[2], "comment")
+        self.assertEqual(comment_command[5], str(issue_number))
+        
+        # Verify comment body contains '@claude' and the remediation label
+        comment_body = comment_command[-1]
+        self.assertIn("@claude", comment_body)
+        self.assertIn(remediation_label, comment_body)
+        
+    @patch('src.git_handler.check_issues_enabled')
+    @patch('src.git_handler.run_command')
+    @patch('src.git_handler.find_open_pr_for_issue')
+    @patch('src.git_handler.ensure_label')
+    @patch('src.git_handler.log')
+    @patch('src.git_handler.config')
+    def test_reset_issue_claude_code_error(self, mock_config, mock_log, mock_ensure_label, mock_find_open_pr, mock_run_command, mock_check_issues):
+        """Test resetting a GitHub issue when using Claude Code agent but an error occurs"""
+        # Setup
+        issue_number = 42
+        remediation_label = "smartfix-id:5678"
+
+        # Mock that no open PR exists
+        mock_find_open_pr.return_value = None
+        mock_check_issues.return_value = True
+        
+        # Configure the mock to use CLAUDE_CODE
+        mock_config.CODING_AGENT = CodingAgents.CLAUDE_CODE.name
+        mock_config.GITHUB_REPOSITORY = 'mock/repo'
+
+        # Mock successful label operations but comment command fails
+        mock_run_command.side_effect = [
+            # First call - issue view response
+            json.dumps({"labels": [{"name": "contrast-vuln-id:VULN-1234"}, {"name": "smartfix-id:OLD-REM"}]}),
+            # Second call - remove label response
+            "",
+            # Third call - add label response
+            "",
+            # Fourth call - comment command fails
+            Exception("Failed to comment")
+        ]
+        mock_ensure_label.return_value = True
+
+        # Execute
+        result = git_handler.reset_issue(issue_number, remediation_label)
+
+        # Assert
+        mock_check_issues.assert_called_once()
+        self.assertEqual(mock_run_command.call_count, 4)  # Should still call run_command 4 times
+        self.assertFalse(result)  # Should return False due to the error
+        
+        # Verify error was logged
+        mock_log.assert_any_call(f"Failed to reset issue #{issue_number}: Failed to comment", is_error=True)
 
     @patch('src.git_handler.run_command')
     @patch('src.git_handler.debug_log')