paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

webhooks/bitbucket: Support empty push payloads with no user info.

Browse Source
This commit is contained in:
Eeshan Garg
2019-03-21 17:09:47 -02:30
parent b47e6d0d94
commit 68877dba50
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zerver/webhooks/bitbucket/fixtures/force_push_without_user_info.json Normal file
View File

@@ -0,0 +1,15 @@
{
"canon_url": "https://bitbucket.org/",
"commits":[],
"repository":{
"name": "Repository name",
"absolute_url": "kolaszek/repository-name/",
"fork": false,
"is_private": true,
"scm": "git",
"owner": "kolaszek",
"website": ""
},
"truncated": false,
"user_uuid": "387gs94h-2lk0-4sdb-b23f-71234rhty871"
}

7
zerver/webhooks/bitbucket/tests.py
View File

@@ -61,6 +61,13 @@ class BitbucketHookTests(WebhookTestCase):
self.api_stream_message(self.TEST_USER_EMAIL, fixture_name, self.EXPECTED_TOPIC, self.api_stream_message(self.TEST_USER_EMAIL, fixture_name, self.EXPECTED_TOPIC,
expected_message) expected_message)
def test_bitbucket_on_force_push_event_without_user_info(self) -> None:
fixture_name = 'force_push_without_user_info'
self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
expected_message = u"Someone [force pushed](https://bitbucket.org/kolaszek/repository-name/)"
self.api_stream_message(self.TEST_USER_EMAIL, fixture_name, self.EXPECTED_TOPIC,
expected_message)
@patch('zerver.webhooks.bitbucket.view.check_send_webhook_message') @patch('zerver.webhooks.bitbucket.view.check_send_webhook_message')
def test_bitbucket_on_push_event_filtered_by_branches_ignore(self, check_send_webhook_message_mock: MagicMock) -> None: def test_bitbucket_on_push_event_filtered_by_branches_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
fixture_name = 'push' fixture_name = 'push'

2
zerver/webhooks/bitbucket/view.py
View File

@@ -36,7 +36,7 @@ def api_bitbucket_webhook(request: HttpRequest, user_profile: UserProfile,
# a useful message :/ # a useful message :/
subject = repository['name'] subject = repository['name']
content = (u"%s [force pushed](%s)" content = (u"%s [force pushed](%s)"
% (payload['user'], % (payload.get('user', 'Someone'),
payload['canon_url'] + repository['absolute_url'])) payload['canon_url'] + repository['absolute_url']))
else: else:
branch = payload['commits'][-1]['branch'] branch = payload['commits'][-1]['branch']