Remove set-to-string conversion from upload code

Also changes the allowed_spreadsheet_file_extensions
variable to allowed_file_extensions for
consistency.
This commit is contained in:
Tom Byers
2020-12-17 10:47:52 +00:00
parent ea3d61e6b9
commit 55a4ca6579
16 changed files with 25 additions and 34 deletions

View File

@@ -18,8 +18,7 @@ def test_upload_contact_list_page(client_request):
assert 'action' not in page.select_one('form')
assert page.select_one('form input')['name'] == 'file'
assert page.select_one('form input')['type'] == 'file'
assert page.select_one('form input').has_attr('accept')
assert set(page.select_one('form input')['accept'].split(',')) == {'.csv', '.xlsx', '.xls', '.ods', '.xlsm', '.tsv'}
assert page.select_one('form input')['accept'] == '.csv,.xlsx,.xls,.ods,.xlsm,.tsv'
assert normalize_spaces(page.select('.spreadsheet')[0].text) == (
'Example A '
@@ -236,8 +235,7 @@ def test_upload_csv_file_shows_error_banner(
service_id=SERVICE_ONE_ID,
)
assert page.select_one('form input')['type'] == 'file'
assert page.select_one('form input').has_attr('accept')
assert set(page.select_one('form input')['accept'].split(',')) == {'.csv', '.xlsx', '.xls', '.ods', '.xlsm', '.tsv'}
assert page.select_one('form input')['accept'] == '.csv,.xlsx,.xls,.ods,.xlsm,.tsv'
assert normalize_spaces(page.select_one('thead').text) == expected_thead
assert normalize_spaces(page.select_one('tbody').text) == expected_tbody