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

github_webhook: Send test message sent by GitHub webhook integration. 

Fixes #3994.
This commit is contained in:
Akash Kothawale 2017-03-16 19:18:25 -04:00 committed by Tim Abbott
parent 282d27a934
commit edfb9c21bc
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/fixtures/github_webhook/github_webhook_ping.json
View File

@ -27,8 +27,8 @@
}, },
"repository": { "repository": {
"id": 53679793, "id": 53679793,
"name": "zulip", "name": "public-repo",
"full_name": "TomaszKolek/zulip", "full_name": "TomaszKolek/public-repo",
"owner": { "owner": {
"login": "TomaszKolek", "login": "TomaszKolek",
"id": 5993758, "id": 5993758,

5
zerver/webhooks/github_webhook/tests.py
View File

@ -20,9 +20,8 @@ class GithubWebhookTest(WebhookTestCase):
def test_ping_event(self): def test_ping_event(self):
# type: () -> None # type: () -> None
payload = self.get_body('ping') expected_message = u"GitHub webhook has been successfully configured by TomaszKolek"
result = self.client_post(self.url, payload, HTTP_X_GITHUB_EVENT='ping', content_type="application/json") self.send_and_test_stream_message('ping', self.EXPECTED_SUBJECT_REPO_EVENTS, expected_message, HTTP_X_GITHUB_EVENT='ping')
self.assert_json_success(result)
def test_push_1_commit(self): def test_push_1_commit(self):
# type: () -> None # type: () -> None

10
zerver/webhooks/github_webhook/view.py
View File

@ -13,7 +13,8 @@ from zerver.decorator import api_key_only_webhook_view, REQ, has_request_variabl
from zerver.lib.webhooks.git import get_issue_event_message, SUBJECT_WITH_PR_OR_ISSUE_INFO_TEMPLATE,\ from zerver.lib.webhooks.git import get_issue_event_message, SUBJECT_WITH_PR_OR_ISSUE_INFO_TEMPLATE,\
get_pull_request_event_message, SUBJECT_WITH_BRANCH_TEMPLATE,\ get_pull_request_event_message, SUBJECT_WITH_BRANCH_TEMPLATE,\
get_push_commits_event_message, CONTENT_MESSAGE_TEMPLATE,\ get_push_commits_event_message, CONTENT_MESSAGE_TEMPLATE,\
get_commits_comment_action_message, get_push_tag_event_message get_commits_comment_action_message, get_push_tag_event_message, \
get_setup_webhook_message
class UnknownEventType(Exception): class UnknownEventType(Exception):
pass pass
@ -296,6 +297,10 @@ def get_pull_request_review_comment_body(payload):
type='PR Review Comment' type='PR Review Comment'
) )
def get_ping_body(payload):
# type: (Dict[str, Any]) -> Text
return get_setup_webhook_message('GitHub', get_sender_name(payload))
def get_repository_name(payload): def get_repository_name(payload):
# type: (Dict[str, Any]) -> Text # type: (Dict[str, Any]) -> Text
return payload['repository']['name'] return payload['repository']['name']
@ -368,6 +373,7 @@ EVENT_FUNCTION_MAPPER = {
'opened_or_update_pull_request': get_opened_or_update_pull_request_body, 'opened_or_update_pull_request': get_opened_or_update_pull_request_body,
'assigned_or_unassigned_pull_request': get_assigned_or_unassigned_pull_request_body, 'assigned_or_unassigned_pull_request': get_assigned_or_unassigned_pull_request_body,
'page_build': get_page_build_body, 'page_build': get_page_build_body,
'ping': get_ping_body,
'public': get_public_body, 'public': get_public_body,
'pull_request_review': get_pull_request_review_body, 'pull_request_review': get_pull_request_review_body,
'pull_request_review_comment': get_pull_request_review_comment_body, 'pull_request_review_comment': get_pull_request_review_comment_body,
@ -386,7 +392,7 @@ def api_github_webhook(
payload=REQ(argument_type='body'), stream=REQ(default='github')): payload=REQ(argument_type='body'), stream=REQ(default='github')):
# type: (HttpRequest, UserProfile, Client, Dict[str, Any], Text) -> HttpResponse # type: (HttpRequest, UserProfile, Client, Dict[str, Any], Text) -> HttpResponse
event = get_event(request, payload) event = get_event(request, payload)
if event != 'ping' and event is not None: if event is not None:
subject = get_subject_based_on_type(payload, event) subject = get_subject_based_on_type(payload, event)
body = get_body_function_based_on_type(event)(payload) body = get_body_function_based_on_type(event)(payload)
check_send_message(user_profile, client, 'stream', [stream], subject, body) check_send_message(user_profile, client, 'stream', [stream], subject, body)