Fix Project.tree()

Gauvain Pocentek · Gauvain Pocentek · commit fc8affd11c90 · 2016-01-30T18:09:41.000+01:00
Add API tests for tree(), blob() and archive().
diff --git a/gitlab/objects.py b/gitlab/objects.py
@@ -1207,14 +1207,20 @@ def Tag(self, id=None, **kwargs):
                                               **kwargs)
 
     def tree(self, path='', ref_name='', **kwargs):
-        url = "%s/%s/repository/tree" % (self._url, self.id)
-        url += '?path=%s&ref_name=%s' % (path, ref_name)
+        url = "/projects/%s/repository/tree" % (self.id)
+        params = []
+        if path:
+            params.append("path=%s" % path)
+        if ref_name:
+            params.append("ref_name=%s" % ref_name)
+        if params:
+            url += '?' + "&".join(params)
         r = self.gitlab._raw_get(url, **kwargs)
         raise_error_from_response(r, GitlabGetError)
         return r.json()
 
     def blob(self, sha, filepath, **kwargs):
-        url = "%s/%s/repository/blobs/%s" % (self._url, self.id, sha)
+        url = "/projects/%s/repository/blobs/%s" % (self.id, sha)
         url += '?filepath=%s' % (filepath)
         r = self.gitlab._raw_get(url, **kwargs)
         raise_error_from_response(r, GitlabGetError)
diff --git a/tools/python_test.py b/tools/python_test.py
@@ -121,6 +121,15 @@
 readme = admin_project.files.get(file_path='README.rst', ref='master')
 assert(readme.decode() == 'Initial content')
 
+tree = admin_project.tree()
+assert(len(tree) == 1)
+assert(tree[0]['name'] == 'README.rst')
+blob = admin_project.blob('master', 'README.rst')
+assert(blob == 'Initial content')
+archive1 = admin_project.archive()
+archive2 = admin_project.archive('master')
+assert(archive1 == archive2)
+
 # labels
 label1 = admin_project.labels.create({'name': 'label1', 'color': '#778899'})
 label1 = admin_project.labels.get('label1')
