💄 style(tests): format test code for consistency

Author: Jannchie

pyproject.toml

@@ -63,6 +63,7 @@ ignore = [
     "TRY300",
     "A004",
     "FBT003",
+    "COM812",
 ]
 
 [tool.ruff.lint.per-file-ignores]

pyrightconfig.json

@@ -1,5 +1,5 @@
 {
     "exclude": [
-        "tests"
-    ]
-}
+        "tests",
+    ],
+}

tests/unit/test_add.py

@@ -13,7 +13,7 @@ def test_add_single_file(self, mock_simple_run_command):
         """Test adding a single file"""
         runner = CliRunner()
         result = runner.invoke(add, ["test.txt"])
-        
+
         assert result.exit_code == 0
         mock_simple_run_command.assert_called_once_with("git add test.txt")
 
@@ -22,7 +22,7 @@ def test_add_multiple_files(self, mock_simple_run_command):
         """Test adding multiple files"""
         runner = CliRunner()
         result = runner.invoke(add, ["file1.txt", "file2.py", "file3.md"])
-        
+
         assert result.exit_code == 0
         mock_simple_run_command.assert_called_once_with("git add file1.txt file2.py file3.md")
 
@@ -31,7 +31,7 @@ def test_add_files_with_spaces(self, mock_simple_run_command):
         """Test adding files with spaces in names"""
         runner = CliRunner()
         result = runner.invoke(add, ["file with spaces.txt", "another file.py"])
-        
+
         assert result.exit_code == 0
         mock_simple_run_command.assert_called_once_with("git add file with spaces.txt another file.py")
 
@@ -40,7 +40,7 @@ def test_add_empty_list(self, mock_simple_run_command):
         """Test adding empty file list"""
         runner = CliRunner()
         result = runner.invoke(add, [])
-        
+
         # Since files argument is required=True, this should fail
         assert result.exit_code == 2
         mock_simple_run_command.assert_not_called()
@@ -50,7 +50,7 @@ def test_add_files_with_special_characters(self, mock_simple_run_command):
         """Test adding files with special characters"""
         runner = CliRunner()
         result = runner.invoke(add, ["file-with-dashes.txt", "file_with_underscores.py", "file.with.dots.md"])
-        
+
         assert result.exit_code == 0
         mock_simple_run_command.assert_called_once_with("git add file-with-dashes.txt file_with_underscores.py file.with.dots.md")
 
@@ -59,8 +59,8 @@ def test_add_propagates_exception(self, mock_simple_run_command):
         """Test that exceptions from simple_run_command are propagated"""
         mock_simple_run_command.side_effect = Exception("Git command failed")
         runner = CliRunner()
-        
+
         result = runner.invoke(add, ["test.txt"])
-        
+
         # Exception should cause non-zero exit code
         assert result.exit_code != 0

tests/unit/test_changelog.py

@@ -1,11 +1,7 @@
 """Tests for changelog module."""
 
-import pytest
-from unittest.mock import Mock, patch, mock_open, MagicMock
-from pathlib import Path
+from unittest.mock import Mock, patch, mock_open
 from datetime import datetime, UTC
-import git
-import re
 from click.testing import CliRunner
 
 
@@ -92,9 +88,9 @@ def test_heading_rich_console_h1(self):
         heading.text = Text("Main Title")
         console = Console()
         options = Mock()
-        
+
         result = list(heading.__rich_console__(console, options))
-        
+
         assert len(result) == 3  # Empty line, title, empty line
         assert result[0].plain == ""  # Empty line before
         assert result[1].plain == "# Main Title"
@@ -106,9 +102,9 @@ def test_heading_rich_console_h2(self):
         heading.text = Text("Subtitle")
         console = Console()
         options = Mock()
-        
+
         result = list(heading.__rich_console__(console, options))
-        
+
         assert len(result) == 2  # Empty line, title
         assert result[0].plain == ""  # Empty line before
         assert result[1].plain == "## Subtitle"
@@ -119,9 +115,9 @@ def test_heading_rich_console_h3(self):
         heading.text = Text("Sub-subtitle")
         console = Console()
         options = Mock()
-        
+
         result = list(heading.__rich_console__(console, options))
-        
+
         assert len(result) == 1  # Only title
         assert result[0].plain == "### Sub-subtitle"
 
@@ -845,7 +841,7 @@ def test_changelog_function_defaults(self, mock_handle):
         """Test changelog function with default arguments."""
         runner = CliRunner()
         result = runner.invoke(changelog, ["."])
-        
+
         assert result.exit_code == 0
         mock_handle.assert_called_once()
         # Get the actual args passed to handle_changelog - it should be a ChangelogArgs object
