fix(commit): fix some code and test according to suggestions

Author: yjaw

commitizen/cli.py

@@ -168,7 +168,6 @@ def __call__(
                     {
                         "name": ["--body-length-limit"],
                         "type": int,
-                        "default": 0,
                         "help": "Set the length limit of the commit body. Commit message in body will be rewrapped to this length; 0 for no limit.",
                     },
                     {

commitizen/commands/commit.py

@@ -5,9 +5,9 @@
 import shutil
 import subprocess
 import tempfile
-from pathlib import Path
 import textwrap
 from itertools import chain
+from pathlib import Path
 from typing import TYPE_CHECKING, TypedDict
 
 import questionary
@@ -106,7 +106,7 @@ def _validate_subject_length(self, message: str) -> None:
 
     def _wrap_body(self, message: str) -> str:
         """
-        Wrap the body of the commit message to the specified length.
+        Wrap the body of the commit message to the --body-length-limit length.
         """
 
         body_length_limit = self.arguments.get(
@@ -120,11 +120,11 @@ def _wrap_body(self, message: str) -> str:
         if len(lines) < 3:
             return message
 
-        # First line is subject, second is blank line, rest is body
-        wrapped_body_lines = [
+        # First line is subject, second is blank line, rest are body lines
+        wrapped_body_lines = chain.from_iterable(
             textwrap.wrap(line, width=body_length_limit) for line in lines[2:]
-        ]
-        return "\n".join(chain(lines[:2], chain.from_iterable(wrapped_body_lines)))
+        )
+        return "\n".join(chain(lines[:2], wrapped_body_lines))
 
     def manual_edit(self, message: str) -> str:
         editor = git.get_core_editor()

tests/commands/test_commit_command.py

@@ -386,8 +386,8 @@ def test_commit_command_with_config_message_length_limit(
             id="wrapping",
         ),
         pytest.param(
-            "Line1 that is very long and exceeds the limit\nLine2 that is very long and exceeds the limit\nLine3 that is very long and exceeds the limit",
-            72,
+            "Line1 is shorter than the limit but has newline\nLine2 is shorter than the limit but has newline\nLine3 is shorter than the limit but has newline",
+            100,
             id="preserves_line_breaks",
         ),
         pytest.param(
@@ -409,6 +409,7 @@ def test_commit_command_body_length_limit(
     success_mock: MockType,
     commit_mock,
     mocker: MockFixture,
+    file_regression,
 ):
     """Parameterized test for body_length_limit feature with file regression."""
     mocker.patch(
@@ -426,6 +427,7 @@ def test_commit_command_body_length_limit(
     commands.Commit(config, {"body_length_limit": body_length_limit})()
     success_mock.assert_called_once()
     committed_message = commit_mock.call_args[0][0]
+    file_regression.check(committed_message, extension=".txt")
 
     lines = committed_message.split("\n")
     body_lines = lines[2:]  # Skip subject and blank line

…t_command_body_length_limit_disabled.txt …_command_body_length_limit_disabled_.txttests/commands/test_commit_command/test_commit_command_body_length_limit_disabled.txt renamed to tests/commands/test_commit_command/test_commit_command_body_length_limit_disabled_.txt tests/commands/test_commit_command/test_commit_command_body_length_limit_disabled.txt renamed to tests/commands/test_commit_command/test_commit_command_body_length_limit_disabled_.txt

@@ -0,0 +1,5 @@
+feat: add feature
+
+Line1 is shorter than the limit but has newline
+Line2 is shorter than the limit but has newline
+Line3 is shorter than the limit but has newline