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

Merge pull request #3018 from alphagov/fixes-for-check-spreadsheet-page

Browse Source 
Fixes for check spreadsheet page
This commit is contained in:
Chris Hill-Scott
2019-06-19 13:32:28 +01:00
committed by GitHub
parent e1c9464228 772066164c
commit 02566c4381
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/components/table.html
View File

@@ -45,7 +45,7 @@
{%- endmacro %} {%- endmacro %}
{% macro row(id=None) -%} {% macro row(id=None) -%}
<tr class="table-row" {% if id %}id="{{id}}"{% endif %}> <tr class="table-row" {% if id and id is string %}id="{{id}}"{% endif %}>
{{ caller() }} {{ caller() }}
</tr> </tr>
{%- endmacro %} {%- endmacro %}

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

@@ -565,7 +565,14 @@ def test_upload_valid_csv_redirects_to_check_page(
'main.send_messages', service_id=SERVICE_ONE_ID, template_id=fake_uuid, 'main.send_messages', service_id=SERVICE_ONE_ID, template_id=fake_uuid,
_data={'file': (BytesIO(''.encode('utf-8')), 'valid.csv')}, _data={'file': (BytesIO(''.encode('utf-8')), 'valid.csv')},
_expected_status=302, _expected_status=302,
expected_redirect='foo' _expected_redirect=url_for(
'main.check_messages',
service_id=SERVICE_ONE_ID,
template_id=fake_uuid,
upload_id=fake_uuid,
original_file_name='valid.csv',
_external=True,
),
) )
@@ -697,6 +704,7 @@ def test_upload_valid_csv_shows_preview_and_table(
]): ]):
for index, cell in enumerate(row): for index, cell in enumerate(row):
row = page.select('table tbody tr')[row_index] row = page.select('table tbody tr')[row_index]
assert 'id' not in row
assert normalize_spaces(str(row.select('td')[index + 1])) == cell assert normalize_spaces(str(row.select('td')[index + 1])) == cell