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

Fix tests and other bits

Browse Source
This commit is contained in:
Imdad Ahad
2016-10-24 15:35:51 +01:00
parent 3c53a8a269
commit 876832801e
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/views/service_settings.py
View File

@@ -110,11 +110,11 @@ def service_request_to_go_live(service_id):
'department_id': current_app.config.get('DESKPRO_DEPT_ID'), 'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'), 'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
'subject': 'Request to go live', 'subject': 'Request to go live',
'message': 'message': (
('On behalf of {} ({})\n\nExpected usage\n---' 'On behalf of {} ({})\n\nExpected usage\n---'
'\nChannel: {}\nStart date: {}\nStart volume: {}' '\nChannel: {}\nStart date: {}\nStart volume: {}'
'\nPeak volume: {}\nUpload or API: {}') '\nPeak volume: {}\nUpload or API: {}'
.format( ).format(
current_service['name'], current_service['name'],
url_for('main.service_dashboard', service_id=current_service['id'], _external=True), url_for('main.service_dashboard', service_id=current_service['id'], _external=True),
form.channel.data, form.channel.data,

1
app/templates/views/service-settings/request-to-go-live.html
View File

@@ -1,6 +1,7 @@
{% extends "withnav_template.html" %} {% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %} {% from "components/textbox.html" import textbox %}
{% from "components/page-footer.html" import page_footer %} {% from "components/page-footer.html" import page_footer %}
{% from "components/banner.html" import banner_wrapper %}
{% block page_title %} {% block page_title %}
Request to go live – GOV.UK Notify Request to go live – GOV.UK Notify

1
app/templates/views/terms-of-use.html
View File

@@ -1,4 +1,5 @@
{% extends "withoutnav_template.html" %} {% extends "withoutnav_template.html" %}
{% from "components/banner.html" import banner_wrapper %}
{% block page_title %} {% block page_title %}
Terms of use – GOV.UK Notify Terms of use – GOV.UK Notify

2
tests/app/main/views/test_service_settings.py
View File

@@ -323,7 +323,7 @@ def test_should_redirect_after_request_to_go_live(
'subject': 'Request to go live', 'subject': 'Request to go live',
'department_id': ANY, 'department_id': ANY,
'agent_team_id': ANY, 'agent_team_id': ANY,
'message': 'On behalf of Test Service (http://localhost/services/6ce466d0-fd6a-11e5-82f5-e0accb9d11a6/dashboard)\n\nUsage estimate\n---\n\nOne million messages', # noqa 'message': ANY, # noqa
'person_name': api_user_active.name, 'person_name': api_user_active.name,
'person_email': api_user_active.email_address 'person_email': api_user_active.email_address
}, },