paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use "synchronized" (past tense) in github webhook.

Browse Source 
Normally github gives us a past tense version of the action, but
not for "synchronize," so we fix up the tense.

This also adds zerver.GithubHookTests.test_pull_request_synchronize

(imported from commit ef69467ed4a02dbfa94c8215fb9043b668d1dec9)
This commit is contained in:
Steve Howell
2014-01-21 12:06:40 -05:00
parent 8f9d29189c
commit 6c6d1ee474
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/tests.py
View File

@@ -5303,6 +5303,11 @@ class GithubHookTests(AuthedTestCase):
"zulip-test: pull request 7: Counting is hard.", "zulip-test: pull request 7: Counting is hard.",
"zbenjamin closed [pull request 7](https://github.com/zbenjamin/zulip-test/pull/7)") "zbenjamin closed [pull request 7](https://github.com/zbenjamin/zulip-test/pull/7)")
def test_pull_request_synchronize(self):
self.basic_test('pull_request_synchronize', 'commits',
"zulip-test: pull request 13: Even more cowbell.",
"zbenjamin synchronized [pull request 13](https://github.com/zbenjamin/zulip-test/pull/13)")
def test_pull_request_comment(self): def test_pull_request_comment(self):
self.basic_test('pull_request_comment', 'commits', self.basic_test('pull_request_comment', 'commits',
"zulip-test: pull request 9: Less cowbell.", "zulip-test: pull request 9: Less cowbell.",

6
zerver/views/webhooks.py
View File

@@ -25,10 +25,14 @@ def github_generic_subject(noun, topic_focus, blob):
return "%s: %s %d: %s" % (topic_focus, noun, blob['number'], blob['title']) return "%s: %s %d: %s" % (topic_focus, noun, blob['number'], blob['title'])
def github_generic_content(noun, payload, blob): def github_generic_content(noun, payload, blob):
action = payload['action']
if action == 'synchronize':
action = 'synchronized'
# issue and pull_request objects have the same fields we're interested in # issue and pull_request objects have the same fields we're interested in
content = ("%s %s [%s %s](%s)" content = ("%s %s [%s %s](%s)"
% (payload['sender']['login'], % (payload['sender']['login'],
payload['action'], action,
noun, noun,
blob['number'], blob['number'],
blob['html_url'])) blob['html_url']))