🚨 test(utils-commit-changelog): update tests for run_command signature && add tests for changelog edge cases && enhance commit tests for run_command args

Author: Jannchie

tests/unit/test_changelog.py

@@ -872,3 +872,44 @@ def test_handle_changelog_with_range(self, mock_print, mock_generate, mock_get_r
         mock_get_range.assert_called_once_with(mock_repo_instance, "v1.0.0", "v1.1.0")
         mock_generate.assert_called_once_with(mock_repo_instance, ["segment1"])
         mock_print.assert_called_once_with("generated changelog", None, prepend=False)
+
+    @patch("tgit.changelog.git.Repo")
+    @patch("tgit.changelog.extract_latest_tag_from_changelog")
+    @patch("tgit.changelog.prepare_changelog_segments")
+    @patch("tgit.changelog.get_latest_git_tag")
+    @patch("tgit.changelog.print")
+    def test_handle_changelog_already_up_to_date(self, mock_print, mock_get_latest_tag, mock_prepare, mock_extract, mock_repo):
+        """Test handle_changelog when changelog is already up to date."""
+        mock_repo_instance = Mock()
+        mock_repo.return_value = mock_repo_instance
+
+        mock_extract.return_value = "v1.2.0"
+        mock_get_latest_tag.return_value = "v1.2.0"
+        mock_prepare.return_value = []  # No segments to process
+
+        args = ChangelogArgs(path=".", from_raw=None, to_raw=None, verbose=0, output="CHANGELOG.md")
+
+        with patch("pathlib.Path.exists", return_value=True):
+            handle_changelog(args)
+
+            mock_extract.assert_called_once_with("CHANGELOG.md")
+            mock_prepare.assert_called_once_with(mock_repo_instance, "v1.2.0", None)
+            mock_get_latest_tag.assert_called_once_with(mock_repo_instance)
+            mock_print.assert_called_once_with("[green]Changelog is already up to date.[/green]")
+
+    @patch("tgit.changelog.git.Repo")
+    @patch("tgit.changelog.prepare_changelog_segments")
+    @patch("tgit.changelog.print")
+    def test_handle_changelog_no_changes_no_existing_file(self, mock_print, mock_prepare, mock_repo):
+        """Test handle_changelog when there are no changes and no existing file."""
+        mock_repo_instance = Mock()
+        mock_repo.return_value = mock_repo_instance
+
+        mock_prepare.return_value = []  # No segments to process
+
+        args = ChangelogArgs(path=".", from_raw=None, to_raw=None, verbose=0, output=None)
+
+        handle_changelog(args)
+
+        mock_prepare.assert_called_once_with(mock_repo_instance, None, None)
+        mock_print.assert_called_once_with("[yellow]No changes found, nothing to output.[/yellow]")

tests/unit/test_commit.py

@@ -446,7 +446,11 @@ def test_handle_commit_ai_mode(self, mock_run_command, mock_get_ai_command):
         handle_commit(args)
 
         mock_get_ai_command.assert_called_once_with()
-        mock_run_command.assert_called_once_with("git commit -m 'feat: add feature'")
+        # run_command is called with settings and command
+        mock_run_command.assert_called_once()
+        call_args = mock_run_command.call_args[0]
+        assert len(call_args) == 2
+        assert call_args[1] == "git commit -m 'feat: add feature'"
 
     @patch("tgit.commit.get_ai_command")
     @patch("tgit.commit.run_command")
@@ -458,7 +462,11 @@ def test_handle_commit_no_message(self, mock_run_command, mock_get_ai_command):
         handle_commit(args)
 
         mock_get_ai_command.assert_called_once_with()
-        mock_run_command.assert_called_once_with("git commit -m 'feat: add feature'")
+        # run_command is called with settings and command
+        mock_run_command.assert_called_once()
+        call_args = mock_run_command.call_args[0]
+        assert len(call_args) == 2
+        assert call_args[1] == "git commit -m 'feat: add feature'"
 
     @patch("tgit.commit.get_ai_command")
     @patch("tgit.commit.run_command")
@@ -470,7 +478,11 @@ def test_handle_commit_single_message_valid_type(self, mock_run_command, mock_ge
         handle_commit(args)
 
         mock_get_ai_command.assert_called_once_with(specified_type="feat")
-        mock_run_command.assert_called_once_with("git commit -m 'feat: add feature'")
+        # run_command is called with settings and command
+        mock_run_command.assert_called_once()
+        call_args = mock_run_command.call_args[0]
+        assert len(call_args) == 2
+        assert call_args[1] == "git commit -m 'feat: add feature'"
 
     def test_handle_commit_single_message_invalid_type(self):
         """Test handle_commit with single message (invalid type)."""
@@ -495,7 +507,8 @@ def test_handle_commit_full_message(self, mock_settings, mock_run_command, mock_
         mock_get_commit_command.assert_called_once_with(
             "feat", None, "add feature", use_emoji=False, is_breaking=False
         )
-        mock_run_command.assert_called_once_with("git commit -m 'feat: add feature'")
+        # run_command is called with settings and command
+        mock_run_command.assert_called_once_with(mock_settings, "git commit -m 'feat: add feature'")
 
     @patch("tgit.commit.get_commit_command")
     @patch("tgit.commit.run_command")
@@ -511,7 +524,8 @@ def test_handle_commit_with_scope(self, mock_settings, mock_run_command, mock_ge
         mock_get_commit_command.assert_called_once_with(
             "feat", "auth", "add login", use_emoji=False, is_breaking=False
         )
-        mock_run_command.assert_called_once_with("git commit -m 'feat(auth): add login'")
+        # run_command is called with settings and command
+        mock_run_command.assert_called_once_with(mock_settings, "git commit -m 'feat(auth): add login'")
 
     @patch("tgit.commit.get_commit_command")
     @patch("tgit.commit.run_command")
@@ -527,6 +541,8 @@ def test_handle_commit_with_emoji_override(self, mock_settings, mock_run_command
         mock_get_commit_command.assert_called_once_with(
             "feat", None, "add feature", use_emoji=True, is_breaking=False
         )
+        # run_command is called with settings and command
+        mock_run_command.assert_called_once_with(mock_settings, "git commit -m '✨ feat: add feature'")
 
     def test_handle_commit_invalid_type_in_full_message(self):
         """Test handle_commit with invalid type in full message."""

tests/unit/test_utils.py

@@ -4,6 +4,7 @@
 import sys
 
 from tgit.utils import run_command, simple_run_command, get_commit_command, type_emojis
+from tgit.types import TGitSettings, CommitSettings
 
 
 class TestRunCommand:
@@ -16,9 +17,14 @@ def test_run_command_user_confirms(self, mock_confirm, mock_popen):
         process_mock = mock_popen.return_value
         process_mock.communicate.return_value = (b"output", b"")
         process_mock.returncode = 0
+        settings = TGitSettings(
+            commit=CommitSettings(emoji=False, types=[]),
+            api_key="", api_url="", model="",
+            show_command=False, skip_confirm=False
+        )
 
         # Act
-        run_command("echo 'test'")
+        run_command(settings, "echo 'test'")
 
         # Assert
         mock_confirm.assert_called_once_with("Do you want to continue?", default=True)
@@ -30,89 +36,102 @@ def test_run_command_user_cancels(self, mock_confirm, mock_popen):
         """Test run_command when user cancels execution."""
         # Arrange
         mock_confirm.return_value.ask.return_value = False
+        settings = TGitSettings(
+            commit=CommitSettings(emoji=False, types=[]),
+            api_key="", api_url="", model="",
+            show_command=False, skip_confirm=False
+        )
 
         # Act
-        run_command("echo 'test'")
+        run_command(settings, "echo 'test'")
 
         # Assert
         mock_confirm.assert_called_once_with("Do you want to continue?", default=True)
         mock_popen.assert_not_called()
 
-    @patch("tgit.utils.settings")
     @patch("tgit.utils.subprocess.Popen")
     @patch("tgit.utils.questionary.confirm")
-    def test_run_command_skip_confirm(self, mock_confirm, mock_popen, mock_settings):
+    def test_run_command_skip_confirm(self, mock_confirm, mock_popen):
         """Test run_command when skip_confirm is True."""
         # Arrange
-        mock_settings.skip_confirm = True
-        mock_settings.show_command = False
+        settings = TGitSettings(
+            commit=CommitSettings(emoji=False, types=[]),
+            api_key="", api_url="", model="",
+            show_command=False, skip_confirm=True
+        )
         process_mock = mock_popen.return_value
         process_mock.communicate.return_value = (b"output", b"")
         process_mock.returncode = 0
 
         # Act
-        run_command("echo 'test'")
+        run_command(settings, "echo 'test'")
 
         # Assert
         mock_confirm.assert_not_called()
         mock_popen.assert_called_once()
 
-    @patch("tgit.utils.settings")
     @patch("tgit.utils.console.print")
     @patch("tgit.utils.subprocess.Popen")
     @patch("tgit.utils.questionary.confirm")
-    def test_run_command_show_command(self, mock_confirm, mock_popen, mock_console_print, mock_settings):
+    def test_run_command_show_command(self, mock_confirm, mock_popen, mock_console_print):
         """Test run_command when show_command is True."""
         # Arrange
-        mock_settings.show_command = True
-        mock_settings.skip_confirm = False
+        settings = TGitSettings(
+            commit=CommitSettings(emoji=False, types=[]),
+            api_key="", api_url="", model="",
+            show_command=True, skip_confirm=False
+        )
         mock_confirm.return_value.ask.return_value = True
         process_mock = mock_popen.return_value
         process_mock.communicate.return_value = (b"output", b"")
         process_mock.returncode = 0
 
         # Act
-        run_command("echo 'test'")
+        run_command(settings, "echo 'test'")
 
         # Assert
         assert mock_console_print.call_count >= 1
         mock_confirm.assert_called_once()
         mock_popen.assert_called_once()
 
-    @patch("tgit.utils.settings")
     @patch("tgit.utils.subprocess.Popen")
     @patch("tgit.utils.questionary.confirm")
     @patch("tgit.utils.sys.stderr.write")
-    def test_run_command_error_handling(self, mock_stderr_write, mock_confirm, mock_popen, mock_settings):
+    def test_run_command_error_handling(self, mock_stderr_write, mock_confirm, mock_popen):
         """Test run_command error handling."""
         # Arrange
-        mock_settings.skip_confirm = True
-        mock_settings.show_command = False
+        settings = TGitSettings(
+            commit=CommitSettings(emoji=False, types=[]),
+            api_key="", api_url="", model="",
+            show_command=False, skip_confirm=True
+        )
         mock_confirm.return_value.ask.return_value = True
         process_mock = mock_popen.return_value
         process_mock.communicate.return_value = (b"", b"error message")
         process_mock.returncode = 1
 
         # Act
-        run_command("failing command")
+        run_command(settings, "failing command")
 
         # Assert
         mock_stderr_write.assert_called_once_with("error message")
 
-    @patch("tgit.utils.settings")
     @patch("tgit.utils.subprocess.Popen")
     @patch("tgit.utils.questionary.confirm")
-    def test_run_command_multiple_commands(self, mock_confirm, mock_popen, mock_settings):
+    def test_run_command_multiple_commands(self, mock_confirm, mock_popen):
         """Test run_command with multiple commands."""
         # Arrange
-        mock_settings.skip_confirm = True
-        mock_settings.show_command = False
+        settings = TGitSettings(
+            commit=CommitSettings(emoji=False, types=[]),
+            api_key="", api_url="", model="",
+            show_command=False, skip_confirm=True
+        )
         process_mock = mock_popen.return_value
         process_mock.communicate.return_value = (b"output", b"")
         process_mock.returncode = 0
 
         # Act
-        run_command("echo 'first'\necho 'second'")
+        run_command(settings, "echo 'first'\necho 'second'")
 
         # Assert
         assert mock_popen.call_count == 2