From 36da188d049bbfa14bf737ec9c2e739cc80d7ff8 Mon Sep 17 00:00:00 2001
From: Henry Hadlow <henry@manofscience.co.uk>
Date: Tue, 10 May 2016 11:36:49 +0100
Subject: [PATCH] Tidy up text on forgot your password screens

---
 app/templates/views/forgot-password.html     |  4 ++--
 app/templates/views/password-reset-sent.html |  4 ++--
 app/templates/views/signin.html              |  2 +-
 tests/app/main/views/test_forgot_password.py | 12 +++++-------
 tests/app/main/views/test_sign_in.py         |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/templates/views/forgot-password.html b/app/templates/views/forgot-password.html
index b8e97ebb9..250a6319e 100644
--- a/app/templates/views/forgot-password.html
+++ b/app/templates/views/forgot-password.html
@@ -10,9 +10,9 @@ Create a new password – GOV.UK Notify
 
 <div class="grid-row">
   <div class="column-two-thirds">
-    <h1 class="heading-large">Create a new password</h1>
+    <h1 class="heading-large">Forgot your password?</h1>
 
-    <p>If you have forgotten your password, we can send you an email to create a new password.</p>
+    <p>We’ll send you an email to create a new password.</p>
 
     <form autocomplete="off" method="post">
       {{ textbox(form.email_address, safe_error_message=True) }}
diff --git a/app/templates/views/password-reset-sent.html b/app/templates/views/password-reset-sent.html
index 9fc600a4a..5e9e62857 100644
--- a/app/templates/views/password-reset-sent.html
+++ b/app/templates/views/password-reset-sent.html
@@ -8,9 +8,9 @@ GOV.UK Notify
 
 <div class="grid-row">
   <div class="column-two-thirds">
-    <h1 class="heading-large">GOV.UK Notify</h1>
+    <h1 class="heading-large">Now check your email</h1>
 
-    <p>You have been sent an email containing a link to reset your password.</p>
+    <p>We’ve sent you an email with a link to reset your password.</p>
 
   </div>
 </div>
diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html
index d08778e0e..719144e3a 100644
--- a/app/templates/views/signin.html
+++ b/app/templates/views/signin.html
@@ -17,7 +17,7 @@
     <form method="post" autocomplete="nope">
       {{ textbox(form.email_address) }}
       {{ textbox(form.password) }}
-      {{ page_footer("Continue", secondary_link=url_for('.forgot_password'), secondary_link_text="Forgotten password?") }}
+      {{ page_footer("Continue", secondary_link=url_for('.forgot_password'), secondary_link_text="Forgot your password?") }}
     </form>
   </div>
 </div>
diff --git a/tests/app/main/views/test_forgot_password.py b/tests/app/main/views/test_forgot_password.py
index 7f45ce6c2..a195f3ea2 100644
--- a/tests/app/main/views/test_forgot_password.py
+++ b/tests/app/main/views/test_forgot_password.py
@@ -8,7 +8,7 @@ def test_should_render_forgot_password(app_):
     with app_.test_request_context():
         response = app_.test_client().get(url_for('.forgot_password'))
         assert response.status_code == 200
-        assert 'If you have forgotten your password, we can send you an email to create a new password.' \
+        assert 'We’ll send you an email to create a new password.' \
                in response.get_data(as_text=True)
 
 
@@ -22,9 +22,8 @@ def test_should_redirect_to_password_reset_sent_for_valid_email(
             url_for('.forgot_password'),
             data={'email_address': api_user_active.email_address})
         assert response.status_code == 200
-        assert (
-            'You have been sent an email containing a link'
-            ' to reset your password.') in response.get_data(as_text=True)
+        assert 'We’ve sent you an email with a link to reset your password.' \
+               in response.get_data(as_text=True)
         app.user_api_client.send_reset_password_url.assert_called_once_with(api_user_active.email_address)
 
 
@@ -40,7 +39,6 @@ def test_should_redirect_to_password_reset_sent_for_missing_email(
             url_for('.forgot_password'),
             data={'email_address': api_user_active.email_address})
         assert response.status_code == 200
-        assert (
-            'You have been sent an email containing a link'
-            ' to reset your password.') in response.get_data(as_text=True)
+        assert 'We’ve sent you an email with a link to reset your password.' \
+               in response.get_data(as_text=True)
         app.user_api_client.send_reset_password_url.assert_called_once_with(api_user_active.email_address)
diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py
index 745f0d419..56e0a7abb 100644
--- a/tests/app/main/views/test_sign_in.py
+++ b/tests/app/main/views/test_sign_in.py
@@ -9,7 +9,7 @@ def test_render_sign_in_returns_sign_in_template(app_):
     assert 'Sign in' in response.get_data(as_text=True)
     assert 'Email address' in response.get_data(as_text=True)
     assert 'Password' in response.get_data(as_text=True)
-    assert 'Forgotten password?' in response.get_data(as_text=True)
+    assert 'Forgot your password?' in response.get_data(as_text=True)
 
 
 def test_logged_in_user_redirects_to_choose_service(app_,