Fix test coverage

Author: mfosterw

democrasite/webiscite/tasks.py

@@ -35,9 +35,8 @@ def submit_bill(bill_id: int) -> None:
     bill = Bill.objects.get(pk=bill_id)
     bill.submit()
 
-    repo = Github(auth=Auth.Token(settings.WEBISCITE_GITHUB_TOKEN)).get_repo(
-        settings.WEBISCITE_REPO
-    )
+    github_auth = Auth.Token(settings.WEBISCITE_GITHUB_TOKEN)
+    repo = Github(auth=github_auth).get_repo(settings.WEBISCITE_REPO)
     pull = repo.get_pull(bill.pull_request.number)
 
     if bill.status != Bill.Status.APPROVED:
@@ -49,6 +48,7 @@ def submit_bill(bill_id: int) -> None:
         bill.log("Merged")
     else:
         logger.warning("Bill %s failed to merge", bill.id)
+        return
 
     # Automatically update constitution line numbers if necessary
     _update_constitution(bill, repo)

democrasite/webiscite/tests/test_tasks.py

@@ -40,6 +40,23 @@ def test_bill_passed(self, mock_token, mock_repo):
             merge_method="squash", sha=bill.pull_request.sha
         )
 
+    @patch("github.Github.get_repo")
+    @patch("github.Auth.Token", spec=True)
+    def test_bill_merge_failed(self, mock_token, mock_repo):
+        bill = BillFactory.create(constitutional=True)
+        # constitutional so _update_constitution isn't called
+        voters = UserFactory.create_batch(settings.WEBISCITE_MINIMUM_QUORUM)
+        Vote.objects.bulk_create(
+            [Vote(bill=bill, user=voter, support=True) for voter in voters]
+        )
+        mock_repo().get_pull().merge.return_value = None
+
+        submit_bill(bill.id)
+
+        mock_repo().get_pull().merge.assert_called_once_with(
+            merge_method="squash", sha=bill.pull_request.sha
+        )
+
     @patch.object(constitution, "update_constitution")
     @patch("requests.get")
     @patch("github.Repository.Repository")