@@ -861,7 +857,7 @@ def test_changelog_function_with_output_flag(self, mock_handle):
         """Test changelog function with output flag."""
         runner = CliRunner()
         result = runner.invoke(changelog, [".", "--output", ""])
-        
+
         assert result.exit_code == 0
         mock_handle.assert_called_once()
         args = mock_handle.call_args[0][0]
@@ -872,7 +868,7 @@ def test_changelog_function_with_custom_args(self, mock_handle):
         """Test changelog function with custom arguments."""
         runner = CliRunner()
         result = runner.invoke(changelog, ["/tmp", "--from", "v1.0.0", "--to", "v1.1.0", "-vv", "--output", "custom.md"])  # noqa: S108
-        
+
         assert result.exit_code == 0
         mock_handle.assert_called_once()
         args = mock_handle.call_args[0][0]
@@ -1006,7 +1002,7 @@ def test_prepare_changelog_segments_no_tags(self, mock_first_commit, mock_get_la
 
         with patch("tgit.changelog.print") as mock_print:
             result = prepare_changelog_segments(mock_repo)
-            
+
             assert result == []
             mock_print.assert_called_once_with("[yellow]No tags found in the repository.[/yellow]")
 
@@ -1015,24 +1011,24 @@ def test_prepare_changelog_segments_no_tags(self, mock_first_commit, mock_get_la
     def test_prepare_changelog_segments_with_tags(self, mock_first_commit, mock_get_latest_tag):
         """Test prepare_changelog_segments with tags in repository."""
         mock_repo = Mock()
-        
+
         # Create mock tags
         mock_tag1 = Mock()
         mock_tag1.name = "v1.0.0"
         mock_tag1.commit.hexsha = "def456"
         mock_tag1.commit.committed_datetime = datetime(2023, 1, 1, tzinfo=UTC)
-        
+
         mock_tag2 = Mock()
         mock_tag2.name = "v2.0.0"
         mock_tag2.commit.hexsha = "ghi789"
         mock_tag2.commit.committed_datetime = datetime(2023, 2, 1, tzinfo=UTC)
-        
+
         mock_repo.tags = [mock_tag1, mock_tag2]
         mock_first_commit.return_value = "abc123"
         mock_get_latest_tag.return_value = "v2.0.0"
 
         result = prepare_changelog_segments(mock_repo)
-        
+
         assert len(result) >= 1
         # Should have version segments created
 
@@ -1041,18 +1037,18 @@ def test_prepare_changelog_segments_with_tags(self, mock_first_commit, mock_get_
     def test_prepare_changelog_segments_with_current_tag(self, mock_first_commit, mock_get_latest_tag):
         """Test prepare_changelog_segments with current tag specified."""
         mock_repo = Mock()
-        
+
         mock_tag1 = Mock()
         mock_tag1.name = "v1.0.0"
         mock_tag1.commit.hexsha = "def456"
         mock_tag1.commit.committed_datetime = datetime(2023, 1, 1, tzinfo=UTC)
-        
+
         mock_repo.tags = [mock_tag1]
         mock_first_commit.return_value = "abc123"
         mock_get_latest_tag.return_value = "v1.0.0"
 
         result = prepare_changelog_segments(mock_repo, current_tag="v2.0.0")
-        
+
         assert len(result) >= 1
 
 
@@ -1065,14 +1061,14 @@ def test_get_range_segments_basic(self, mock_prepare, mock_range):
         """Test _get_range_segments basic functionality."""
         mock_repo = Mock()
         mock_range.return_value = ("v1.0.0", "v2.0.0")
-        
+
         # Create mock segments
         segment1 = VersionSegment(from_hash="abc123", to_hash="def456", from_name="v1.0.0", to_name="v1.1.0")
         segment2 = VersionSegment(from_hash="def456", to_hash="ghi789", from_name="v1.1.0", to_name="v2.0.0")
         mock_prepare.return_value = [segment1, segment2]
-        
+
         result = _get_range_segments(mock_repo, "v1.0.0", "v2.0.0")
-        
+
         assert len(result) >= 0
 
 
@@ -1082,9 +1078,9 @@ class TestGenerateChangelogsFromSegments:
     def test_generate_changelogs_from_segments_empty(self):
         """Test _generate_changelogs_from_segments with empty segments."""
         mock_repo = Mock()
-        
+
         result = _generate_changelogs_from_segments(mock_repo, [])
-        
+
         assert result == ""
 
     @patch("tgit.changelog._process_commits")
@@ -1095,16 +1091,16 @@ def test_generate_changelogs_from_segments_with_segments(self, mock_uri_safe, mo
         """Test _generate_changelogs_from_segments with actual segments."""
         mock_repo = Mock()
         mock_repo.iter_commits.return_value = [Mock(), Mock()]
-        
+
         mock_process.return_value = [Mock(), Mock()]
         mock_group.return_value = {"feat": [Mock()]}
         mock_generate.return_value = "## v1.1.0\n\n### Features\n\n- New feature\n\n"
         mock_uri_safe.return_value = "https://github.com/user/repo"
-        
+
         segment = VersionSegment(from_hash="abc123", to_hash="def456", from_name="v1.0.0", to_name="v1.1.0")
-        
+
         result = _generate_changelogs_from_segments(mock_repo, [segment])
-        
+
         assert "v1.1.0" in result
 
 
@@ -1115,29 +1111,29 @@ def test_get_remote_uri_safe_success(self):
         """Test _get_remote_uri_safe when remote URL is available."""
         mock_repo = Mock()
         mock_repo.remote.return_value.url = "https://github.com/user/repo.git"
-        
+
         with patch("tgit.changelog.get_remote_uri") as mock_get_uri:
             mock_get_uri.return_value = "https://github.com/user/repo"
             result = _get_remote_uri_safe(mock_repo)
-            
+
             assert result == "https://github.com/user/repo"
             mock_get_uri.assert_called_once_with("https://github.com/user/repo.git")
 
     def test_get_remote_uri_safe_value_error(self):
         """Test _get_remote_uri_safe when ValueError is raised."""
         mock_repo = Mock()
         mock_repo.remote.side_effect = ValueError("Origin not found")
-        
+
         result = _get_remote_uri_safe(mock_repo)
-        
+
         assert result is None
 
 
 class TestGetChangelogByRange:
     """Test get_changelog_by_range function."""
 
     @patch("tgit.changelog.get_commits")
-    @patch("tgit.changelog.group_commits_by_type") 
+    @patch("tgit.changelog.group_commits_by_type")
     @patch("tgit.changelog.generate_changelog")
     @patch("tgit.changelog.get_remote_uri")
     def test_get_changelog_by_range_success(self, mock_get_uri, mock_generate, mock_group, mock_commits):
@@ -1148,10 +1144,10 @@ def test_get_changelog_by_range_success(self, mock_get_uri, mock_generate, mock_
         mock_group.return_value = {"feat": [Mock()]}
         mock_generate.return_value = "changelog content"
         mock_get_uri.return_value = "https://github.com/user/repo"
-        
+
         result = get_changelog_by_range(mock_repo, "v1.0.0", "v2.0.0")
-        
+
         assert result == "changelog content"
-        mock_commits.assert_called_once_with(mock_repo, "v1.0.0", "v2.0.0") 
+        mock_commits.assert_called_once_with(mock_repo, "v1.0.0", "v2.0.0")
         mock_group.assert_called_once()
         mock_generate.assert_called_once()

tests/unit/test_cli.py

@@ -32,9 +32,9 @@ def test_version_callback_true(self, mock_print, mock_version):
         mock_ctx = MagicMock()
         mock_ctx.resilient_parsing = False
         mock_param = MagicMock()
-        
+
         version_callback(ctx=mock_ctx, _param=mock_param, value=True)
-        
+
         mock_version.assert_called_once_with("tgit")
         mock_print.assert_called_once_with("TGIT - ver.1.0.0", highlight=False)
         mock_ctx.exit.assert_called_once()
@@ -46,9 +46,9 @@ def test_version_callback_false(self, mock_print, mock_version):
         mock_ctx = MagicMock()
         mock_ctx.resilient_parsing = False
         mock_param = MagicMock()
-        
+
         version_callback(ctx=mock_ctx, _param=mock_param, value=False)
-        
+
         mock_version.assert_not_called()
         mock_print.assert_not_called()
         mock_ctx.exit.assert_not_called()
@@ -58,10 +58,10 @@ def test_app_starts_openai_import_thread(self, mock_thread):
         """Test that app starts a thread for OpenAI import"""
         mock_thread_instance = MagicMock()
         mock_thread.return_value = mock_thread_instance
-        
+
         # Directly call the app function to test the callback
         app.callback()
-        
+
         # The app should run the callback and start the thread
         mock_thread.assert_called_once()
         mock_thread_instance.start.assert_called_once()
@@ -71,14 +71,14 @@ def test_openai_import_function(self):
         # We can't easily test the actual import function directly since it's nested,
         # but we can test that threading works and doesn't raise exceptions
         import_called = threading.Event()
-        
+
         def mock_import():
             import_called.set()
-        
+
         thread = threading.Thread(target=mock_import)
         thread.start()
         thread.join(timeout=1)
-        
+
         assert import_called.is_set()
 
     def test_app_callback_registration(self):