Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion connexion/operations/abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def validate_responses(self):

@staticmethod
def _get_file_arguments(files, arguments, has_kwargs=False):
return {k: v for k, v in files.items() if k in arguments or has_kwargs}
return {k: files.getlist(k) for k in files.keys() if k in arguments or has_kwargs}

@abc.abstractmethod
def _get_val_from_param(self, value, query_defn):
Expand Down
11 changes: 11 additions & 0 deletions tests/api/test_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,17 @@ def test_formdata_file_upload(simple_app):
response = json.loads(resp.data.decode('utf-8', 'replace'))
assert response == {'filename.txt': 'file contents'}

def test_formdata_multiple_file_upload(simple_app):
app_client = simple_app.app.test_client()
resp = app_client.post('/v1.0/test-formData-file-upload',
data={'formData': [(BytesIO(b'file contents'), 'filename.txt'),
(BytesIO(b'file contents 2'), 'filename2.txt')]
})
assert resp.status_code == 200
response = json.loads(resp.data.decode('utf-8', 'replace'))
assert response == [{'filename.txt': 'file contents'},
{'filename2.txt': 'file contents 2'}]


def test_formdata_file_upload_bad_request(simple_app):
app_client = simple_app.app.test_client()
Expand Down
7 changes: 4 additions & 3 deletions tests/fakeapi/hello.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,10 @@ def test_formdata_missing_param():


def test_formdata_file_upload(formData, **kwargs):
filename = formData.filename
contents = formData.read().decode('utf-8', 'replace')
return {filename: contents}
if len(formData) == 1:
return {x.filename: x.read().decode('utf-8', 'replace') for x in formData}

return [{x.filename: x.read().decode('utf-8', 'replace')} for x in formData]


def test_formdata_file_upload_missing_param():
Expand Down