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

update conftest and tests to contain accurate test data

Browse Source 
specifically, we identify inbound vs outbound by presence of
"notify_number", so ensure that test content actually contains that
field
This commit is contained in:
Leo Hemsted
2017-09-29 10:15:17 +01:00
parent b1e809e82a
commit 57b4971ac1
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/conversation.py
View File

@@ -64,7 +64,7 @@ def get_sms_thread(service_id, user_number):
), key=lambda notification: notification['created_at']):
is_inbound = ('notify_number' in notification)
redact_personalisation = notification.get('template', {}).get('redact_personalisation', False)
redact_personalisation = not is_inbound and notification['template']['redact_personalisation']
if redact_personalisation:
notification['personalisation'] = {}

20
tests/app/main/views/test_conversation.py
View File

@@ -22,7 +22,8 @@ def test_get_user_phone_number_when_only_inbound_exists(mocker):
mock_get_inbound_sms = mocker.patch(
'app.main.views.conversation.service_api_client.get_inbound_sms_by_id',
return_value={
'user_number': '4407900900123'
'user_number': '4407900900123',
'notify_number': '07900000002'
}
)
mock_get_notification = mocker.patch(
@@ -104,35 +105,35 @@ def test_view_conversation(
for index, expected in enumerate([
(
'message-8',
'Failed (sent yesterday at 2:59pm)',
'yesterday at 2:59pm',
),
(
'message-7',
'Failed (sent yesterday at 2:59pm)',
'yesterday at 2:59pm',
),
(
'message-6',
'Failed (sent yesterday at 4:59pm)',
'yesterday at 4:59pm',
),
(
'message-5',
'Failed (sent yesterday at 6:59pm)',
'yesterday at 6:59pm',
),
(
'message-4',
'Failed (sent yesterday at 8:59pm)',
'yesterday at 8:59pm',
),
(
'message-3',
'Failed (sent yesterday at 10:59pm)',
'yesterday at 10:59pm',
),
(
'message-2',
'Failed (sent yesterday at 10:59pm)',
'yesterday at 10:59pm',
),
(
'message-1',
'Failed (sent yesterday at 11:00pm)',
'yesterday at 11:00pm',
),
(
expected_outbound_content,
@@ -198,6 +199,7 @@ def test_view_conversation_with_empty_inbound(
'app.main.views.conversation.service_api_client.get_inbound_sms',
return_value=[{
'user_number': '07900000001',
'notify_number': '07900000002',
'content': '',
'created_at': datetime.utcnow().isoformat(),
'id': fake_uuid

1
tests/conftest.py
View File

@@ -1333,6 +1333,7 @@ def mock_get_inbound_sms(mocker):
):
return [{
'user_number': '0790090000' + str(i),
'notify_number': '07900000002',
'content': 'message-{}'.format(index + 1),
'created_at': (datetime.utcnow() - timedelta(minutes=60 * (i + 1), seconds=index)).isoformat(),
'id': sample_uuid(),