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

bitbucket webhook: Fully deprecate username field.

This commit is contained in:
ritik 2021-02-01 22:38:33 +05:30 committed by Steve Howell
parent 6a9e534a22
commit 50b0496a3a
25 changed files with 92 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/webhooks/bitbucket2/fixtures/commit_comment_created.json
View File

@ -13,7 +13,7 @@
"href":"https://bitbucket.org/account/kolaszek/avatar/32/" "href":"https://bitbucket.org/account/kolaszek/avatar/32/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user" "type":"user"
}, },
@ -67,7 +67,7 @@
"href":"https://bitbucket.org/account/kolaszek/avatar/32/" "href":"https://bitbucket.org/account/kolaszek/avatar/32/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user" "type":"user"
}, },
@ -88,7 +88,7 @@
"href":"https://bitbucket.org/account/kolaszek/avatar/32/" "href":"https://bitbucket.org/account/kolaszek/avatar/32/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user" "type":"user"
}, },

4
zerver/webhooks/bitbucket2/fixtures/commit_status_changed.json
View File

@ -12,7 +12,7 @@
"href":"https://bitbucket.org/account/kolaszek/avatar/32/" "href":"https://bitbucket.org/account/kolaszek/avatar/32/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user" "type":"user"
}, },
@ -35,7 +35,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },

16
zerver/webhooks/bitbucket2/fixtures/force_push.json
View File

@ -15,7 +15,7 @@
"uuid":"{ede265ff-3649-4068-a7da-81ac581b6f47}", "uuid":"{ede265ff-3649-4068-a7da-81ac581b6f47}",
"name":"Repository name", "name":"Repository name",
"owner":{ "owner":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
@ -37,7 +37,7 @@
"is_private":true "is_private":true
}, },
"actor":{ "actor":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
@ -70,7 +70,7 @@
"author":{ "author":{
"raw":"Tomasz Kolek <tomasz-kolek@o2.pl>", "raw":"Tomasz Kolek <tomasz-kolek@o2.pl>",
"user":{ "user":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
@ -153,7 +153,7 @@
"author":{ "author":{
"raw":"Tomasz Kolek <tomasz-kolek@o2.pl>", "raw":"Tomasz Kolek <tomasz-kolek@o2.pl>",
"user":{ "user":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
@ -201,7 +201,7 @@
"author":{ "author":{
"raw":"Tomasz Kolek <tomasz-kolek@o2.pl>", "raw":"Tomasz Kolek <tomasz-kolek@o2.pl>",
"user":{ "user":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
@ -249,7 +249,7 @@
"author":{ "author":{
"raw":"Tomasz Kolek <tomasz-kolek@o2.pl>", "raw":"Tomasz Kolek <tomasz-kolek@o2.pl>",
"user":{ "user":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
@ -297,7 +297,7 @@
"author":{ "author":{
"raw":"Tomasz Kolek <tomasz-kolek@o2.pl>", "raw":"Tomasz Kolek <tomasz-kolek@o2.pl>",
"user":{ "user":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
@ -336,7 +336,7 @@
"author":{ "author":{
"raw":"Tomasz Kolek <tomasz-kolek@o2.pl>", "raw":"Tomasz Kolek <tomasz-kolek@o2.pl>",
"user":{ "user":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"

4
zerver/webhooks/bitbucket2/fixtures/fork.json
View File

@ -12,7 +12,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz" "display_name":"Tomasz"
}, },
@ -48,7 +48,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz" "display_name":"Tomasz"
} }

10
zerver/webhooks/bitbucket2/fixtures/issue_commented.json
View File

@ -37,7 +37,7 @@
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"version":null, "version":null,
"milestone":null, "milestone":null,
@ -63,7 +63,7 @@
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"priority":"major", "priority":"major",
"created_on":"2016-07-04T17:36:51.890354+00:00", "created_on":"2016-07-04T17:36:51.890354+00:00",
@ -102,7 +102,7 @@
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":""
}, },
"name":"Repository name", "name":"Repository name",
"full_name":"kolaszek/repository-name", "full_name":"kolaszek/repository-name",
@ -138,7 +138,7 @@
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"content":{ "content":{
"raw":"Add comment", "raw":"Add comment",
@ -162,6 +162,6 @@
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
} }
} }

8
zerver/webhooks/bitbucket2/fixtures/issue_created.json
View File

@ -14,7 +14,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"issue":{ "issue":{
"votes":0, "votes":0,
@ -66,7 +66,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"priority":"major", "priority":"major",
"title":"Bug", "title":"Bug",
@ -87,7 +87,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"state":"new" "state":"new"
}, },
@ -122,7 +122,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"type":"user", "type":"user",
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"is_private":true, "is_private":true,
"full_name":"kolaszek/repository-name", "full_name":"kolaszek/repository-name",

10
zerver/webhooks/bitbucket2/fixtures/issue_updated.json
View File

@ -13,7 +13,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"type":"user" "type":"user"
}, },
"comment":{ "comment":{
@ -37,7 +37,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"type":"user" "type":"user"
}, },
"created_on":"2016-07-04T17:38:33.962551+00:00", "created_on":"2016-07-04T17:38:33.962551+00:00",
@ -80,7 +80,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"type":"user" "type":"user"
}, },
"type":"repository", "type":"repository",
@ -108,7 +108,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"type":"user" "type":"user"
}, },
"links":{ "links":{
@ -180,7 +180,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"type":"user" "type":"user"
} }
} }

8
zerver/webhooks/bitbucket2/fixtures/more_than_one_push_event.json
View File

@ -32,7 +32,7 @@
} }
}, },
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"website":"" "website":""
}, },
@ -90,7 +90,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -139,7 +139,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -239,6 +239,6 @@
} }
}, },
"website":null, "website":null,
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
} }
} }

