filr_rest: precise folder title when search (#88491)
gitea/passerelle/pipeline/head This commit looks good
Details
gitea/passerelle/pipeline/head This commit looks good
Details
This commit is contained in:
parent
923125e786
commit
3729c4605d
|
@ -90,7 +90,9 @@ class Filr(BaseResource, HTTPResource):
|
||||||
|
|
||||||
# get or create folder
|
# get or create folder
|
||||||
folder_id = None
|
folder_id = None
|
||||||
root_folder_info = self._call('rest/folders/%s/library_folders' % root_folder_id)
|
root_folder_info = self._call(
|
||||||
|
'rest/folders/%s/library_folders' % root_folder_id, params={'title': folder_name}
|
||||||
|
)
|
||||||
for folder in root_folder_info.get('items', []):
|
for folder in root_folder_info.get('items', []):
|
||||||
if folder.get('title') == folder_name:
|
if folder.get('title') == folder_name:
|
||||||
folder_id = str(folder.get('id'))
|
folder_id = str(folder.get('id'))
|
||||||
|
|
|
@ -36,7 +36,7 @@ def test_upload(app, connector):
|
||||||
}
|
}
|
||||||
with responses.RequestsMock() as rsps:
|
with responses.RequestsMock() as rsps:
|
||||||
rsps.get(
|
rsps.get(
|
||||||
'http://filr.invalid/rest/folders/1234/library_folders',
|
'http://filr.invalid/rest/folders/1234/library_folders?title=folder_foo',
|
||||||
status=200,
|
status=200,
|
||||||
json={'items': [{'title': 'folder_foo', 'id': 5678}]},
|
json={'items': [{'title': 'folder_foo', 'id': 5678}]},
|
||||||
)
|
)
|
||||||
|
@ -65,7 +65,11 @@ def test_upload_with_folder_creation(app, connector):
|
||||||
'folder_name': 'folder_foo',
|
'folder_name': 'folder_foo',
|
||||||
}
|
}
|
||||||
with responses.RequestsMock() as rsps:
|
with responses.RequestsMock() as rsps:
|
||||||
rsps.get('http://filr.invalid/rest/folders/1234/library_folders', status=200, json={'items': []})
|
rsps.get(
|
||||||
|
'http://filr.invalid/rest/folders/1234/library_folders?title=folder_foo',
|
||||||
|
status=200,
|
||||||
|
json={'items': []},
|
||||||
|
)
|
||||||
rsps.post('http://filr.invalid/rest/folders/1234/library_folders', status=200, json={'id': 82})
|
rsps.post('http://filr.invalid/rest/folders/1234/library_folders', status=200, json={'id': 82})
|
||||||
rsps.post(
|
rsps.post(
|
||||||
'http://filr.invalid/rest/folders/82/library_files?file_name=bla',
|
'http://filr.invalid/rest/folders/82/library_files?file_name=bla',
|
||||||
|
|
Loading…
Reference in New Issue