Fix error with new commit pushed to existing PR (#577)

It seems like GitHub is sending the url in "url" instead of "issue_url".
Couldn't find documentation if there has been recent change about this.

I made it to look up for either one of them.

Author: Mariatta

.coveragerc

@@ -1,5 +1,9 @@
 [run]
 branch = True
+dynamic_context = test_function
 
 [report]
 fail_under = 100
+
+[html]
+show_contexts = True

bedevere/util.py

@@ -113,7 +113,12 @@ async def files_for_PR(gh, pull_request):
 async def issue_for_PR(gh, pull_request):
     """Return a dict with data about the given PR."""
     # "issue_url" is the API endpoint for the given pull_request (despite the name)
-    return await gh.getitem(pull_request["issue_url"])
+    # It could also come from "url"
+
+    url_key = "issue_url"
+    if not pull_request.get(url_key):
+        url_key = "url"
+    return await gh.getitem(pull_request[url_key])
 
 
 def build_pr_body(issue_number: int, body: str) -> str:

tests/test_stage.py

@@ -1096,8 +1096,8 @@ async def test_awaiting_label_not_removed_when_pr_not_merged(label):
     await awaiting.router.dispatch(event, gh)
     assert gh.delete_url is None
 
-
-async def test_new_commit_pushed_to_approved_pr():
+@pytest.mark.parametrize("issue_url_key", ["url", "issue_url"])
+async def test_new_commit_pushed_to_approved_pr(issue_url_key):
     # There is new commit on approved PR
     username = "brettcannon"
     sha = "f2393593c99dd2d3ab8bfab6fcc5ddee540518a9"
@@ -1121,7 +1121,8 @@ async def test_new_commit_pushed_to_approved_pr():
                             "name": "awaiting merge",
                         },
                     ],
-                    "issue_url": "/repos/python/cpython/issues/5547",
+                    # the key could be 'url' or 'issue_url'
+                    issue_url_key: "/repos/python/cpython/issues/5547",
                 }
             ],
         },
@@ -1168,8 +1169,8 @@ async def test_new_commit_pushed_to_approved_pr():
         )
     }
 
-
-async def test_new_commit_pushed_to_not_approved_pr():
+@pytest.mark.parametrize("issue_url_key", ["url", "issue_url"])
+async def test_new_commit_pushed_to_not_approved_pr(issue_url_key):
     # There is new commit on approved PR
     sha = "f2393593c99dd2d3ab8bfab6fcc5ddee540518a9"
     data = {"commits": [{"id": sha}]}
@@ -1190,7 +1191,8 @@ async def test_new_commit_pushed_to_not_approved_pr():
                             "name": "awaiting review",
                         },
                     ],
-                    "issue_url": "/repos/python/cpython/issues/5547",
+                    #
+                    issue_url_key: "/repos/python/cpython/issues/5547",
                 }
             ],
         },