Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

integration: Remove branch names from Gitea edited PR event. 

This is a follow up to #24673, we want to modify every webhook events to
follow the same pattern and consistency where branch name should only
show on opened and merged events.
This commit is contained in:
Joelute 2023-04-07 17:41:47 -04:00 committed by Tim Abbott
parent 95d48bc2ad
commit 946b4e73ca
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/webhooks/gitea/tests.py
View File

@ -36,7 +36,9 @@ class GiteaHookTests(WebhookTestCase):
def test_pull_request_edited(self) -> None: def test_pull_request_edited(self) -> None:
expected_topic = "test / PR #1906 test 2" expected_topic = "test / PR #1906 test 2"
expected_message = """kostekIV edited [PR #5](https://try.gitea.io/kostekIV/test/pulls/5) from `d` to `master`.""" expected_message = (
"""kostekIV edited [PR #5](https://try.gitea.io/kostekIV/test/pulls/5)."""
)
self.check_webhook("pull_request__edited", expected_topic, expected_message) self.check_webhook("pull_request__edited", expected_topic, expected_message)
def test_pull_request_reopened(self) -> None: def test_pull_request_reopened(self) -> None:

7
zerver/webhooks/gitea/view.py
View File

@ -28,8 +28,11 @@ def format_pull_request_event(payload: WildValue, include_title: bool = False) -
url = payload["pull_request"]["html_url"].tame(check_string) url = payload["pull_request"]["html_url"].tame(check_string)
number = payload["pull_request"]["number"].tame(check_int) number = payload["pull_request"]["number"].tame(check_int)
target_branch = payload["pull_request"]["head"]["ref"].tame(check_string) target_branch = None
base_branch = payload["pull_request"]["base"]["ref"].tame(check_string) base_branch = None
if action != "edited":
target_branch = payload["pull_request"]["head"]["ref"].tame(check_string)
base_branch = payload["pull_request"]["base"]["ref"].tame(check_string)
title = payload["pull_request"]["title"].tame(check_string) if include_title else None title = payload["pull_request"]["title"].tame(check_string) if include_title else None
stringified_assignee = assignee["login"].tame(check_string) if assignee else None stringified_assignee = assignee["login"].tame(check_string) if assignee else None