Generate the _api attribute for ShortBranch objects

sigmavirus24 · sigmavirus24 · commit eb7a44d8fbe8 · 2018-03-21T06:51:15.000-05:00
Parse the commit's URL to generate the Branch URL. Closes sigmavirus24gh-801
diff --git a/github3/repos/branch.py b/github3/repos/branch.py
@@ -25,12 +25,14 @@ class _Branch(models.GitHubCore):
     def _update_attributes(self, branch):
         self.commit = commit.MiniCommit(branch['commit'], self)
         self.name = branch['name']
+        base = self.commit.url.split('/commit', 1)[0]
+        self._api = self._build_url('branches', self.name, base_url=base)
 
     def _repr(self):
         return '<{0} [{1}]>'.format(self.class_name, self.name)
 
     def latest_sha(self, differs_from=''):
-        """Check if SHA-1 is the same as remote branch.
+        """Check if SHA-1 is the same as the remote branch.
 
         See: https://git.io/vaqIw
 
@@ -139,10 +141,6 @@ def _update_attributes(self, branch):
         self.protection_url = branch['protection_url']
         if self.links and 'self' in self.links:
             self._api = self.links['self']
-        elif isinstance(self.commit, commit.ShortCommit):
-            # Branches obtained via `repo.branches` don't have links.
-            base = self.commit.url.split('/commit', 1)[0]
-            self._api = self._build_url('branches', self.name, base_url=base)
 
 
 class ShortBranch(_Branch):
diff --git a/tests/unit/helper.py b/tests/unit/helper.py
@@ -154,13 +154,18 @@ def put_called_with(self, *args, **kwargs):
     def setUp(self):
         """Use to set up attributes on self before each test."""
         self.session = self.create_session_mock()
-        self.instance = self.create_instance_of_described_class()
         # Proxy the build_url method to the class so it can build the URL and
         # we can assert things about the call that will be attempted to the
         # internet
+        self.old_build_url = self.described_class._build_url
         self.described_class._build_url = build_url
+        self.instance = self.create_instance_of_described_class()
         self.after_setup()
 
+    def tearDown(self):
+        """Reset attributes on items under test."""
+        self.described_class._build_url = self.old_build_url
+
     def after_setup(self):
         """No-op method to avoid people having to override setUp."""
         pass
diff --git a/tests/unit/json/repos_branch_example b/tests/unit/json/repos_branch_example
@@ -3,6 +3,7 @@
   "commit": {
     "sha": "7fd1a60b01f91b314f59955a4e4d4e80d8edf11d",
     "commit": {
+      "url": "https://api.github.com/repos/octocat/Hello-World/commits/7fd1a60b01f91b314f59955a4e4d4e80d8edf11d",
       "author": {
         "name": "The Octocat",
         "date": "2012-03-06T15:06:50-08:00",
