Jmaa/aider-gitea
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Activity

has_commits_on_branch should use get_commit_messages internally #82

Merged
Jmaa merged 2 commits from issue-73-hascommitsonbranch-should-use-getcommitmessages-internally into main 2025-04-15 22:09:06 +00:00
Conversation 0 Commits 2 Files Changed 2 +22 -16
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d196155bf7 - Show all commits

38
test/test_has_commits_on_branch.py
View File

@ -1,10 +1,7 @@
import subprocess
from pathlib import Path
from unittest.mock import patch, MagicMock
from unittest.mock import patch
import pytest
from aider_gitea import has_commits_on_branch, get_commit_messages
from aider_gitea import has_commits_on_branch
class TestHasCommitsOnBranch:
@ -17,32 +14,41 @@ class TestHasCommitsOnBranch:
def test_has_commits_true(self, mock_get_commit_messages):
# Setup mock to return some commit messages
mock_get_commit_messages.return_value = ['Commit 1', 'Commit 2']
# Test function returns True when there are commits
assert has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) is True
assert (
has_commits_on_branch(self.cwd, self.base_branch, self.current_branch)
is True
)
# Verify get_commit_messages was called with correct arguments
mock_get_commit_messages.assert_called_once_with(
self.cwd, self.base_branch, self.current_branch
self.cwd, self.base_branch, self.current_branch,
)
@patch('aider_gitea.get_commit_messages')
def test_has_commits_false(self, mock_get_commit_messages):
# Setup mock to return empty list
mock_get_commit_messages.return_value = []
# Test function returns False when there are no commits
assert has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) is False
assert (
has_commits_on_branch(self.cwd, self.base_branch, self.current_branch)
is False
)
# Verify get_commit_messages was called with correct arguments
mock_get_commit_messages.assert_called_once_with(
self.cwd, self.base_branch, self.current_branch
self.cwd, self.base_branch, self.current_branch,
)
@patch('aider_gitea.get_commit_messages')
def test_has_commits_exception(self, mock_get_commit_messages):
# Setup mock to raise an exception
mock_get_commit_messages.side_effect = Exception("Git command failed")
mock_get_commit_messages.side_effect = Exception('Git command failed')
# Test function returns False when an exception occurs
assert has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) is False
assert (
has_commits_on_branch(self.cwd, self.base_branch, self.current_branch)
is False
)