mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-05 15:08:25 -04:00
notify-api-412 use black to enforce python coding style
This commit is contained in:
Kenneth Kehl
@@ -20,11 +20,14 @@ def test_should_return_verify_template(
|
||||
# TODO this lives here until we work out how to
|
||||
# reassign the session after it is lost mid register process
|
||||
with client_request.session_transaction() as session:
|
||||
session['user_details'] = {'email_address': api_user_active['email_address'], 'id': api_user_active['id']}
|
||||
page = client_request.get('main.verify')
|
||||
session["user_details"] = {
|
||||
"email_address": api_user_active["email_address"],
|
||||
"id": api_user_active["id"],
|
||||
}
|
||||
page = client_request.get("main.verify")
|
||||
|
||||
assert page.h1.text == 'Check your phone'
|
||||
message = page.select('main p')[0].text
|
||||
assert page.h1.text == "Check your phone"
|
||||
message = page.select("main p")[0].text
|
||||
assert message == "We’ve sent you a text message with a security code."
|
||||
|
||||
|
||||
@@ -37,25 +40,30 @@ def test_should_redirect_to_add_service_when_sms_code_is_correct(
|
||||
mock_create_event,
|
||||
fake_uuid,
|
||||
):
|
||||
api_user_active['current_session_id'] = str(uuid.UUID(int=1))
|
||||
mocker.patch('app.user_api_client.get_user', return_value=api_user_active)
|
||||
api_user_active["current_session_id"] = str(uuid.UUID(int=1))
|
||||
mocker.patch("app.user_api_client.get_user", return_value=api_user_active)
|
||||
|
||||
with client_request.session_transaction() as session:
|
||||
session['user_details'] = {'email_address': api_user_active['email_address'], 'id': api_user_active['id']}
|
||||
session["user_details"] = {
|
||||
"email_address": api_user_active["email_address"],
|
||||
"id": api_user_active["id"],
|
||||
}
|
||||
# user's only just created their account so no session in the cookie
|
||||
session.pop('current_session_id', None)
|
||||
session.pop("current_session_id", None)
|
||||
|
||||
client_request.post(
|
||||
'main.verify',
|
||||
_data={'sms_code': '123456'},
|
||||
_expected_redirect=url_for('main.add_service', first='first'),
|
||||
"main.verify",
|
||||
_data={"sms_code": "123456"},
|
||||
_expected_redirect=url_for("main.add_service", first="first"),
|
||||
)
|
||||
|
||||
# make sure the current_session_id has changed to what the API returned
|
||||
with client_request.session_transaction() as session:
|
||||
assert session['current_session_id'] == str(uuid.UUID(int=1))
|
||||
assert session["current_session_id"] == str(uuid.UUID(int=1))
|
||||
|
||||
mock_check_verify_code.assert_called_once_with(api_user_active['id'], '123456', 'sms')
|
||||
mock_check_verify_code.assert_called_once_with(
|
||||
api_user_active["id"], "123456", "sms"
|
||||
)
|
||||
|
||||
|
||||
def test_should_activate_user_after_verify(
|
||||
@@ -68,13 +76,13 @@ def test_should_activate_user_after_verify(
|
||||
mock_activate_user,
|
||||
):
|
||||
client_request.logout()
|
||||
mocker.patch('app.user_api_client.get_user', return_value=api_user_pending)
|
||||
mocker.patch("app.user_api_client.get_user", return_value=api_user_pending)
|
||||
with client_request.session_transaction() as session:
|
||||
session['user_details'] = {
|
||||
'email_address': api_user_pending['email_address'],
|
||||
'id': api_user_pending['id']
|
||||
session["user_details"] = {
|
||||
"email_address": api_user_pending["email_address"],
|
||||
"id": api_user_pending["id"],
|
||||
}
|
||||
client_request.post('main.verify', _data={'sms_code': '123456'})
|
||||
client_request.post("main.verify", _data={"sms_code": "123456"})
|
||||
assert mock_activate_user.called
|
||||
|
||||
|
||||
@@ -84,19 +92,19 @@ def test_should_return_200_when_sms_code_is_wrong(
|
||||
mock_check_verify_code_code_not_found,
|
||||
):
|
||||
with client_request.session_transaction() as session:
|
||||
session['user_details'] = {
|
||||
'email_address': api_user_active['email_address'],
|
||||
'id': api_user_active['id'],
|
||||
session["user_details"] = {
|
||||
"email_address": api_user_active["email_address"],
|
||||
"id": api_user_active["id"],
|
||||
}
|
||||
|
||||
page = client_request.post(
|
||||
'main.verify',
|
||||
_data={'sms_code': '123456'},
|
||||
"main.verify",
|
||||
_data={"sms_code": "123456"},
|
||||
_expected_status=200,
|
||||
)
|
||||
|
||||
assert len(page.select('.usa-error-message')) == 1
|
||||
assert 'Code not found' in page.select_one('.usa-error-message').text
|
||||
assert len(page.select(".usa-error-message")) == 1
|
||||
assert "Code not found" in page.select_one(".usa-error-message").text
|
||||
|
||||
|
||||
def test_verify_email_redirects_to_verify_if_token_valid(
|
||||
@@ -107,20 +115,27 @@ def test_verify_email_redirects_to_verify_if_token_valid(
|
||||
mock_send_verify_code,
|
||||
mock_check_verify_code,
|
||||
):
|
||||
token_data = {"user_id": api_user_pending['id'], "secret_code": 'UNUSED'}
|
||||
mocker.patch('app.main.views.verify.check_token', return_value=json.dumps(token_data))
|
||||
token_data = {"user_id": api_user_pending["id"], "secret_code": "UNUSED"}
|
||||
mocker.patch(
|
||||
"app.main.views.verify.check_token", return_value=json.dumps(token_data)
|
||||
)
|
||||
|
||||
client_request.get(
|
||||
'main.verify_email',
|
||||
token='notreal',
|
||||
_expected_redirect=url_for('main.verify'),
|
||||
"main.verify_email",
|
||||
token="notreal",
|
||||
_expected_redirect=url_for("main.verify"),
|
||||
)
|
||||
|
||||
assert not mock_check_verify_code.called
|
||||
mock_send_verify_code.assert_called_once_with(api_user_pending['id'], 'sms', api_user_pending['mobile_number'])
|
||||
mock_send_verify_code.assert_called_once_with(
|
||||
api_user_pending["id"], "sms", api_user_pending["mobile_number"]
|
||||
)
|
||||
|
||||
with client_request.session_transaction() as session:
|
||||
assert session['user_details'] == {'email': api_user_pending['email_address'], 'id': api_user_pending['id']}
|
||||
assert session["user_details"] == {
|
||||
"email": api_user_pending["email_address"],
|
||||
"id": api_user_pending["id"],
|
||||
}
|
||||
|
||||
|
||||
def test_verify_email_doesnt_verify_sms_if_user_on_email_auth(
|
||||
@@ -131,26 +146,35 @@ def test_verify_email_doesnt_verify_sms_if_user_on_email_auth(
|
||||
mock_activate_user,
|
||||
fake_uuid,
|
||||
):
|
||||
pending_user_with_email_auth = create_user(auth_type='email_auth', state='pending', id=fake_uuid)
|
||||
pending_user_with_email_auth = create_user(
|
||||
auth_type="email_auth", state="pending", id=fake_uuid
|
||||
)
|
||||
|
||||
mocker.patch('app.user_api_client.get_user', return_value=pending_user_with_email_auth)
|
||||
token_data = {"user_id": pending_user_with_email_auth['id'], "secret_code": 'UNUSED'}
|
||||
mocker.patch('app.main.views.verify.check_token', return_value=json.dumps(token_data))
|
||||
mocker.patch(
|
||||
"app.user_api_client.get_user", return_value=pending_user_with_email_auth
|
||||
)
|
||||
token_data = {
|
||||
"user_id": pending_user_with_email_auth["id"],
|
||||
"secret_code": "UNUSED",
|
||||
}
|
||||
mocker.patch(
|
||||
"app.main.views.verify.check_token", return_value=json.dumps(token_data)
|
||||
)
|
||||
|
||||
client_request.get(
|
||||
'main.verify_email',
|
||||
token='notreal',
|
||||
_expected_redirect=url_for('main.add_service', first='first'),
|
||||
"main.verify_email",
|
||||
token="notreal",
|
||||
_expected_redirect=url_for("main.add_service", first="first"),
|
||||
)
|
||||
|
||||
assert not mock_check_verify_code.called
|
||||
assert not mock_send_verify_code.called
|
||||
|
||||
mock_activate_user.assert_called_once_with(pending_user_with_email_auth['id'])
|
||||
mock_activate_user.assert_called_once_with(pending_user_with_email_auth["id"])
|
||||
|
||||
# user is logged in
|
||||
with client_request.session_transaction() as session:
|
||||
assert session['user_id'] == pending_user_with_email_auth['id']
|
||||
assert session["user_id"] == pending_user_with_email_auth["id"]
|
||||
|
||||
|
||||
def test_verify_email_redirects_to_email_sent_if_token_expired(
|
||||
@@ -159,12 +183,14 @@ def test_verify_email_redirects_to_email_sent_if_token_expired(
|
||||
api_user_pending,
|
||||
):
|
||||
client_request.logout()
|
||||
mocker.patch('app.main.views.verify.check_token', side_effect=SignatureExpired('expired'))
|
||||
mocker.patch(
|
||||
"app.main.views.verify.check_token", side_effect=SignatureExpired("expired")
|
||||
)
|
||||
|
||||
client_request.get(
|
||||
'main.verify_email',
|
||||
token='notreal',
|
||||
_expected_redirect=url_for('main.resend_email_verification'),
|
||||
"main.verify_email",
|
||||
token="notreal",
|
||||
_expected_redirect=url_for("main.resend_email_verification"),
|
||||
)
|
||||
|
||||
|
||||
@@ -177,23 +203,25 @@ def test_verify_email_redirects_to_sign_in_if_user_active(
|
||||
mock_check_verify_code,
|
||||
):
|
||||
client_request.logout()
|
||||
token_data = {"user_id": api_user_active['id'], "secret_code": 12345}
|
||||
mocker.patch('app.main.views.verify.check_token', return_value=json.dumps(token_data))
|
||||
token_data = {"user_id": api_user_active["id"], "secret_code": 12345}
|
||||
mocker.patch(
|
||||
"app.main.views.verify.check_token", return_value=json.dumps(token_data)
|
||||
)
|
||||
|
||||
page = client_request.get('main.verify_email', token='notreal', _follow_redirects=True)
|
||||
page = client_request.get(
|
||||
"main.verify_email", token="notreal", _follow_redirects=True
|
||||
)
|
||||
|
||||
assert page.h1.text == 'Sign in'
|
||||
flash_banner = page.find('div', class_='banner-dangerous').string.strip()
|
||||
assert page.h1.text == "Sign in"
|
||||
flash_banner = page.find("div", class_="banner-dangerous").string.strip()
|
||||
assert flash_banner == "That verification link has expired."
|
||||
|
||||
|
||||
def test_verify_redirects_to_sign_in_if_not_logged_in(
|
||||
client_request
|
||||
):
|
||||
def test_verify_redirects_to_sign_in_if_not_logged_in(client_request):
|
||||
client_request.logout()
|
||||
client_request.get(
|
||||
'main.verify',
|
||||
_expected_redirect=url_for('main.sign_in'),
|
||||
"main.verify",
|
||||
_expected_redirect=url_for("main.sign_in"),
|
||||
)
|
||||
|
||||
|
||||
@@ -207,22 +235,29 @@ def test_activate_user_redirects_to_service_dashboard_if_user_already_belongs_to
|
||||
mock_get_service,
|
||||
mock_get_invited_user_by_id,
|
||||
):
|
||||
mocker.patch('app.user_api_client.add_user_to_service', side_effect=HTTPError(
|
||||
response=Mock(
|
||||
status_code=400,
|
||||
json={
|
||||
"result": "error",
|
||||
"message": {f"User id: {api_user_active['id']} already part of service id: {service_one['id']}"}
|
||||
},
|
||||
mocker.patch(
|
||||
"app.user_api_client.add_user_to_service",
|
||||
side_effect=HTTPError(
|
||||
response=Mock(
|
||||
status_code=400,
|
||||
json={
|
||||
"result": "error",
|
||||
"message": {
|
||||
f"User id: {api_user_active['id']} already part of service id: {service_one['id']}"
|
||||
},
|
||||
},
|
||||
),
|
||||
message=f"User id: {api_user_active['id']} already part of service id: {service_one['id']}",
|
||||
),
|
||||
message=f"User id: {api_user_active['id']} already part of service id: {service_one['id']}"
|
||||
))
|
||||
)
|
||||
|
||||
# Can't use `with client.session_transaction()...` here since activate_session is not a view function
|
||||
flask_session['invited_user_id'] = sample_invite['id']
|
||||
flask_session["invited_user_id"] = sample_invite["id"]
|
||||
|
||||
response = activate_user(api_user_active['id'])
|
||||
response = activate_user(api_user_active["id"])
|
||||
|
||||
assert response.location == url_for('main.service_dashboard', service_id=service_one['id'])
|
||||
assert response.location == url_for(
|
||||
"main.service_dashboard", service_id=service_one["id"]
|
||||
)
|
||||
|
||||
flask_session.pop('invited_user_id')
|
||||
flask_session.pop("invited_user_id")
|
||||
|
||||
Reference in New Issue
Block a user