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

Ensure the tour sidebar gets shown

Browse Source 
I accidentally broke it by removing a parameter. This commit reinstates
that parameter and adds some tests to make sure it doesn’t happen again.
This commit is contained in:
Chris Hill-Scott
2017-06-01 13:29:30 +01:00
parent 6425dcbc94
commit f12e0fde39
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,6 +302,7 @@ def send_test_step(service_id, template_id, step_index):
skip_link=skip_link, skip_link=skip_link,
optional_placeholder=optional_placeholder, optional_placeholder=optional_placeholder,
back_link=back_link, back_link=back_link,
help=get_help_argument(),
) )

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

@@ -335,46 +335,54 @@ def test_send_test_step_redirects_if_session_not_setup(
assert session['send_test_values'] == expected_session_contents assert session['send_test_values'] == expected_session_contents
@pytest.mark.parametrize('template_mock, partial_url, expected_h1', [ @pytest.mark.parametrize('template_mock, partial_url, expected_h1, tour_shown', [
( (
mock_get_service_template_with_placeholders, mock_get_service_template_with_placeholders,
partial(url_for, 'main.send_test'), partial(url_for, 'main.send_test'),
'Send to one recipient', 'Send to one recipient',
False,
), ),
( (
mock_get_service_template_with_placeholders, mock_get_service_template_with_placeholders,
partial(url_for, 'main.send_one_off'), partial(url_for, 'main.send_one_off'),
'Send to one recipient', 'Send to one recipient',
False,
), ),
( (
mock_get_service_template_with_placeholders, mock_get_service_template_with_placeholders,
partial(url_for, 'main.send_test', help=1), partial(url_for, 'main.send_test', help=1),
'Example text message', 'Example text message',
True,
), ),
( (
mock_get_service_email_template, mock_get_service_email_template,
partial(url_for, 'main.send_test', help=1), partial(url_for, 'main.send_test', help=1),
'Example text message', 'Example text message',
True,
), ),
( (
mock_get_service_email_template, mock_get_service_email_template,
partial(url_for, 'main.send_test'), partial(url_for, 'main.send_test'),
'Send to one recipient', 'Send to one recipient',
False,
), ),
( (
mock_get_service_email_template, mock_get_service_email_template,
partial(url_for, 'main.send_one_off'), partial(url_for, 'main.send_one_off'),
'Send to one recipient', 'Send to one recipient',
False,
), ),
( (
mock_get_service_letter_template, mock_get_service_letter_template,
partial(url_for, 'main.send_test'), partial(url_for, 'main.send_test'),
'Print a test letter', 'Print a test letter',
False,
), ),
( (
mock_get_service_letter_template, mock_get_service_letter_template,
partial(url_for, 'main.send_one_off'), partial(url_for, 'main.send_one_off'),
'Print a test letter', 'Print a test letter',
False,
), ),
]) ])
def test_send_one_off_or_test_has_correct_page_titles( def test_send_one_off_or_test_has_correct_page_titles(
@@ -385,6 +393,7 @@ def test_send_one_off_or_test_has_correct_page_titles(
template_mock, template_mock,
partial_url, partial_url,
expected_h1, expected_h1,
tour_shown,
): ):
template_mock(mocker) template_mock(mocker)
@@ -399,6 +408,8 @@ def test_send_one_off_or_test_has_correct_page_titles(
assert response.status_code == 200 assert response.status_code == 200
assert page.h1.text.strip() == expected_h1 assert page.h1.text.strip() == expected_h1
assert (len(page.select('.banner-tour')) == 1) == tour_shown
@pytest.mark.parametrize('template_mock, expected_link_text, expected_link_url', [ @pytest.mark.parametrize('template_mock, expected_link_text, expected_link_url', [
(mock_get_service_template, 'Use my phone number', partial(url_for, 'main.send_test')), (mock_get_service_template, 'Use my phone number', partial(url_for, 'main.send_test')),