darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 14:09:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove set-to-string conversion from upload code

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/app/main/views/test_send.py
View File

@@ -309,8 +309,7 @@ def test_example_spreadsheet(
'1 phone number name date'
)
assert page.select_one('input[type=file]').has_attr('accept')
assert set(page.select_one('input[type=file]')['accept'].split(",")) ==\
{'.csv', '.xlsx', '.xls', '.ods', '.xlsm', '.tsv'}
assert page.select_one('input[type=file]')['accept'] == '.csv,.xlsx,.xls,.ods,.xlsm,.tsv'
def test_example_spreadsheet_for_letters(
@@ -511,8 +510,7 @@ def test_upload_csv_file_with_errors_shows_check_page_with_errors(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.select_one('input[type=file]').has_attr('accept')
assert set(page.select_one('input[type=file]')['accept'].split(",")) ==\
{'.csv', '.xlsx', '.xls', '.ods', '.xlsm', '.tsv'}
assert page.select_one('input[type=file]')['accept'] == '.csv,.xlsx,.xls,.ods,.xlsm,.tsv'
content = response.get_data(as_text=True)
assert 'There’s a problem with example.csv' in content
@@ -906,8 +904,7 @@ def test_upload_csv_file_with_missing_columns_shows_error(
assert 'file_uploads' not in session
assert page.select_one('input[type=file]').has_attr('accept')
assert set(page.select_one('input[type=file]')['accept'].split(",")) == \
{'.csv', '.xlsx', '.xls', '.ods', '.xlsm', '.tsv'}
assert page.select_one('input[type=file]')['accept'] == '.csv,.xlsx,.xls,.ods,.xlsm,.tsv'
assert normalize_spaces(page.select('.banner-dangerous')[0].text) == expected_error

6
tests/app/main/views/uploads/test_upload_contact_list.py
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