Skip to content

Commit a91c04d

Browse files
sigmavirus24sigmavirus24
committed
Fix up tests from recent pull request changes
1 parent e73bb36 commit a91c04d

15 files changed

+75
-23
lines changed

‎github3/events.py

+36-2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,41 @@ def to_pull(self):
7474
refresh = to_pull
7575

7676

77+
class EventReviewComment(GitHubCore):
78+
"""Representation of review comments in events."""
79+
80+
def _update_attributes(self, comment):
81+
from . import users
82+
self._api = comment['url']
83+
self.id = comment['id']
84+
self.author_association = comment['author_association']
85+
self.body = comment['body']
86+
self.commit_id = comment['commit_id']
87+
self.created_at = self._strptime(comment['created_at'])
88+
self.diff_hunk = comment['diff_hunk']
89+
self.html_url = comment['html_url']
90+
self.links = comment['_links']
91+
self.original_commit_id = comment['original_commit_id']
92+
self.original_position = comment['original_position']
93+
self.path = comment['path']
94+
self.position = comment['position']
95+
self.pull_request_url = comment['pull_request_url']
96+
self.updated_at = self._strptime(comment['updated_at'])
97+
self.user = users.ShortUser(comment['user'], self)
98+
99+
def to_review_comment(self):
100+
"""Retrieve a full ReviewComment object for this EventReviewComment.
101+
102+
:rtype:
103+
:class:`~github3.pulls.ReviewComment`
104+
"""
105+
from . import pulls
106+
comment = self._json(self._get(self._api), 200)
107+
return pulls.ReviewComment(comment, self)
108+
109+
refresh = to_review_comment
110+
111+
77112
class EventIssue(GitHubCore):
78113
"""The class that represents the issue information returned in Events."""
79114

@@ -210,7 +245,6 @@ def _pullreqev(payload, session):
210245

211246

212247
def _pullreqcomm(payload, session):
213-
from .pulls import ReviewComment
214248
# Transform the Pull Request attribute
215249
pull = payload.get('pull_request')
216250
if pull:
@@ -219,7 +253,7 @@ def _pullreqcomm(payload, session):
219253
# Transform the Comment attribute
220254
comment = payload.get('comment')
221255
if comment:
222-
payload['comment'] = ReviewComment(comment, session)
256+
payload['comment'] = EventReviewComment(comment, session)
223257
return payload
224258

225259

‎github3/pulls.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ def _update_attributes(self, comment):
893893
self.body_html = comment['body_html']
894894
self.body_text = comment['body_text']
895895
self.commit_id = comment['commit_id']
896-
self.created_at = comment['created_at']
896+
self.created_at = self._strptime(comment['created_at'])
897897
self.diff_hunk = comment['diff_hunk']
898898
self.html_url = comment['html_url']
899899
self.links = comment['_links']
@@ -902,7 +902,7 @@ def _update_attributes(self, comment):
902902
self.path = comment['path']
903903
self.position = comment['position']
904904
self.pull_request_url = comment['pull_request_url']
905-
self.updated_at = comment['updated_at']
905+
self.updated_at = self._strptime(comment['updated_at'])
906906
self.user = users.ShortUser(comment['user'], self)
907907

908908
def _repr(self):

‎tests/cassettes/PullRequest_create_review_comment.json

+1-1
Large diffs are not rendered by default.

‎tests/cassettes/PullRequest_diff.json

+1-1
Large diffs are not rendered by default.

