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

Reflect template folder structure on inbound conversation reply page

Browse Source
This commit is contained in:
Pea Tyczynska
2019-03-21 15:57:52 +00:00
parent 3fc4f6866c
commit 0743a68e09
5 changed files with 67 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,6 +260,7 @@ def test_conversation_reply_shows_link_to_add_templates_if_service_has_no_templa
fake_uuid,
mock_get_service_templates_when_no_templates_exist,
mock_get_template_folders,
active_user_with_permissions
):
page = client_request.get(
'main.conversation_reply',
@@ -282,9 +283,11 @@ def test_conversation_reply_shows_templates(
fake_uuid,
mocker,
mock_get_template_folders,
active_user_with_permissions
active_user_with_permissions,
service_one
):
service_one["permissions"] += ["edit_folder_permissions"]
all_templates = {'data': [
_template('sms', 'sms_template_one', parent=INV_PARENT_FOLDER_ID),
_template('sms', 'sms_template_two'),
@@ -312,38 +315,30 @@ def test_conversation_reply_shows_templates(
notification_id=fake_uuid,
)
for index, expected in enumerate([
'sms_template_two',
'sms_template_three'
]):
link = page.select('.message-name')[index]
assert normalize_spaces(link.text) == expected
assert link.select_one('a')['href'].startswith(
url_for(
'main.conversation_reply_with_template',
service_id=SERVICE_ONE_ID,
notification_id=fake_uuid,
template_id='',
)
link = page.select('.template-list-item-without-ancestors')
assert normalize_spaces(link[0].text) == "Parent 2 - visible 1 template"
assert normalize_spaces(link[1].text) == 'sms_template_two Text message template'
assert link[0].select_one('a')['href'].startswith(
url_for(
'main.conversation_reply',
service_id=SERVICE_ONE_ID,
notification_id=fake_uuid,
from_folder=VIS_PARENT_FOLDER_ID
)
def test_conversation_reply_shows_live_search_if_list_of_templates_taller_than_screen(
client_request,
fake_uuid,
mock_get_more_service_templates_than_can_fit_onscreen,
mock_get_template_folders,
):
page = client_request.get(
'main.conversation_reply',
service_id=SERVICE_ONE_ID,
notification_id=fake_uuid,
)
assert page.select('.live-search')
assert link[1].select_one('a')['href'].startswith(
url_for(
'main.conversation_reply_with_template',
service_id=SERVICE_ONE_ID,
notification_id=fake_uuid,
template_id='',
)
)
def test_conversation_reply_shows_live_search_if_list_of_templates_fits_onscreen(
def test_conversation_reply_shows_live_search(
client_request,
fake_uuid,
mock_get_service_templates,
@@ -355,7 +350,7 @@ def test_conversation_reply_shows_live_search_if_list_of_templates_fits_onscreen
notification_id=fake_uuid,
)
assert not page.select('.live-search')
assert page.select('.live-search')
def test_conversation_reply_redirects_with_phone_number_from_notification(

48
tests/app/models/test_service.py
View File

@@ -1,7 +1,6 @@
import uuid
from app.models.service import Service
from tests.conftest import _template
INV_PARENT_FOLDER_ID = '7e979e79-d970-43a5-ac69-b625a8d147b0'
INV_CHILD_1_FOLDER_ID = '92ee1ee0-e4ee-4dcc-b1a7-a5da9ebcfa2b'
@@ -173,50 +172,3 @@ def test_get_template_folders_shows_all_folders_when_user_id_not_passed_in(
'users_with_permission': [active_user_with_permissions.id]
}
]
def test_get_user_templates_across_folders(
mock_get_template_folders,
service_one,
active_user_with_permissions,
mocker
):
all_templates = {'data': [
_template('sms', 'sms_template_one', parent=INV_CHILD_1_FOLDER_ID),
_template('sms', 'sms_template_two'),
_template('email', 'email_template_one', parent=VIS_PARENT_FOLDER_ID),
_template('letter', 'letter_template_one')
]}
mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions)
mocker.patch('app.service_api_client.get_service_templates', return_value=all_templates)
service_one['permissions'] = ['edit_folder_permissions', 'letter', 'email', 'sms']
service = Service(service_one)
result = service.get_user_templates_across_folders(active_user_with_permissions.id)
assert result == [
{'folder': None, 'id': mocker.ANY,
'name': 'sms_template_two', 'template_type': 'sms'},
{'folder': None, 'id': mocker.ANY,
'name': 'letter_template_one', 'template_type': 'letter'},
{'folder': 'bbbb222b-2b22-2b22-222b-b222b22b2222', 'id': mocker.ANY,
'name': 'email_template_one', 'template_type': 'email'}
]
def test_get_user_templates_across_folders_sms_only(
mock_get_template_folders,
service_one,
active_user_with_permissions,
mocker
):
all_templates = {'data': [
_template('sms', 'sms_template_one', parent=INV_CHILD_1_FOLDER_ID),
_template('sms', 'sms_template_two'),
_template('email', 'email_template_one', parent=VIS_PARENT_FOLDER_ID),
_template('letter', 'letter_template_one')
]}
mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions)
mocker.patch('app.service_api_client.get_service_templates', return_value=all_templates)
service_one['permissions'] = ['edit_folder_permissions', 'letter', 'email', 'sms']
service = Service(service_one)
result = service.get_user_templates_across_folders(active_user_with_permissions.id, template_type='sms')
assert result == [{'folder': None, 'id': mocker.ANY, 'name': 'sms_template_two', 'template_type': 'sms'}]