Skip to content

Commit 1832039

Browse files
committed
[Bitbucket Cloud] Add avatar property to user object
1 parent a863ad7 commit 1832039

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

atlassian/bitbucket/cloud/common/users.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,25 @@ def __init__(self, url, data, *args, **kwargs):
77

88
@property
99
def display_name(self):
10+
""" Display name used by Bitbucket Cloud """
1011
return str(self.get_data("display_name"))
1112

1213
@property
1314
def nickname(self):
15+
""" Username used by Bitbucket Cloud """
1416
return self.get_data("nickname")
1517

1618
@property
1719
def account_id(self):
20+
""" Account id used by Bitbucket Cloud """
1821
return self.get_data("account_id")
1922

2023
@property
2124
def uuid(self):
25+
""" User id used by Bitbucket Cloud """
2226
return self.get_data("uuid")
27+
28+
@property
29+
def avatar(self):
30+
""" URL to user avatar on Bitbucket Cloud """
31+
return self.get_data("links")["avatar"]["href"]

tests/responses/bitbucket/cloud/2.0/repositories/TestWorkspace1/testrepository1/pullrequests/1/GET

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,7 @@ responses[None] = {
158158
"links": {
159159
"self": {"href": "users/%7BUser03UUID%7D"},
160160
"html": {"href": "https://bitbucket.org/%7BUser03UUID%7D/"},
161-
"avatar": {
162-
"href": "https://secure.gravatar.com/avatar/ad2424dafaasdssaew12232344434432?d=https%3A%2F%2Favatar-management--avatars.us-west-2.prod.public.atl-paas.net%2Finitials%2FU3-0.png"
163-
},
161+
"avatar": {"href": "users/%7BUser03UUID%7D.png"},
164162
},
165163
"nickname": "User03Nickname",
166164
"type": "user",
@@ -241,9 +239,7 @@ responses[None] = {
241239
"links": {
242240
"self": {"href": "users/%7BUser03UUID%7D"},
243241
"html": {"href": "https://bitbucket.org/%7BUser03UUID%7D/"},
244-
"avatar": {
245-
"href": "https://secure.gravatar.com/avatar/ad2424dafaasdssaew12232344434432?d=https%3A%2F%2Favatar-management--avatars.us-west-2.prod.public.atl-paas.net%2Finitials%2FU3-0.png"
246-
},
242+
"avatar": {"href": "users/%7BUser03UUID%7D.png"},
247243
},
248244
"nickname": "User03Nickname",
249245
"type": "user",

tests/test_bitbucket_cloud.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ def test_author(self, tc1):
197197
assert tc1.author.uuid == "{User03UUID}"
198198
assert tc1.author.account_id == "User03AccountID"
199199
assert tc1.author.nickname == "User03Nickname"
200+
assert tc1.author.avatar == "users/%7BUser03UUID%7D.png"
200201

201202
def test_participants(self, tc1):
202203
participants = list(tc1.participants())
@@ -205,10 +206,13 @@ def test_participants(self, tc1):
205206
p1 = participants[1]
206207
assert isinstance(p1, Participant)
207208
assert isinstance(p1.user, User)
209+
print(p1)
208210
assert p1.user.display_name == "User03DisplayName"
209211
assert p1.user.uuid == "{User03UUID}"
210212
assert p1.user.account_id == "User03AccountID"
211213
assert p1.user.nickname == "User03Nickname"
214+
assert p1.user.avatar == "users/%7BUser03UUID%7D.png"
215+
212216
assert _datetimetostr(p1.participated_on) == _datetimetostr(datetime(2020, 7, 9, 7, 0, 54, 416331))
213217
assert p1.is_participant
214218
assert not p1.is_reviewer

0 commit comments

Comments
 (0)