Fix no. of column headers on breaking change page

The breaking change page wasn’t properly accounting for the fact that
letter recipients span multiple columns – it was assuming they’d only
take up one column like they do for email and SMS.

This commit fixes:
- the number of column headers (A, B, C, …) to be correct
- the count of columns (you will need X columns in your file) to be
  correct

It then parameterises the test to look at a case where a recipient is
in one column (email) and multiple columns (letter).
This commit is contained in:
Chris Hill-Scott
2017-04-06 10:22:09 +01:00
parent ed6d44557a
commit e34d981dda
5 changed files with 49 additions and 29 deletions

View File

@@ -336,15 +336,15 @@ def mock_get_service_template_with_placeholders(mocker):
@pytest.fixture(scope='function')
def mock_get_service_email_template(mocker):
def mock_get_service_email_template(mocker, content=None, subject=None):
def _get(service_id, template_id, version=None):
template = template_json(
service_id,
template_id,
"Two week reminder",
"email",
"Your vehicle tax expires on ((date))",
"Your ((thing)) is due soon"
content or "Your vehicle tax expires on ((date))",
subject or "Your ((thing)) is due soon",
)
return {'data': template}
@@ -354,30 +354,24 @@ def mock_get_service_email_template(mocker):
@pytest.fixture(scope='function')
def mock_get_service_email_template_without_placeholders(mocker):
def _create(service_id, template_id):
template = template_json(
service_id,
template_id,
"Two week reminder",
"email",
"Your vehicle tax expires soon",
"Your thing is due soon"
)
return {'data': template}
return mocker.patch(
'app.service_api_client.get_service_template', side_effect=_create)
return mock_get_service_email_template(
mocker,
content="Your vehicle tax expires soon",
subject="Your thing is due soon",
)
@pytest.fixture(scope='function')
def mock_get_service_letter_template(mocker):
def mock_get_service_letter_template(mocker, content=None, subject=None):
def _create(service_id, template_id):
template = template_json(
service_id,
template_id,
"Two week reminder",
"letter",
"Template <em>content</em> with & entity", "Subject")
content or "Template <em>content</em> with & entity",
subject or "Subject",
)
return {'data': template}
return mocker.patch(