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

Merge pull request #927 from alphagov/quis-patch-1

Browse Source 
Reword resend email page
This commit is contained in:
Chris Hill-Scott
2016-09-07 15:25:33 +01:00
committed by GitHub
parent 9cf3854ac6 897b89ba6e
commit 6f1fa62714
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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">Now check your email</h1> <h1 class="heading-large">Check your email</h1>
<p>We’ve sent you an email with a link to reset your password.</p> <p>Click the link in the email to reset your password.</p>
</div> </div>
</div> </div>

2
app/templates/views/resend-email-verification.html
View File

@@ -11,7 +11,7 @@
<div class="grid-row"> <div class="grid-row">
<div class="column-two-thirds"> <div class="column-two-thirds">
<h1 class="heading-large">Check your email</h1> <h1 class="heading-large">Check your email</h1>
<p>In order to verify your email address we've sent a new confirmation link to {{email}}</p> <p>A new confirmation email has been sent to {{email}}</p>
</div> </div>
</div> </div>

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

@@ -21,7 +21,7 @@ def test_should_render_email_verification_resend_show_email_address_and_resend_v
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string == 'Check your email' assert page.h1.string == 'Check your email'
expected = "In order to verify your email address we've sent a new confirmation link to {}".format(api_user_active.email_address) # noqa expected = "A new confirmation email has been sent to {}".format(api_user_active.email_address)
message = page.find_all('p')[1].text message = page.find_all('p')[1].text
assert message == expected assert message == expected

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

@@ -22,7 +22,7 @@ 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 'We’ve sent you an email with a link to reset your password.' \ assert 'Click the link in the email to reset your password.' \
in response.get_data(as_text=True) 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)
@@ -39,6 +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 'We’ve sent you an email with a link to reset your password.' \ assert 'Click the link in the email to reset your password.' \
in response.get_data(as_text=True) 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)