diff --git a/app/templates/views/check/row-errors.html b/app/templates/views/check/row-errors.html index 91af69965..4d4c2f584 100644 --- a/app/templates/views/check/row-errors.html +++ b/app/templates/views/check/row-errors.html @@ -23,14 +23,14 @@ {% call banner_wrapper(type='dangerous') %} {% if row_errors|length == 1 %}

- There is a problem with your data + There is a problem with {{ original_file_name }}

You need to {{ row_errors[0] }}

{% else %}

- There are some problems with your data + There are some problems with {{ original_file_name }}

You need to: @@ -49,8 +49,6 @@ {{ file_upload(form.file, button_text='Re-upload your file') }} -

{{ original_file_name }}

- {% 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, diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index b323237a2..4b56a17f1 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -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' )