Skip to content

Commit 2c8a40f

Browse files
authored
Don't say thanks after PR has been closed. (GH-102)
Save one API call. Closes python/miss-islington#97
1 parent 7d983d2 commit 2c8a40f

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

miss_islington/delete_branch.py

-11
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
11
import gidgethub.routing
22

3-
from . import util
4-
53
router = gidgethub.routing.Router()
64

75

86
@router.register("pull_request", action="closed")
97
async def delete_branch(event, gh, *args, **kwargs):
108
"""
119
Delete the branch once miss-islington's PR is closed.
12-
Say thanks if it's merged.
1310
"""
1411
if event.data["pull_request"]["user"]["login"] == "miss-islington":
15-
if event.data["pull_request"]["merged"]:
16-
issue_number = event.data['pull_request']['number']
17-
merged_by = event.data['pull_request']['merged_by']['login']
18-
if merged_by != "miss-islington":
19-
await util.leave_comment(gh, issue_number, f"Thanks, @{merged_by}!")
20-
else:
21-
await util.leave_comment(gh, issue_number, "Thanks!")
22-
2312
branch_name = event.data['pull_request']['head']['ref']
2413
url = f"/repos/miss-islington/cpython/git/refs/heads/{branch_name}"
2514
await gh.delete(url)

tests/test_delete_branch.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ async def test_branch_deleted_when_pr_merged():
3838

3939
gh = FakeGH()
4040
await delete_branch.router.dispatch(event, gh)
41-
assert len(gh.post_data["body"]) is not None # leaves a comment
41+
assert gh.post_data is None # does not leave a comment
4242
assert gh.delete_url == f"/repos/miss-islington/cpython/git/refs/heads/{data['pull_request']['head']['ref']}"
4343

4444

@@ -64,7 +64,7 @@ async def test_branch_deleted_and_thank_committer():
6464

6565
gh = FakeGH()
6666
await delete_branch.router.dispatch(event, gh)
67-
assert gh.post_data["body"] == 'Thanks, @Mariatta!' # leaves a comment
67+
assert gh.post_data is None # does not leave a comment
6868
assert gh.delete_url == f"/repos/miss-islington/cpython/git/refs/heads/{data['pull_request']['head']['ref']}"
6969

7070

@@ -90,7 +90,7 @@ async def test_branch_deleted_and_thanks():
9090

9191
gh = FakeGH()
9292
await delete_branch.router.dispatch(event, gh)
93-
assert gh.post_data["body"] == "Thanks!" # leaves a comment
93+
assert gh.post_data is None # does not leave a comment
9494
assert gh.delete_url == f"/repos/miss-islington/cpython/git/refs/heads/{data['pull_request']['head']['ref']}"
9595

9696

0 commit comments

Comments
 (0)