darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 17:45:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update tests

Browse Source
This commit is contained in:
Pea Tyczynska
2018-11-30 14:16:11 +00:00
parent b9abeb91d3
commit 0b45eda53f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -803,6 +803,8 @@ def get_send_test_page_title(template_type, help_argument, entering_recipient, n
def is_current_user_the_recipient(): def is_current_user_the_recipient():
if 'recipient' not in session:
return False
if hasattr(current_user, 'phone_number'): if hasattr(current_user, 'phone_number'):
return session['recipient'] in {current_user.email_address, current_user.phone_number} return session['recipient'] in {current_user.email_address, current_user.phone_number}
return session['recipient'] == current_user.email_address return session['recipient'] == current_user.email_address

7
tests/app/main/views/test_send.py
View File

@@ -1117,13 +1117,13 @@ def test_send_one_off_or_test_has_correct_page_titles(
active_user_with_permissions, active_user_with_permissions,
mock_get_service_template, mock_get_service_template,
'Use my phone number', 'Use my phone number',
partial(url_for, 'main.send_test') partial(url_for, 'main.send_test_step')
), ),
( (
active_user_with_permissions, active_user_with_permissions,
mock_get_service_email_template, mock_get_service_email_template,
'Use my email address', 'Use my email address',
partial(url_for, 'main.send_test') partial(url_for, 'main.send_test_step')
), ),
( (
active_user_with_permissions, active_user_with_permissions,
@@ -1166,6 +1166,7 @@ def test_send_one_off_has_skip_link(
assert skip_links[0]['href'] == expected_link_url( assert skip_links[0]['href'] == expected_link_url(
service_id=service_one['id'], service_id=service_one['id'],
template_id=fake_uuid, template_id=fake_uuid,
step_index=1
) )
else: else:
assert not skip_links assert not skip_links
@@ -1679,7 +1680,7 @@ def test_send_test_indicates_optional_address_columns(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert normalize_spaces(page.select('label')[0].text) == ( assert normalize_spaces(page.select('label')[0].text) == (
'address line 4 ' 'address line 3 '
'Optional' 'Optional'
) )
assert page.select('.page-footer-back-link')[0]['href'] == url_for( assert page.select('.page-footer-back-link')[0]['href'] == url_for(