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

Tidy up text on forgot your password screens

Browse Source
This commit is contained in:
Henry Hadlow
2016-05-10 11:36:49 +01:00
parent 90140e1d47
commit 36da188d04
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/forgot-password.html
View File

@@ -10,9 +10,9 @@ Create a new password – GOV.UK Notify
<div class="grid-row"> <div class="grid-row">
<div class="column-two-thirds"> <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"> <form autocomplete="off" method="post">
{{ textbox(form.email_address, safe_error_message=True) }} {{ textbox(form.email_address, safe_error_message=True) }}

4
app/templates/views/password-reset-sent.html
View File

@@ -8,9 +8,9 @@ GOV.UK Notify
<div class="grid-row"> <div class="grid-row">
<div class="column-two-thirds"> <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>
</div> </div>

2
app/templates/views/signin.html
View File

@@ -17,7 +17,7 @@
<form method="post" autocomplete="nope"> <form method="post" autocomplete="nope">
{{ textbox(form.email_address) }} {{ textbox(form.email_address) }}
{{ textbox(form.password) }} {{ 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> </form>
</div> </div>
</div> </div>

12
tests/app/main/views/test_forgot_password.py
View File

@@ -8,7 +8,7 @@ def test_should_render_forgot_password(app_):
with app_.test_request_context(): with app_.test_request_context():
response = app_.test_client().get(url_for('.forgot_password')) response = app_.test_client().get(url_for('.forgot_password'))
assert response.status_code == 200 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) 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'), url_for('.forgot_password'),
data={'email_address': api_user_active.email_address}) data={'email_address': api_user_active.email_address})
assert response.status_code == 200 assert response.status_code == 200
assert ( assert 'We’ve sent you an email with a link to reset your password.' \
'You have been sent an email containing a link' in response.get_data(as_text=True)
' 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) 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'), url_for('.forgot_password'),
data={'email_address': api_user_active.email_address}) data={'email_address': api_user_active.email_address})
assert response.status_code == 200 assert response.status_code == 200
assert ( assert 'We’ve sent you an email with a link to reset your password.' \
'You have been sent an email containing a link' in response.get_data(as_text=True)
' 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) app.user_api_client.send_reset_password_url.assert_called_once_with(api_user_active.email_address)

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

@@ -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 'Sign in' in response.get_data(as_text=True)
assert 'Email address' 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 '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_, def test_logged_in_user_redirects_to_choose_service(app_,