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

Merge pull request #3435 from alphagov/fix-letter-job-downloads

Browse Source 
Fix bug with letter job CSV downloads
This commit is contained in:
David McDonald
2020-05-06 14:51:32 +01:00
committed by GitHub
parent 0955060c20 b6935a3c6c
commit 7d9340d76c
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/utils.py
View File

@@ -157,7 +157,9 @@ def get_sample_template(template_type):
if template_type == 'sms':
return SMSPreviewTemplate({'content': 'any', 'template_type': 'sms'})
if template_type == 'letter':
return LetterImageTemplate({'content': 'any', 'subject': '', 'template_type': 'letter'})
return LetterImageTemplate(
{'content': 'any', 'subject': '', 'template_type': 'letter'}, postage='second', image_url='x', page_count=1
)
def generate_notifications_csv(**kwargs):

8
tests/app/test_utils.py
View File

@@ -7,6 +7,7 @@ import pytest
from bs4 import BeautifulSoup
from flask import url_for
from freezegun import freeze_time
from notifications_utils.template import Template
from app import format_datetime_relative
from app.utils import (
@@ -18,6 +19,7 @@ from app.utils import (
get_letter_printing_statement,
get_letter_validation_error,
get_logo_cdn_domain,
get_sample_template,
is_less_than_90_days_ago,
printing_today_or_tomorrow,
)
@@ -576,3 +578,9 @@ def test_get_letter_validation_error_for_known_errors(
@freeze_time('2020-02-14T12:00:00')
def test_is_less_than_90_days_ago(date_from_db, expected_result):
assert is_less_than_90_days_ago(date_from_db) == expected_result
@pytest.mark.parametrize("template_type", ["sms", "letter", "email"])
def test_get_sample_template_returns_template(template_type):
template = get_sample_template(template_type)
assert isinstance(template, Template)