Merge pull request #1180 from alphagov/return-template-name

Return template name in public API
This commit is contained in:
Chris Hill-Scott
2017-08-17 12:44:24 +01:00
committed by GitHub
5 changed files with 57 additions and 25 deletions

View File

@@ -10,13 +10,13 @@ from tests.app.db import create_template
valid_version_params = [None, 1]
@pytest.mark.parametrize("tmp_type, expected_subject", [
(SMS_TYPE, None),
(EMAIL_TYPE, 'Template subject'),
(LETTER_TYPE, 'Template subject')
@pytest.mark.parametrize("tmp_type, expected_name, expected_subject", [
(SMS_TYPE, 'sms Template Name', None),
(EMAIL_TYPE, 'email Template Name', 'Template subject'),
(LETTER_TYPE, 'letter Template Name', 'Template subject')
])
@pytest.mark.parametrize("version", valid_version_params)
def test_get_template_by_id_returns_200(client, sample_service, tmp_type, expected_subject, version):
def test_get_template_by_id_returns_200(client, sample_service, tmp_type, expected_name, expected_subject, version):
template = create_template(sample_service, template_type=tmp_type)
auth_header = create_authorization_header(service_id=sample_service.id)
@@ -38,7 +38,8 @@ def test_get_template_by_id_returns_200(client, sample_service, tmp_type, expect
'version': template.version,
'created_by': template.created_by.email_address,
'body': template.content,
"subject": expected_subject
"subject": expected_subject,
'name': expected_name,
}
assert json_response == expected_response

View File

@@ -21,7 +21,8 @@ valid_json_get_response = {
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
valid_json_get_response_with_optionals = {
@@ -32,7 +33,8 @@ valid_json_get_response_with_optionals = {
'version': 1,
'created_by': 'someone',
'body': 'some body',
'subject': "some subject"
'subject': "some subject",
'name': 'some name',
}
valid_request_args = [{"id": str(uuid.uuid4()), "version": 1}, {"id": str(uuid.uuid4())}]

View File

@@ -22,7 +22,8 @@ valid_json_get_all_response = [
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
},
{
'id': str(uuid.uuid4()),
@@ -32,7 +33,8 @@ valid_json_get_all_response = [
'version': 2,
'created_by': 'someone@test.com',
'subject': 'test subject',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
},
@@ -45,7 +47,8 @@ valid_json_get_all_response = [
'updated_at': None,
'version': 2,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
},
@@ -64,7 +67,8 @@ invalid_json_get_all_response = [
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates is not a valid UUID']),
@@ -77,7 +81,8 @@ invalid_json_get_all_response = [
'updated_at': None,
'version': 'invalid_version',
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates invalid_version is not of type integer']),
@@ -90,7 +95,8 @@ invalid_json_get_all_response = [
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates invalid_created_at is not a date-time']),
@@ -103,10 +109,24 @@ invalid_json_get_all_response = [
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates id is a required property']),
({
"templates": [
{
'id': str(uuid.uuid4()),
'type': SMS_TYPE,
'created_at': '2017-02-10T18:25:43.511Z',
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body',
}
]
}, ['templates name is a required property']),
({
"templates": [
{
@@ -115,7 +135,8 @@ invalid_json_get_all_response = [
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates type is a required property']),
@@ -127,7 +148,8 @@ invalid_json_get_all_response = [
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates created_at is a required property']),
@@ -139,7 +161,8 @@ invalid_json_get_all_response = [
'created_at': '2017-02-10T18:25:43.511Z',
'version': 1,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates updated_at is a required property']),
@@ -151,7 +174,8 @@ invalid_json_get_all_response = [
'created_at': '2017-02-10T18:25:43.511Z',
'updated_at': None,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates version is a required property']),
@@ -163,7 +187,8 @@ invalid_json_get_all_response = [
'created_at': '2017-02-10T18:25:43.511Z',
'updated_at': None,
'version': 1,
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates created_by is a required property']),
@@ -175,7 +200,8 @@ invalid_json_get_all_response = [
'created_at': '2017-02-10T18:25:43.511Z',
'updated_at': None,
'version': 1,
'created_by': 'someone@test.com'
'created_by': 'someone@test.com',
'name': 'some name',
}
]
}, ['templates body is a required property']),
@@ -186,7 +212,8 @@ invalid_json_get_all_response = [
'created_at': '2017-02-10T18:25:43.511Z',
'updated_at': None,
'created_by': 'someone@test.com',
'body': 'some body'
'body': 'some body',
'name': 'some name',
}
]
}, ['templates id is a required property', 'templates version is a required property']),