10
zerver/webhooks/bitbucket2/fixtures/pull_request_approved_or_unapproved.json
View File

@ -52,7 +52,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz" "display_name":"Tomasz"
}, },
@ -115,7 +115,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz" "display_name":"Tomasz"
}, },
@ -140,7 +140,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz" "display_name":"Tomasz"
}, },
@ -178,7 +178,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz" "display_name":"Tomasz"
} }
@ -196,7 +196,7 @@
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz" "display_name":"Tomasz"
} }

10
zerver/webhooks/bitbucket2/fixtures/pull_request_comment_action.json
View File

@ -25,7 +25,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"updated_on":"2016-07-04T20:47:38.608171+00:00", "updated_on":"2016-07-04T20:47:38.608171+00:00",
"content":{ "content":{
@ -78,7 +78,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"full_name":"kolaszek/repository-name", "full_name":"kolaszek/repository-name",
"name":"Repository name", "name":"Repository name",
@ -100,7 +100,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"pullrequest":{ "pullrequest":{
"title":"new commit", "title":"new commit",
@ -138,7 +138,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"type":"pullrequest", "type":"pullrequest",
"merge_commit":null, "merge_commit":null,
@ -224,7 +224,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
} }
} }
] ]

8
zerver/webhooks/bitbucket2/fixtures/pull_request_created_or_updated.json
View File

@ -74,7 +74,7 @@
"href":"https://bitbucket.org/account/tkolek/avatar/32/" "href":"https://bitbucket.org/account/tkolek/avatar/32/"
} }, } },
"type":"user", "type":"user",
"username":"tkolek", "nickname":"T Kolek",
"uuid":"{bf830c24-bde2-41f1-a790-2c9372a2e789}", "uuid":"{bf830c24-bde2-41f1-a790-2c9372a2e789}",
"display_name":"Tomasz Kolek" "display_name":"Tomasz Kolek"
} }
@ -95,7 +95,7 @@
} }
}, },
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"task_count":0, "task_count":0,
"title":"new commit", "title":"new commit",
@ -135,7 +135,7 @@
} }
}, },
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"repository":{ "repository":{
"website":"", "website":"",
@ -171,7 +171,7 @@
} }
}, },
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
} }
} }
} }

6
zerver/webhooks/bitbucket2/fixtures/pull_request_created_or_updated_without_username.json
View File

@ -94,7 +94,7 @@
} }
}, },
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"task_count":0, "task_count":0,
"title":"new commit", "title":"new commit",
@ -134,7 +134,7 @@
} }
}, },
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"repository":{ "repository":{
"website":"", "website":"",
@ -170,7 +170,7 @@
} }
}, },
"display_name":"Tomasz", "display_name":"Tomasz",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
} }
} }
} }

8
zerver/webhooks/bitbucket2/fixtures/pull_request_fulfilled_or_rejected.json
View File

