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

Merge pull request #3199 from alphagov/show-recipient-trial-mode

Browse Source 
Show who the recipient is even in trial mode
This commit is contained in:
Chris Hill-Scott
2019-11-27 13:48:19 +00:00
committed by GitHub
parent 4fc8f5b5d1 0d202786d0
commit 5d4a0ee9ff
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/templates/views/uploads/preview.html
View File

@@ -30,20 +30,23 @@
{{ template|string }} {{ template|string }}
</div> </div>
{% if status == 'valid' and current_service.live %} {% if status == 'valid' %}
<div class="js-stick-at-bottom-when-scrolling"> <div class="js-stick-at-bottom-when-scrolling">
<p class="top-gutter-0 bottom-gutter-1-2 send-recipient" title="{{ recipient }}"> <p class="top-gutter-0 bottom-gutter-1-2 send-recipient" title="{{ recipient }}">
Recipient: {{ recipient }} Recipient: {{ recipient }}
</p> </p>
<form method="post" enctype="multipart/form-data" action="{{url_for( {% if current_service.live %}
'main.send_uploaded_letter', <form method="post" enctype="multipart/form-data" action="{{url_for(
service_id=current_service.id, 'main.send_uploaded_letter',
)}}" class='page-footer'> service_id=current_service.id,
{{ radios(form.postage, hide_legend=true, inline=True) }} )}}" class='page-footer'>
{{ form.file_id(value=file_id) }} {{ radios(form.postage, hide_legend=true, inline=True) }}
{{ page_footer("Send 1 letter") }} {{ form.file_id(value=file_id) }}
</form> {{ page_footer("Send 1 letter") }}
</form>
{% endif %}
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

8
tests/app/main/views/test_uploads.py
View File

@@ -366,7 +366,7 @@ def test_uploaded_letter_preview_does_not_show_send_button_if_service_in_trial_m
): ):
mocker.patch('app.main.views.uploads.service_api_client') mocker.patch('app.main.views.uploads.service_api_client')
mocker.patch('app.main.views.uploads.get_letter_metadata', return_value={ mocker.patch('app.main.views.uploads.get_letter_metadata', return_value={
'filename': 'my_letter.pdf', 'page_count': '1', 'status': 'valid'}) 'filename': 'my_letter.pdf', 'page_count': '1', 'status': 'valid', 'recipient': 'The Queen'})
# client_request uses service_one, which is in trial mode # client_request uses service_one, which is in trial mode
page = client_request.get( page = client_request.get(
@@ -382,6 +382,12 @@ def test_uploaded_letter_preview_does_not_show_send_button_if_service_in_trial_m
assert normalize_spaces(page.find('h1').text) == 'You cannot send this letter' assert normalize_spaces(page.find('h1').text) == 'You cannot send this letter'
assert page.find('div', class_='letter-sent') assert page.find('div', class_='letter-sent')
assert normalize_spaces(
page.select_one('.js-stick-at-bottom-when-scrolling p').text
) == (
'Recipient: The Queen'
)
assert not page.find('form')
assert not page.find('button', {'type': 'submit'}) assert not page.find('button', {'type': 'submit'})