Fix tests and other bits

app/main/views/service_settings.py

@@ -110,11 +110,11 @@ def service_request_to_go_live(service_id):
             'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
             'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
             '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'],
                 url_for('main.service_dashboard', service_id=current_service['id'], _external=True),
                 form.channel.data,

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

@@ -1,6 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/banner.html" import banner_wrapper %}
 
 {% block page_title %}
   Request to go live – GOV.UK Notify
@@ -17,7 +18,7 @@
           <a href="{{ url_for('main.feedback') }}">Contact the Notify team</a> to get a copy of the agreement or to find out if your organisation has already accepted it.
         </p>
       {% endcall %}
-      
+
       <p>
         Before you request to go live, make you you’ve:
       </p>
@@ -26,10 +27,10 @@
         <li>read our <a href="{{ url_for('.terms') }}">terms of use</a></li>
         <li>added <a href="{{ url_for('main.manage_users', service_id=current_service.id) }}">team members</a> to your account</li>
         <li>
-          specified your reply to email address or text message sender in your 
+          specified your reply to email address or text message sender in your
           <a href="{{ url_for('main.service_settings', service_id=current_service.id) }}">settings</a> page</li>
         <li>
-          added the templates you want to start with, making sure they follow our 
+          added the templates you want to start with, making sure they follow our
           <a href="https://designpatterns.hackpad.com/Notifications-5vuitmNqIjZ" rel="external">design patterns</a>,
           <a href="https://www.gov.uk/topic/government-digital-guidance/content-publishing" rel="external">style guide</a>
           and
@@ -47,10 +48,10 @@
         <p>
           Once you’ve completed the tasks needed to set up, we’ll make your service live. We’ll do this within one working day.
         </p>
-        <p>  
+        <p>
           By requesting to go live you are agreeing to our terms of use.
         </p>
-        
+
         {{ page_footer('Request to go live') }}
       </form>
 

app/templates/views/terms-of-use.html

@@ -1,4 +1,5 @@
 {% extends "withoutnav_template.html" %}
+{% from "components/banner.html" import banner_wrapper %}
 
 {% block page_title %}
 Terms of use – GOV.UK Notify
@@ -19,9 +20,9 @@ Terms of use – GOV.UK Notify
         <p>
           <a href="{{ url_for('main.feedback') }}">Contact the Notify team</a> to get a copy of the agreement or to find out if your organisation has already accepted it.
         </p>
-    
+
     {% endcall %}
-    
+
     <p>To accept these terms, you must be the service manager for your service. If you’re not the service manager, you’ll need to invite them.</p>
 
     <section id="summary">
@@ -161,7 +162,7 @@ Terms of use – GOV.UK Notify
       <p>When you send messages through GOV.UK Notify, we provide feedback on the status of every text message, email and letter.</p>
 
       <p>You agree to use our delivery data to check (and potentially remove) bounced email addresses, mobile numbers and postal addresses from your database.</p>
-      
+
       <p>You agree to ensure your user’s personal data is kept accurate and up to date, in line with Data Protection Act principles.</p>
 
       <p>If you have consistently high bounce rates, we will investigate and may refuse to accept further messages for delivery. This is to protect delivery rates for other services using GOV.UK Notify.</p>
@@ -190,7 +191,7 @@ Terms of use – GOV.UK Notify
       <p>You must estimate how many text messages, emails and letters you plan to send each year, including any spikes or seasonal variation.</p>
 
       <p>We will make sure GOV.UK Notify is easily able to handle your estimated sending volume.</p>
-     
+
       <h3 class="heading-small" id="we-will-check-your-templates-before-you-can-go-live">
         We’ll check your templates before you can go live
       </h3>
@@ -204,7 +205,7 @@ Terms of use – GOV.UK Notify
       </h2>
 
       <p>You can remove your service from GOV.UK Notify at any time. <a href="{{ url_for('main.feedback') }}">Contact us</a> and we’ll delete your account.</p>
-      
+
       <p>Any data that you have processed through GOV.UK Notify will be deleted as part of the existing data deletion processes.</p>
 
     </section>

tests/app/main/views/test_service_settings.py

@@ -323,7 +323,7 @@ def test_should_redirect_after_request_to_go_live(
                     'subject': 'Request to go live',
                     'department_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_email': api_user_active.email_address
                 },