‎tests/cassettes/PullRequest_is_merged.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recorded_with": "betamax/0.8.0", "http_interactions": [{"response": {"status": {"code": 200, "message": "OK"}, "body": {"encoding": "utf-8", "base64_string": "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", "string": ""}, "headers": {"X-GitHub-Request-Id": "A68C:551F:331A143:4077129:58A08A18", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "Vary": "Accept", "X-XSS-Protection": "1; mode=block", "Last-Modified": "Wed, 08 Feb 2017 02:05:35 GMT", "X-Served-By": "1e9204dbc0447a6f39c3b3c44d87b3f8", "X-Content-Type-Options": "nosniff", "X-Frame-Options": "deny", "X-GitHub-Media-Type": "github.v3; param=full; format=json", "ETag": "W/\"06be44370df682f1efc21f803a926f7e\"", "Access-Control-Expose-Headers": "ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval", "Access-Control-Allow-Origin": "*", "Date": "Sun, 12 Feb 2017 16:15:20 GMT", "Cache-Control": "public, max-age=60, s-maxage=60", "Status": "200 OK", "Content-Type": "application/json; charset=utf-8", "Transfer-Encoding": "chunked", "Content-Encoding": "gzip", "X-RateLimit-Reset": "1486918405", "X-RateLimit-Remaining": "57", "Server": "GitHub.com", "X-RateLimit-Limit": "60", "Content-Security-Policy": "default-src 'none'"}, "url": "https://api.github.com/repos/sigmavirus24/github3.py/pulls/235"}, "request": {"body": {"encoding": "utf-8", "string": ""}, "headers": {"Accept": "application/vnd.github.v3.full+json", "Content-Type": "application/json", "Accept-Encoding": "gzip, deflate", "Accept-Charset": "utf-8", "User-Agent": "github3.py/1.0.0a4", "Connection": "keep-alive"}, "uri": "https://api.github.com/repos/sigmavirus24/github3.py/pulls/235", "method": "GET"}, "recorded_at": "2017-02-12T16:15:20"}]}
1+
{"http_interactions": [{"request": {"body": {"encoding": "utf-8", "string": ""}, "headers": {"User-Agent": "github3.py/1.0.0a4", "Accept-Encoding": "gzip, deflate", "Accept": "application/vnd.github.v3.full+json", "Connection": "keep-alive", "Accept-Charset": "utf-8", "Content-Type": "application/json"}, "method": "GET", "uri": "https://api.github.com/repos/sigmavirus24/github3.py/pulls/235"}, "response": {"body": {"encoding": "utf-8", "base64_string": "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", "string": ""}, "headers": {"Server": "GitHub.com", "Date": "Thu, 25 Jan 2018 23:04:02 GMT", "Content-Type": "application/json; charset=utf-8", "Transfer-Encoding": "chunked", "Status": "200 OK", "X-RateLimit-Limit": "60", "X-RateLimit-Remaining": "57", "X-RateLimit-Reset": "1516924595", "Cache-Control": "public, max-age=60, s-maxage=60", "Vary": "Accept", "ETag": "W/\"6a40ed61fa463a6dbe2bdd37dd9ae9f7\"", "Last-Modified": "Wed, 24 Jan 2018 15:25:22 GMT", "X-GitHub-Media-Type": "github.v3; param=full; format=json", "Access-Control-Expose-Headers": "ETag, Link, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval", "Access-Control-Allow-Origin": "*", "Content-Security-Policy": "default-src 'none'", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Content-Type-Options": "nosniff", "X-Frame-Options": "deny", "X-XSS-Protection": "1; mode=block", "X-Runtime-rack": "0.073013", "Content-Encoding": "gzip", "X-GitHub-Request-Id": "B552:2D373:9B96A1:167E22F:5A6A6262"}, "status": {"code": 200, "message": "OK"}, "url": "https://api.github.com/repos/sigmavirus24/github3.py/pulls/235"}, "recorded_at": "2018-01-25T23:04:02"}, {"request": {"body": {"encoding": "utf-8", "string": ""}, "headers": {"User-Agent": "github3.py/1.0.0a4", "Accept-Encoding": "gzip, deflate", "Accept": "application/vnd.github.v3.full+json", "Connection": "keep-alive", "Accept-Charset": "utf-8", "Content-Type": "application/json"}, "method": "GET", "uri": "https://api.github.com/repos/sigmavirus24/github3.py/pulls/235/merge"}, "response": {"body": {"encoding": null, "string": ""}, "headers": {"Server": "GitHub.com", "Date": "Thu, 25 Jan 2018 23:04:02 GMT", "Content-Type": "application/octet-stream", "Status": "204 No Content", "X-RateLimit-Limit": "60", "X-RateLimit-Remaining": "56", "X-RateLimit-Reset": "1516924595", "X-GitHub-Media-Type": "github.v3; param=full; format=json", "Access-Control-Expose-Headers": "ETag, Link, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval", "Access-Control-Allow-Origin": "*", "Content-Security-Policy": "default-src 'none'", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Content-Type-Options": "nosniff", "X-Frame-Options": "deny", "X-XSS-Protection": "1; mode=block", "X-Runtime-rack": "0.027009", "X-GitHub-Request-Id": "B552:2D373:9B96A6:167E23B:5A6A6262"}, "status": {"code": 204, "message": "No Content"}, "url": "https://api.github.com/repos/sigmavirus24/github3.py/pulls/235/merge"}, "recorded_at": "2018-01-25T23:04:02"}], "recorded_with": "betamax/0.8.0"}

0 commit comments

Comments
 (0)