Put file name in error message

‘Your data’ sounds ambiguous and computery. Using the name of the file
is better because it’s a thing you know about.
This commit is contained in:
Chris Hill-Scott
2017-07-28 09:24:09 +01:00
parent 25e7015537
commit 5c872e7936
2 changed files with 12 additions and 10 deletions

View File

@@ -23,14 +23,14 @@
{% call banner_wrapper(type='dangerous') %}
{% if row_errors|length == 1 %}
<h1 class='banner-title' data-module="track-error" data-error-type="Bad rows" data-error-label="{{ upload_id }}">
There is a problem with your data
There is a problem with {{ original_file_name }}
</h1>
<p>
You need to {{ row_errors[0] }}
</p>
{% else %}
<h1 class='banner-title' data-module="track-error" data-error-type="Bad rows" data-error-label="{{ upload_id }}">
There are some problems with your data
There are some problems with {{ original_file_name }}
</h1>
<p>
You need to:
@@ -49,8 +49,6 @@
{{ file_upload(form.file, button_text='Re-upload your file') }}
</div>
<h2 class="heading-medium" id="{{ file_contents_header_id }}">{{ original_file_name }}</h2>
{% call(item, row_number) list_table(
recipients.initial_annotated_rows_with_errors if row_errors and not recipients.missing_column_headers else recipients.initial_annotated_rows,
caption=original_file_name,

View File

@@ -140,7 +140,7 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
for response in [initial_upload, reupload]:
assert response.status_code == 200
content = response.get_data(as_text=True)
assert 'There is a problem with your data' in content
assert 'There is a problem with invalid.csv' in content
assert '+447700900986' in content
assert 'Missing' in content
assert 'Re-upload your file' in content
@@ -193,7 +193,7 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
+447700900986, example
""",
(
'There is a problem with your data '
'There is a problem with invalid.csv '
'You need to enter missing data in 1 row '
'Skip to file contents'
)
@@ -206,7 +206,7 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
+447700900986, example
""",
(
'There is a problem with your data '
'There is a problem with invalid.csv '
'You need to enter missing data in 1 row '
'Skip to file contents'
)
@@ -1283,7 +1283,7 @@ def test_check_messages_should_revalidate_file_when_uploading_file(
follow_redirects=True
)
assert response.status_code == 200
assert 'There is a problem with your data' in response.get_data(as_text=True)
assert 'There is a problem with invalid.csv' in response.get_data(as_text=True)
@pytest.mark.parametrize('route, response_code', [
@@ -1637,7 +1637,11 @@ def test_non_ascii_characters_in_letter_recipients_file_shows_error(
)
with logged_in_client.session_transaction() as session:
session['upload_data'] = {'template_id': fake_uuid}
session['upload_data'] = {
'template_id': fake_uuid,
'original_file_name': 'unicode.csv',
}
response = logged_in_client.get(url_for(
'main.check_messages',
service_id=fake_uuid,
@@ -1650,7 +1654,7 @@ def test_non_ascii_characters_in_letter_recipients_file_shows_error(
assert ' '.join(
page.find('div', class_='banner-dangerous').text.split()
) == (
'There is a problem with your data '
'There is a problem with unicode.csv '
'You need to fix 1 address '
'Skip to file contents'
)