@ -13,7 +13,7 @@
"href":"https://bitbucket.org/account/kolaszek/avatar/32/" "href":"https://bitbucket.org/account/kolaszek/avatar/32/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
"pullrequest":{ "pullrequest":{
@ -43,7 +43,7 @@
"href":"https://bitbucket.org/account/kolaszek/avatar/32/" "href":"https://bitbucket.org/account/kolaszek/avatar/32/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
"author":{ "author":{
@ -60,7 +60,7 @@
"href":"https://bitbucket.org/account/kolaszek/avatar/32/" "href":"https://bitbucket.org/account/kolaszek/avatar/32/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
"updated_on":"2016-07-04T20:17:13.680242+00:00", "updated_on":"2016-07-04T20:17:13.680242+00:00",
@ -167,7 +167,7 @@
"href":"https://bitbucket.org/account/kolaszek/avatar/32/" "href":"https://bitbucket.org/account/kolaszek/avatar/32/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
"full_name":"kolaszek/repository-name", "full_name":"kolaszek/repository-name",

8
zerver/webhooks/bitbucket2/fixtures/push.json
View File

@ -12,7 +12,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -35,7 +35,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -107,7 +107,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -156,7 +156,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },

4
zerver/webhooks/bitbucket2/fixtures/push_commits_above_limit.json
View File

@ -15,7 +15,7 @@
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user", "type":"user",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"location":null, "location":null,
"created_on":"2016-06-29T17:51:47.001868+00:00" "created_on":"2016-06-29T17:51:47.001868+00:00"
}, },
@ -366,7 +366,7 @@
}, },
"repository":{ "repository":{
"owner":{ "owner":{
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"links":{ "links":{
"self":{ "self":{
"href":"https://api.bitbucket.org/2.0/users/kolaszek" "href":"https://api.bitbucket.org/2.0/users/kolaszek"

4
zerver/webhooks/bitbucket2/fixtures/push_more_than_one_tag.json
View File

@ -17,7 +17,7 @@
"type":"user", "type":"user",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"location":null, "location":null,
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"repository":{ "repository":{
"links":{ "links":{
@ -48,7 +48,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"name":"Repository name", "name":"Repository name",
"is_private":false, "is_private":false,

12
zerver/webhooks/bitbucket2/fixtures/push_multiple_committers.json
View File

@ -12,7 +12,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -35,7 +35,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -107,7 +107,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -156,7 +156,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -194,7 +194,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"zbenjamin", "nickname":"Zev Benjamin",
"display_name":"Ben", "display_name":"Ben",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -231,7 +231,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"zbenjamin", "nickname":"Zev Benjamin",
"display_name":"Ben", "display_name":"Ben",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },

26
zerver/webhooks/bitbucket2/fixtures/push_multiple_committers_with_others.json
View File

@ -12,7 +12,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -35,7 +35,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -107,7 +107,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -156,7 +156,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -193,7 +193,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -230,7 +230,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"Tomasz", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -267,7 +267,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"Tomasz", "nickname":"Tomasz Kolaszek",
"display_name":"Tomasz", "display_name":"Tomasz",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -304,7 +304,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"james", "nickname":"James Franklin",
"display_name":"James", "display_name":"James",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -341,7 +341,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"james", "nickname":"James Franklin",
"display_name":"James", "display_name":"James",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -378,7 +378,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"james", "nickname":"James Kolek",
"display_name":"James", "display_name":"James",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -415,7 +415,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"Brendon", "nickname":"Brendon Rogers",
"display_name":"Brendon", "display_name":"Brendon",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -452,7 +452,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"Brendon", "nickname":"Brendon Rogers",
"display_name":"Brendon", "display_name":"Brendon",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -490,7 +490,7 @@
} }
}, },
"type":"user", "type":"user",
"username":"zbenjamin", "nickname":"Zev Benjamin",
"display_name":"Ben", "display_name":"Ben",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },

4
zerver/webhooks/bitbucket2/fixtures/push_one_tag.json
View File

@ -17,7 +17,7 @@
"type":"user", "type":"user",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"location":null, "location":null,
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"repository":{ "repository":{
"links":{ "links":{
@ -48,7 +48,7 @@
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"display_name":"Tomasz", "display_name":"Tomasz",
"type":"user", "type":"user",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"name":"Repository name", "name":"Repository name",
"is_private":false, "is_private":false,

4
zerver/webhooks/bitbucket2/fixtures/push_remove_tag.json
View File

@ -32,7 +32,7 @@
} }
}, },
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}", "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}",
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
}, },
"website":"" "website":""
}, },
@ -111,6 +111,6 @@
} }
}, },
"website":null, "website":null,
"username":"kolaszek" "nickname":"Tomasz Kolaszek"
} }
} }

