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

integrations: Use new function in Github releases. 

Use get_release_event_message from webhooks/git.py to format release
events using the newly implemented release message template.

Tweaked by tabbott to handle name=None.

Builds on #14746. Proposed in #14934.
This commit is contained in:
cestrell 2020-05-11 20:39:57 -04:00 committed by Tim Abbott
parent e3f0b2f20f
commit 297185cc12
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/webhooks/github/tests.py
View File

@ -206,7 +206,7 @@ class GithubWebhookTest(WebhookTestCase):
self.send_and_test_stream_message('team_add', self.EXPECTED_TOPIC_REPO_EVENTS, expected_message) self.send_and_test_stream_message('team_add', self.EXPECTED_TOPIC_REPO_EVENTS, expected_message)
def test_release_msg(self) -> None: def test_release_msg(self) -> None:
expected_message = "baxterthehacker published [release for tag 0.0.1](https://github.com/baxterthehacker/public-repo/releases/tag/0.0.1)." expected_message = "baxterthehacker published release [0.0.1](https://github.com/baxterthehacker/public-repo/releases/tag/0.0.1) for tag 0.0.1."
self.send_and_test_stream_message('release', self.EXPECTED_TOPIC_REPO_EVENTS, expected_message) self.send_and_test_stream_message('release', self.EXPECTED_TOPIC_REPO_EVENTS, expected_message)
def test_page_build_msg(self) -> None: def test_page_build_msg(self) -> None:

19
zerver/webhooks/github/view.py
View File

@ -15,7 +15,8 @@ from zerver.lib.webhooks.git import CONTENT_MESSAGE_TEMPLATE, \
TOPIC_WITH_BRANCH_TEMPLATE, TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE, \ TOPIC_WITH_BRANCH_TEMPLATE, TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE, \
get_commits_comment_action_message, get_issue_event_message, \ get_commits_comment_action_message, get_issue_event_message, \
get_pull_request_event_message, get_push_commits_event_message, \ get_pull_request_event_message, get_push_commits_event_message, \
get_push_tag_event_message, get_setup_webhook_message get_push_tag_event_message, get_setup_webhook_message, \
get_release_event_message
from zerver.models import UserProfile from zerver.models import UserProfile
fixture_to_headers = get_http_headers_from_filename("HTTP_X_GITHUB_EVENT") fixture_to_headers = get_http_headers_from_filename("HTTP_X_GITHUB_EVENT")
@ -235,12 +236,16 @@ def get_add_team_body(payload: Dict[str, Any]) -> str:
) )
def get_release_body(payload: Dict[str, Any]) -> str: def get_release_body(payload: Dict[str, Any]) -> str:
return "{} {} [release for tag {}]({}).".format( data = {
get_sender_name(payload), 'user_name': get_sender_name(payload),
payload['action'], 'action': payload['action'],
payload['release']['tag_name'], 'tagname': payload['release']['tag_name'],
payload['release']['html_url'], # Not every GitHub release has a "name" set; if not there, use the tag name.
) 'release_name': payload['release']['name'] or payload['release']['tag_name'],
'url': payload['release']['html_url']
}
return get_release_event_message(**data)
def get_page_build_body(payload: Dict[str, Any]) -> str: def get_page_build_body(payload: Dict[str, Any]) -> str:
build = payload['build'] build = payload['build']