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

Do not show postage stamp for letter preview

Browse Source
This commit is contained in:
David McDonald
2019-10-09 13:47:28 +01:00
parent fdf74572b9
commit 9ba1dbfffa
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/forms.py
View File

@@ -775,7 +775,9 @@ class LetterUploadPostageForm(StripWhitespaceForm):
default='second', default='second',
validators=[DataRequired()] validators=[DataRequired()]
) )
file_id = HiddenField() file_id = HiddenField(
validators=[DataRequired()]
)
class ForgotPasswordForm(StripWhitespaceForm): class ForgotPasswordForm(StripWhitespaceForm):

4
app/main/views/uploads.py
View File

@@ -153,6 +153,10 @@ def uploaded_letter_preview(service_id, file_id):
error = get_letter_validation_error(error_message, invalid_pages, page_count) error = get_letter_validation_error(error_message, invalid_pages, page_count)
template_dict = service_api_client.get_precompiled_template(service_id) template_dict = service_api_client.get_precompiled_template(service_id)
# Override pre compiled letter template postage to none as it has not yet been picked even though
# the pre compiled letter template has its postage set as second class as the DB currently requires
# a non null value of postage for letter templates
template_dict['postage'] = None
form = LetterUploadPostageForm() form = LetterUploadPostageForm()

8
tests/app/main/views/test_uploads.py
View File

@@ -125,9 +125,7 @@ def test_post_upload_letter_shows_letter_preview_for_valid_file(
) )
assert page.find('h1').text == 'tests/test_pdf_files/one_page_pdf.pdf' assert page.find('h1').text == 'tests/test_pdf_files/one_page_pdf.pdf'
assert len(page.select('.letter-postage')) == 1 assert len(page.select('.letter-postage')) == 0
assert normalize_spaces(page.select_one('.letter-postage').text) == ('Postage: second class')
assert page.select_one('.letter-postage')['class'] == ['letter-postage', 'letter-postage-second']
letter_images = page.select('main img') letter_images = page.select('main img')
assert len(letter_images) == 3 assert len(letter_images) == 3
@@ -283,9 +281,7 @@ def test_post_upload_letter_shows_letter_preview_for_invalid_file(mocker, client
_follow_redirects=True, _follow_redirects=True,
) )
assert len(page.select('.letter-postage')) == 1 assert len(page.select('.letter-postage')) == 0
assert normalize_spaces(page.select_one('.letter-postage').text) == ('Postage: first class')
assert page.select_one('.letter-postage')['class'] == ['letter-postage', 'letter-postage-first']
letter_images = page.select('main img') letter_images = page.select('main img')
assert len(letter_images) == 1 assert len(letter_images) == 1