4
zerver/webhooks/bitbucket2/fixtures/push_without_changes.json
View File

@ -5,7 +5,7 @@
] ]
}, },
"actor":{ "actor":{
"username":"eeshangarg", "nickname":"Eeshan Garg",
"type":"user", "type":"user",
"display_name":"eeshangarg", "display_name":"eeshangarg",
"uuid":"{a161e482-30e8-47ef-b6ab-c4e4cfaa0dce}", "uuid":"{a161e482-30e8-47ef-b6ab-c4e4cfaa0dce}",
@ -55,7 +55,7 @@
}, },
"full_name":"webhooktest/test-repo", "full_name":"webhooktest/test-repo",
"owner":{ "owner":{
"username":"webhooktest", "nickname":"Webhook Test",
"type":"team", "type":"team",
"display_name":"webhooktest", "display_name":"webhooktest",
"uuid":"{31358906-183f-4b53-b83c-f70ba0ca5d3c}", "uuid":"{31358906-183f-4b53-b83c-f70ba0ca5d3c}",

6
zerver/webhooks/bitbucket2/fixtures/remove_branch.json
View File

@ -19,7 +19,7 @@
"href":"https://bitbucket.org/kolaszek/" "href":"https://bitbucket.org/kolaszek/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"type":"user", "type":"user",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -84,7 +84,7 @@
"href":"https://bitbucket.org/kolaszek/" "href":"https://bitbucket.org/kolaszek/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"type":"user", "type":"user",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
}, },
@ -140,7 +140,7 @@
"href":"https://bitbucket.org/kolaszek/" "href":"https://bitbucket.org/kolaszek/"
} }
}, },
"username":"kolaszek", "nickname":"Tomasz Kolaszek",
"type":"user", "type":"user",
"uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}" "uuid":"{678ab31f-9f88-4d7a-b343-1bdf9f024917}"
} }

4
zerver/webhooks/bitbucket2/fixtures/repo_updated.json
View File

@ -34,7 +34,7 @@
} }
}, },
"actor":{ "actor":{
"username":"eeshangarg", "nickname":"Eeshan Garg",
"type":"user", "type":"user",
"display_name":"eeshangarg", "display_name":"eeshangarg",
"uuid":"{a161e482-30e8-47ef-b6ab-c4e4cfaa0dce}", "uuid":"{a161e482-30e8-47ef-b6ab-c4e4cfaa0dce}",
@ -84,7 +84,7 @@
}, },
"full_name":"webhooktest/new-name", "full_name":"webhooktest/new-name",
"owner":{ "owner":{
"username":"webhooktest", "nickname":"Webhook Test",
"type":"team", "type":"team",
"display_name":"webhooktest", "display_name":"webhooktest",
"uuid":"{31358906-183f-4b53-b83c-f70ba0ca5d3c}", "uuid":"{31358906-183f-4b53-b83c-f70ba0ca5d3c}",

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

@ -431,7 +431,6 @@ class Bitbucket2HookTests(WebhookTestCase):
self.assertEqual(get_user_info({}), "Unknown user") self.assertEqual(get_user_info({}), "Unknown user")
dct = dict( dct = dict(
username="asmith",
nickname= "alice", nickname= "alice",
noisy_field="whatever", noisy_field="whatever",
display_name="Alice Smith", display_name="Alice Smith",
@ -443,7 +442,4 @@ class Bitbucket2HookTests(WebhookTestCase):
self.assertEqual(get_user_info(dct), "alice") self.assertEqual(get_user_info(dct), "alice")
del dct["nickname"] del dct["nickname"]
self.assertEqual(get_user_info(dct), "asmith")
del dct["username"]
self.assertEqual(get_user_info(dct), "Unknown user") self.assertEqual(get_user_info(dct), "Unknown user")

9
zerver/webhooks/bitbucket2/view.py
View File

@ -411,15 +411,6 @@ def get_user_info(dct: Dict[str, Any]) -> str:
unsupported_event=True, unsupported_event=True,
) )
if "username" in dct:
# We don't expect this to happen after April 2019; this is
# just defensive code, plus it allows us to avoid changing
# a bunch of test fixtures. We will want to delete this code
# as soon as we have confidence that we don't get errors
# related to display_name/nickname being missing. (see above
# code)
return dct["username"]
return "Unknown user" return "Unknown user"
def get_actor_info(payload: Dict[str, Any]) -> str: def get_actor_info(payload: Dict[str, Any]) -> str: