From f0fe532b467262611c573a42fe3ef3c6f9821a7f Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 2 Jan 2020 11:29:01 +0000 Subject: [PATCH 1/2] Pass uploaded file name into test data --- tests/app/main/views/test_returned_letters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/app/main/views/test_returned_letters.py b/tests/app/main/views/test_returned_letters.py index 19779ae3c..baf6f0c20 100644 --- a/tests/app/main/views/test_returned_letters.py +++ b/tests/app/main/views/test_returned_letters.py @@ -67,7 +67,7 @@ def test_returned_letters_page( 'template_version': None, 'original_file_name': original_file_name, 'job_row_number': None, - 'uploaded_letter_file_name': 'test_letter.pdf', + 'uploaded_letter_file_name': uploaded_letter_file_name, } for client_reference, template_name, original_file_name, uploaded_letter_file_name in ( ('ABC123', 'Example template', None, None), @@ -90,8 +90,8 @@ def test_returned_letters_page( 'Example template Reference ABC123 Originally sent 24 December 2019', 'Example template Sent from Example spreadsheet.xlsx Originally sent 24 December 2019', 'Example template No reference provided Originally sent 24 December 2019', - 'test_letter.pdf Reference DEF456 Originally sent 24 December 2019', - 'test_letter.pdf No reference provided Originally sent 24 December 2019', + 'Example precompiled.pdf Reference DEF456 Originally sent 24 December 2019', + 'Example one-off.pdf No reference provided Originally sent 24 December 2019', ] == [ normalize_spaces(row.text) for row in page.select('tr') ] From 5ea02119f4180fad08c114a8b565ca6728688ec1 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 2 Jan 2020 11:29:41 +0000 Subject: [PATCH 2/2] Handle precompiled via in returned letters list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precompiled letters sent via the API don’t have: - a template - a filename Which means in the list of returned letters we just show ‘None’. This commit changes this to ‘Provided as PDF’, which is how we talk about precompiled letters elsewhere (for example in the template statistics on the dashboard). --- app/templates/views/returned-letters.html | 2 +- tests/app/main/views/test_returned_letters.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/templates/views/returned-letters.html b/app/templates/views/returned-letters.html index 7f29035ee..fe0e85462 100644 --- a/app/templates/views/returned-letters.html +++ b/app/templates/views/returned-letters.html @@ -28,7 +28,7 @@ field_headings_visible=False ) %} {% call field() %} - {{ item.template_name or item.uploaded_letter_file_name }} + {{ item.template_name or item.uploaded_letter_file_name or 'Provided as PDF' }} {% if item.client_reference %} Reference {{ item.client_reference }} diff --git a/tests/app/main/views/test_returned_letters.py b/tests/app/main/views/test_returned_letters.py index baf6f0c20..89b944e03 100644 --- a/tests/app/main/views/test_returned_letters.py +++ b/tests/app/main/views/test_returned_letters.py @@ -75,6 +75,7 @@ def test_returned_letters_page( (None, 'Example template', None, None), ('DEF456', None, None, 'Example precompiled.pdf'), (None, None, None, 'Example one-off.pdf'), + ('XYZ999', None, None, None), ) ] mocker.patch('app.service_api_client.get_returned_letters', return_value=data) @@ -92,6 +93,7 @@ def test_returned_letters_page( 'Example template No reference provided Originally sent 24 December 2019', 'Example precompiled.pdf Reference DEF456 Originally sent 24 December 2019', 'Example one-off.pdf No reference provided Originally sent 24 December 2019', + 'Provided as PDF Reference XYZ999 Originally sent 24 December 2019', ] == [ normalize_spaces(row.text) for row in page.select('tr') ]