mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-18 21:49:37 -04:00
notify-api-412 use black to enforce python coding style
This commit is contained in:
@@ -13,43 +13,51 @@ def test_should_render_email_verification_resend_show_email_address_and_resend_v
|
||||
):
|
||||
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')
|
||||
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'])
|
||||
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
|
||||
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'])
|
||||
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',
|
||||
])
|
||||
@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
|
||||
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)
|
||||
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'
|
||||
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_="usa-button")['href'] == url_for(
|
||||
'main.check_and_resend_verification_code',
|
||||
next=redirect_url
|
||||
assert page.find("form") is None
|
||||
assert page.find("a", class_="usa-button")["href"] == url_for(
|
||||
"main.check_and_resend_verification_code", next=redirect_url
|
||||
)
|
||||
|
||||
|
||||
@@ -60,30 +68,39 @@ def test_should_render_correct_resend_template_for_pending_user(
|
||||
mock_send_verify_code,
|
||||
):
|
||||
client_request.logout()
|
||||
mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_pending)
|
||||
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')
|
||||
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'
|
||||
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
|
||||
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']
|
||||
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', [
|
||||
'+12027009004',
|
||||
'+1800-555-5555',
|
||||
])
|
||||
@pytest.mark.parametrize(
|
||||
"redirect_url",
|
||||
[
|
||||
None,
|
||||
f"/services/{SERVICE_ONE_ID}/templates",
|
||||
],
|
||||
)
|
||||
@pytest.mark.parametrize(
|
||||
"phone_number_to_register_with",
|
||||
[
|
||||
"+12027009004",
|
||||
"+1800-555-5555",
|
||||
],
|
||||
)
|
||||
def test_should_resend_verify_code_and_update_mobile_for_pending_user(
|
||||
client_request,
|
||||
mocker,
|
||||
@@ -91,90 +108,102 @@ def test_should_resend_verify_code_and_update_mobile_for_pending_user(
|
||||
mock_update_user_attribute,
|
||||
mock_send_verify_code,
|
||||
phone_number_to_register_with,
|
||||
redirect_url
|
||||
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)
|
||||
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']}
|
||||
session["user_details"] = {
|
||||
"id": api_user_pending["id"],
|
||||
"email": api_user_pending["email_address"],
|
||||
}
|
||||
|
||||
client_request.post(
|
||||
'main.check_and_resend_text_code',
|
||||
"main.check_and_resend_text_code",
|
||||
next=redirect_url,
|
||||
_data={'mobile_number': phone_number_to_register_with},
|
||||
_expected_redirect=url_for('main.verify', next=redirect_url),
|
||||
_data={"mobile_number": phone_number_to_register_with},
|
||||
_expected_redirect=url_for("main.verify", next=redirect_url),
|
||||
)
|
||||
|
||||
mock_update_user_attribute.assert_called_once_with(
|
||||
api_user_pending['id'],
|
||||
api_user_pending["id"],
|
||||
mobile_number=phone_number_to_register_with,
|
||||
)
|
||||
mock_send_verify_code.assert_called_once_with(
|
||||
api_user_pending['id'],
|
||||
'sms',
|
||||
api_user_pending["id"],
|
||||
"sms",
|
||||
phone_number_to_register_with,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('redirect_url', [
|
||||
None,
|
||||
f'/services/{SERVICE_ONE_ID}/templates',
|
||||
])
|
||||
@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
|
||||
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']}
|
||||
session["user_details"] = {
|
||||
"id": api_user_active["id"],
|
||||
"email": api_user_active["email_address"],
|
||||
}
|
||||
client_request.get(
|
||||
'main.check_and_resend_verification_code',
|
||||
"main.check_and_resend_verification_code",
|
||||
next=redirect_url,
|
||||
_expected_redirect=url_for('main.two_factor_sms', next=redirect_url)
|
||||
_expected_redirect=url_for("main.two_factor_sms", next=redirect_url),
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('redirect_url', [
|
||||
None,
|
||||
f'/services/{SERVICE_ONE_ID}/templates',
|
||||
])
|
||||
@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
|
||||
redirect_url,
|
||||
):
|
||||
client_request.logout()
|
||||
mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_pending)
|
||||
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']}
|
||||
session["user_details"] = {
|
||||
"id": api_user_pending["id"],
|
||||
"email": api_user_pending["email_address"],
|
||||
}
|
||||
|
||||
client_request.get(
|
||||
'main.check_and_resend_verification_code',
|
||||
"main.check_and_resend_verification_code",
|
||||
next=redirect_url,
|
||||
_expected_redirect=url_for('main.verify', next=redirect_url),
|
||||
_expected_redirect=url_for("main.verify", next=redirect_url),
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('endpoint', [
|
||||
'main.resend_email_verification',
|
||||
'main.check_and_resend_text_code',
|
||||
'main.check_and_resend_verification_code',
|
||||
])
|
||||
@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,
|
||||
@@ -182,29 +211,35 @@ def test_redirect_to_sign_in_if_not_logged_in(
|
||||
client_request.logout()
|
||||
client_request.get(
|
||||
endpoint,
|
||||
_expected_redirect=url_for('main.sign_in'),
|
||||
_expected_redirect=url_for("main.sign_in"),
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('redirect_url', [
|
||||
None,
|
||||
f'/services/{SERVICE_ONE_ID}/templates',
|
||||
])
|
||||
@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
|
||||
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)
|
||||
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'
|
||||
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_="usa-button")['href'] == url_for('main.resend_email_link', next=redirect_url)
|
||||
assert page.find("form") is None
|
||||
assert page.find("a", class_="usa-button")["href"] == url_for(
|
||||
"main.resend_email_link", next=redirect_url
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user