entrouvert
/
gitea-redmine
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed comments from review-related events
gitea-wip/gitea-redmine/pipeline/pr-main This commit looks good Details
gitea-wip/gitea-redmine/pipeline/head This commit looks good Details

This commit is contained in:
Agate 2022-11-29 14:48:46 +01:00
parent db10f71394
commit 43c9610cab
2 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gitea_redmine.py
View File

@ -260,18 +260,16 @@ handle_pull_request_approved = make_handler(
set_status(REDMINE_STATUSES['Solution proposée'], unless=CLOSED_STATUSES),
save(),
set_status(REDMINE_STATUSES['Solution validée'], unless=CLOSED_STATUSES),
set_value_if_empty("review_content", "N/A"),
add_note(
'{sender_full_name} ({sender_username}) a approuvé une pull request sur Gitea concernant cette demande :\n\n* URL : {pull_request_url}\n* Commentaire :\n\n{review_content}'
'{sender_full_name} ({sender_username}) a approuvé une pull request sur Gitea concernant cette demande :\n\n* URL : {pull_request_url}'
),
save(),
)
handle_pull_request_rejected = make_handler(
set_status(REDMINE_STATUSES['En cours'], unless=CLOSED_STATUSES),
set_value_if_empty("review_content", "N/A"),
add_note(
'{sender_full_name} ({sender_username}) a relu et demandé des modifications sur une pull request sur Gitea concernant cette demande :\n\n* URL : {pull_request_url}\n* Commentaire :\n\n{review_content}'
'{sender_full_name} ({sender_username}) a relu et demandé des modifications sur une pull request sur Gitea concernant cette demande :\n\n* URL : {pull_request_url}'
),
save(),
)

40
test_app.py
View File

@ -267,8 +267,7 @@ def test_handle_pull_request_reviewed_approved(mocker):
assert issue.status_id == gitea_redmine.REDMINE_STATUSES['Solution validée']
assert issue.notes == (
'Test User (testuser) a approuvé une pull request sur Gitea concernant cette demande :\n\n'
'* URL : https://gitea.entrouvert.org/entrouvert/gitea-redmine/pulls/2\n'
'* Commentaire :\n\nOkay pour moi'
'* URL : https://gitea.entrouvert.org/entrouvert/gitea-redmine/pulls/2'
)
issue.save.assert_called()
@ -301,46 +300,11 @@ def test_handle_pull_request_reviewed_rejected(mocker):
assert issue.status_id == gitea_redmine.REDMINE_STATUSES['En cours']
assert issue.notes == (
'Test User (testuser) a relu et demandé des modifications sur une pull request sur Gitea concernant cette demande :\n\n'
'* URL : https://gitea.entrouvert.org/entrouvert/gitea-redmine/pulls/2\n'
'* Commentaire :\n\nDes choses à changer'
'* URL : https://gitea.entrouvert.org/entrouvert/gitea-redmine/pulls/2'
)
issue.save.assert_called_once()
def test_handle_pull_request_reviewed_approved_empty_comment(mocker):
payload = {
"action": "reviewed",
"number": 2,
"pull_request": {
"id": 7,
"url": "https://gitea.entrouvert.org/entrouvert/gitea-redmine/pulls/2",
"number": 2,
"title": "Foo",
"body": "See #70893",
"merged": True,
},
"sender": {
"id": 7,
"login": "testuser",
"full_name": "Test User",
"email": "test_user@noreply.gitea.entrouvert.org",
"username": "testuser",
},
"review": {"type": "pull_request_review_approved", "content": ""},
}
issue = mocker.Mock()
gitea_redmine.handle_pull_request_approved(issue, payload)
assert issue.status_id == gitea_redmine.REDMINE_STATUSES["Solution validée"]
assert issue.notes == (
"Test User (testuser) a approuvé une pull request sur Gitea concernant cette demande :\n\n"
"* URL : https://gitea.entrouvert.org/entrouvert/gitea-redmine/pulls/2\n"
"* Commentaire :\n\nN/A"
)
issue.save.assert_called()
def test_handle_pull_request_merged(mocker):
payload = {
"action": "closed",