fix: bugs for ignoring stdout and stderr

Author: golesuman

src/commitlint/cli.py

@@ -135,22 +135,25 @@ def _handle_commit_message(
     Args:
         commit_message (str): The commit message to be handled.
         skip_detail (bool): Whether to skip the detailed error linting.
-        quiet (bool): Whether to print the detailed errors
+        quiet (bool): Whether to ignore stout and stderr
 
     Raises:
         SystemExit: If the commit message is invalid.
     """
     success, errors = lint_commit_message(commit_message, skip_detail=skip_detail)
 
-    if quiet and errors:
+    if quiet and not success:
         sys.exit(1)
 
-    elif not quiet:
-        if success:
+    if success:
+        if not quiet:
             sys.stdout.write(f"{VALIDATION_SUCCESSFUL}\n")
-        else:
+
+    if not success:
+        if not quiet:
             _show_errors(commit_message, errors, skip_detail=skip_detail)
-            sys.exit(1)
+
+        sys.exit(1)
 
 
 def _handle_multiple_commit_messages(
@@ -166,19 +169,19 @@ def _handle_multiple_commit_messages(
     Raises:
         SystemExit: If any of the commit messages is invalid.
     """
-    # if not quiet:
     has_error = False
     for commit_message in commit_messages:
         success, errors = lint_commit_message(commit_message, skip_detail=skip_detail)
-        if not success and not quiet:
+        if not success:
             has_error = True
-            _show_errors(commit_message, errors, skip_detail=skip_detail)
-            sys.stderr.write("\n")
+            if not quiet:
+                _show_errors(commit_message, errors, skip_detail=skip_detail)
+                sys.stderr.write("\n")
 
     if has_error:
         sys.exit(1)
 
-    elif not has_error and not quiet:
+    if not quiet:
         sys.stdout.write(f"{VALIDATION_SUCCESSFUL}\n")
 
 

tests/test_cli.py

@@ -325,29 +325,25 @@ def test__main__handle_exceptions(
         mock_stderr_write.assert_called_with("Test message\n")
 
     @patch(
-        "argparse.ArgumentParser.parse_args",
+        "commitlint.cli.get_args",
         return_value=MagicMock(
             commit_message="Invalid commit message",
             file=None,
             hash=None,
             from_hash=None,
+            skip_detail=False,
             quiet=True,
         ),
     )
-    @patch(
-        "commitlint.cli.lint_commit_message",
-    )
+    @patch("sys.stdout.write")
     @patch("sys.stderr.write")
     @patch("sys.exit")
-    def test__main__handle_quiet_option(
-        self, mock_sys_exit, mock_stderr_write, mock_lint_commit_message, *_
+    def test__main__quiet_option_with_invalid_commit_message(
+        self, mock_sys_exit, mock_stderr_write, mock_stdout_write, *_
     ):
-        mock_lint_commit_message.side_effect = CommitlintException(
-            "Invalid commit message"
-        )
         main()
-        mock_sys_exit.assert_called_with(1)
-        mock_stderr_write.assert_called_with("Invalid commit message\n")
+        mock_stderr_write.assert_not_called()
+        mock_stdout_write.assert_not_called()
 
     @patch(
         "commitlint.cli.get_args",
@@ -370,3 +366,51 @@ def test__main__quiet_option_with_valid_commit_message(
         mock_stderr_write.assert_not_called()
         mock_stdout_write.assert_not_called()
         mock_sys_exit.assert_not_called()
+
+    @patch(
+        "commitlint.cli.get_args",
+        return_value=MagicMock(
+            file=None,
+            hash=None,
+            from_hash="start_commit_hash",
+            to_hash="end_commit_hash",
+            skip_detail=False,
+            quiet=True,
+        ),
+    )
+    @patch("commitlint.cli.get_commit_messages_of_hash_range")
+    @patch("sys.stdout.write")
+    def test__valid_commit_message_with_hash_range_in_quiet(
+        self, mock_stdout_write, mock_get_commit_messages, *_
+    ):
+        mock_get_commit_messages.return_value = [
+            "feat: commit message 1",
+            "fix: commit message 2",
+        ]
+        main()
+        mock_stdout_write.assert_not_called()
+
+    @patch(
+        "commitlint.cli.get_args",
+        return_value=MagicMock(
+            file=None,
+            hash=None,
+            from_hash="start_commit_hash",
+            to_hash="end_commit_hash",
+            skip_detail=False,
+            quiet=True,
+        ),
+    )
+    @patch("commitlint.cli.get_commit_messages_of_hash_range")
+    @patch("sys.exit")
+    @patch("sys.stdout.write")
+    def test__invalid_commit_message_with_hash_range_in_quiet(
+        self, mock_stdout_write, mock_sys_exit, mock_get_commit_messages, *_
+    ):
+        mock_get_commit_messages.return_value = [
+            "Invalid commit message 1",
+            "Invalid commit message 2",
+        ]
+        main()
+        mock_sys_exit.assert_called_once_with(1)
+        mock_stdout_write.assert_not_called()