summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/gl_objects/projects.py2
-rw-r--r--gitlab/objects.py1
-rw-r--r--gitlab/tests/test_manager.py6
-rw-r--r--tools/python_test.py2
4 files changed, 6 insertions, 5 deletions
diff --git a/docs/gl_objects/projects.py b/docs/gl_objects/projects.py
index 95b3483..8e5cb13 100644
--- a/docs/gl_objects/projects.py
+++ b/docs/gl_objects/projects.py
@@ -16,7 +16,7 @@ projects = gl.projects.starred()
projects = gl.projects.all()
# Search projects
-projects = gl.projects.search('query')
+projects = gl.projects.list(search='query')
# end list
# get
diff --git a/gitlab/objects.py b/gitlab/objects.py
index 98c1a32..0def183 100644
--- a/gitlab/objects.py
+++ b/gitlab/objects.py
@@ -2276,6 +2276,7 @@ class ProjectRunnerManager(BaseManager):
class Project(GitlabObject):
_url = '/projects'
_constructorTypes = {'owner': 'User', 'namespace': 'Group'}
+ optionalListAttrs = ['search']
requiredCreateAttrs = ['name']
optionalCreateAttrs = ['path', 'namespace_id', 'description',
'issues_enabled', 'merge_requests_enabled',
diff --git a/gitlab/tests/test_manager.py b/gitlab/tests/test_manager.py
index 59987a7..16e13f2 100644
--- a/gitlab/tests/test_manager.py
+++ b/gitlab/tests/test_manager.py
@@ -215,8 +215,8 @@ class TestGitlabManager(unittest.TestCase):
def test_project_manager_search(self):
mgr = ProjectManager(self.gitlab)
- @urlmatch(scheme="http", netloc="localhost",
- path="/api/v3/projects/search/foo", method="get")
+ @urlmatch(scheme="http", netloc="localhost", path="/api/v3/projects",
+ query="search=foo", method="get")
def resp_get_all(url, request):
headers = {'content-type': 'application/json'}
content = ('[{"name": "foo1", "id": 1}, '
@@ -225,7 +225,7 @@ class TestGitlabManager(unittest.TestCase):
return response(200, content, headers, None, 5, request)
with HTTMock(resp_get_all):
- data = mgr.search('foo')
+ data = mgr.list(search='foo')
self.assertEqual(type(data), list)
self.assertEqual(2, len(data))
self.assertEqual(type(data[0]), Project)
diff --git a/tools/python_test.py b/tools/python_test.py
index 9d7a667..41df221 100644
--- a/tools/python_test.py
+++ b/tools/python_test.py
@@ -145,7 +145,7 @@ sudo_project = gl.projects.create({'name': 'sudo_project'}, sudo=user1.name)
assert(len(gl.projects.all()) == 4)
assert(len(gl.projects.owned()) == 2)
-assert(len(gl.projects.search("admin")) == 1)
+assert(len(gl.projects.list(search="admin")) == 1)
# test pagination
l1 = gl.projects.list(per_page=1, page=1)