mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-02-13 23:14:32 -05:00
We have a `client_request` fixture which does a bunch of useful stuff
like:
- checking the status code of the response
- returning a `BeautifulSoup` object
Lots of our tests still use an older fixture called `client`. This is
not as good because it:
- returns a raw `Response` object
- doesn’t do the additional checks
- means our tests contain a lot of repetetive boilerplate like `page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')`
This commit converts all the tests which had a `client.get(…)` or
`client.post(…)` statement to use their equivalents on `client_request`
instead.
Subsequent commits will remove uses of `client` in other tests, but
doing it this way means the work can be broken up into more manageable
chunks.
211 lines
6.5 KiB
Python
211 lines
6.5 KiB
Python
import pytest
|
|
from flask import url_for
|
|
|
|
from tests.conftest import SERVICE_ONE_ID
|
|
|
|
|
|
def test_should_render_email_verification_resend_show_email_address_and_resend_verify_email(
|
|
client_request,
|
|
mocker,
|
|
api_user_active,
|
|
mock_get_user_by_email,
|
|
mock_send_verify_email,
|
|
):
|
|
client_request.logout()
|
|
with client_request.session_transaction() as session:
|
|
session['user_details'] = {
|
|
'id': api_user_active['id'],
|
|
'email': api_user_active['email_address']}
|
|
page = client_request.get('main.resend_email_verification')
|
|
|
|
assert page.h1.string == 'Check your email'
|
|
expected = "A new confirmation email has been sent to {}".format(api_user_active['email_address'])
|
|
|
|
message = page.select('main p')[0].text
|
|
assert message == expected
|
|
mock_send_verify_email.assert_called_with(api_user_active['id'], api_user_active['email_address'])
|
|
|
|
|
|
@pytest.mark.parametrize('redirect_url', [
|
|
None,
|
|
f'/services/{SERVICE_ONE_ID}/templates',
|
|
])
|
|
def test_should_render_correct_resend_template_for_active_user(
|
|
client_request,
|
|
api_user_active,
|
|
mock_get_user_by_email,
|
|
mock_send_verify_code,
|
|
redirect_url
|
|
):
|
|
client_request.logout()
|
|
with client_request.session_transaction() as session:
|
|
session['user_details'] = {
|
|
'id': api_user_active['id'],
|
|
'email': api_user_active['email_address']}
|
|
page = client_request.get('main.check_and_resend_text_code', next=redirect_url)
|
|
|
|
assert page.h1.string == 'Resend security code'
|
|
# there shouldn't be a form for updating mobile number
|
|
assert page.find('form') is None
|
|
assert page.find('a', class_="govuk-button")['href'] == url_for(
|
|
'main.check_and_resend_verification_code',
|
|
next=redirect_url
|
|
)
|
|
|
|
|
|
def test_should_render_correct_resend_template_for_pending_user(
|
|
client_request,
|
|
mocker,
|
|
api_user_pending,
|
|
mock_send_verify_code,
|
|
):
|
|
client_request.logout()
|
|
mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_pending)
|
|
|
|
with client_request.session_transaction() as session:
|
|
session['user_details'] = {
|
|
'id': api_user_pending['id'],
|
|
'email': api_user_pending['email_address']}
|
|
page = client_request.get('main.check_and_resend_text_code')
|
|
|
|
assert page.h1.string == 'Check your mobile number'
|
|
|
|
expected = 'Check your mobile phone number is correct and then resend the security code.'
|
|
message = page.select('main p')[0].text
|
|
assert message == expected
|
|
assert page.find('form').input['value'] == api_user_pending['mobile_number']
|
|
|
|
|
|
@pytest.mark.parametrize('redirect_url', [
|
|
None,
|
|
f'/services/{SERVICE_ONE_ID}/templates',
|
|
])
|
|
@pytest.mark.parametrize('phone_number_to_register_with', [
|
|
'+447700900460',
|
|
'+1800-555-555',
|
|
])
|
|
def test_should_resend_verify_code_and_update_mobile_for_pending_user(
|
|
client_request,
|
|
mocker,
|
|
api_user_pending,
|
|
mock_update_user_attribute,
|
|
mock_send_verify_code,
|
|
phone_number_to_register_with,
|
|
redirect_url
|
|
):
|
|
client_request.logout()
|
|
mock_update_user_attribute.reset_mock()
|
|
mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_pending)
|
|
|
|
with client_request.session_transaction() as session:
|
|
session['user_details'] = {
|
|
'id': api_user_pending['id'],
|
|
'email': api_user_pending['email_address']}
|
|
|
|
client_request.post(
|
|
'main.check_and_resend_text_code',
|
|
next=redirect_url,
|
|
_data={'mobile_number': phone_number_to_register_with},
|
|
_expected_redirect=url_for('main.verify', _external=True, next=redirect_url),
|
|
)
|
|
|
|
mock_update_user_attribute.assert_called_once_with(
|
|
api_user_pending['id'],
|
|
mobile_number=phone_number_to_register_with,
|
|
)
|
|
mock_send_verify_code.assert_called_once_with(
|
|
api_user_pending['id'],
|
|
'sms',
|
|
phone_number_to_register_with,
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize('redirect_url', [
|
|
None,
|
|
f'/services/{SERVICE_ONE_ID}/templates',
|
|
])
|
|
def test_check_and_redirect_to_two_factor_if_user_active(
|
|
client_request,
|
|
api_user_active,
|
|
mock_get_user_by_email,
|
|
mock_send_verify_code,
|
|
redirect_url
|
|
):
|
|
client_request.logout()
|
|
with client_request.session_transaction() as session:
|
|
session['user_details'] = {
|
|
'id': api_user_active['id'],
|
|
'email': api_user_active['email_address']}
|
|
client_request.get(
|
|
'main.check_and_resend_verification_code',
|
|
next=redirect_url,
|
|
_expected_redirect=url_for('main.two_factor_sms', _external=True, next=redirect_url)
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize('redirect_url', [
|
|
None,
|
|
f'/services/{SERVICE_ONE_ID}/templates',
|
|
])
|
|
def test_check_and_redirect_to_verify_if_user_pending(
|
|
client_request,
|
|
mocker,
|
|
api_user_pending,
|
|
mock_get_user_pending,
|
|
mock_send_verify_code,
|
|
redirect_url
|
|
):
|
|
client_request.logout()
|
|
mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_pending)
|
|
|
|
with client_request.session_transaction() as session:
|
|
session['user_details'] = {
|
|
'id': api_user_pending['id'],
|
|
'email': api_user_pending['email_address']}
|
|
|
|
client_request.get(
|
|
'main.check_and_resend_verification_code',
|
|
next=redirect_url,
|
|
_expected_redirect=url_for('main.verify', _external=True, next=redirect_url),
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize('endpoint', [
|
|
'main.resend_email_verification',
|
|
'main.check_and_resend_text_code',
|
|
'main.check_and_resend_verification_code',
|
|
])
|
|
def test_redirect_to_sign_in_if_not_logged_in(
|
|
client_request,
|
|
endpoint,
|
|
):
|
|
client_request.logout()
|
|
client_request.get(
|
|
endpoint,
|
|
_expected_redirect=url_for('main.sign_in', _external=True),
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize('redirect_url', [
|
|
None,
|
|
f'/services/{SERVICE_ONE_ID}/templates',
|
|
])
|
|
def test_should_render_correct_email_not_received_template_for_active_user(
|
|
client_request,
|
|
api_user_active,
|
|
mock_get_user_by_email,
|
|
mock_send_verify_code,
|
|
redirect_url
|
|
):
|
|
client_request.logout()
|
|
with client_request.session_transaction() as session:
|
|
session['user_details'] = {
|
|
'id': api_user_active['id'],
|
|
'email': api_user_active['email_address']}
|
|
page = client_request.get('main.email_not_received', next=redirect_url)
|
|
|
|
assert page.h1.string == 'Resend email link'
|
|
# there shouldn't be a form for updating mobile number
|
|
assert page.find('form') is None
|
|
assert page.find('a', class_="govuk-button")['href'] == url_for('main.resend_email_link', next=redirect_url)
|