notify-api-412 use black to enforce python coding style

This commit is contained in:
Kenneth Kehl
2023-08-25 09:12:23 -07:00
parent c6eb007386
commit 8c9721d8e2
201 changed files with 31660 additions and 28105 deletions

View File

@@ -15,22 +15,21 @@ def test_invite_org_user(
mock_get_organization,
sample_org_invite,
):
mock_invite_org_user = mocker.patch(
'app.org_invite_api_client.create_invite',
"app.org_invite_api_client.create_invite",
return_value=sample_org_invite,
)
client_request.post(
'.invite_org_user',
".invite_org_user",
org_id=ORGANISATION_ID,
_data={'email_address': 'test@example.gsa.gov'}
_data={"email_address": "test@example.gsa.gov"},
)
mock_invite_org_user.assert_called_once_with(
sample_org_invite['invited_by'],
'{}'.format(ORGANISATION_ID),
'test@example.gsa.gov',
sample_org_invite["invited_by"],
"{}".format(ORGANISATION_ID),
"test@example.gsa.gov",
)
@@ -41,23 +40,25 @@ def test_invite_org_user_errors_when_same_email_as_inviter(
sample_org_invite,
):
new_org_user_data = {
'email_address': 'test@user.gsa.gov',
"email_address": "test@user.gsa.gov",
}
mock_invite_org_user = mocker.patch(
'app.org_invite_api_client.create_invite',
"app.org_invite_api_client.create_invite",
return_value=sample_org_invite,
)
page = client_request.post(
'.invite_org_user',
".invite_org_user",
org_id=ORGANISATION_ID,
_data=new_org_user_data,
_follow_redirects=True
_follow_redirects=True,
)
assert mock_invite_org_user.called is False
assert 'You cannot send an invitation to yourself' in normalize_spaces(page.select_one('.usa-error-message').text)
assert "You cannot send an invitation to yourself" in normalize_spaces(
page.select_one(".usa-error-message").text
)
def test_cancel_invited_org_user_cancels_user_invitations(
@@ -68,38 +69,42 @@ def test_cancel_invited_org_user_cancels_user_invitations(
mock_get_users_for_organization,
mocker,
):
mock_cancel = mocker.patch('app.org_invite_api_client.cancel_invited_user')
mocker.patch('app.org_invite_api_client.get_invited_user_for_org', return_value=sample_org_invite)
mock_cancel = mocker.patch("app.org_invite_api_client.cancel_invited_user")
mocker.patch(
"app.org_invite_api_client.get_invited_user_for_org",
return_value=sample_org_invite,
)
page = client_request.get(
'main.cancel_invited_org_user',
"main.cancel_invited_org_user",
org_id=ORGANISATION_ID,
invited_user_id=sample_org_invite['id'],
_follow_redirects=True
invited_user_id=sample_org_invite["id"],
_follow_redirects=True,
)
assert normalize_spaces(page.h1.text) == 'Team members'
assert normalize_spaces(page.h1.text) == "Team members"
flash_banner = normalize_spaces(
page.find('div', class_='banner-default-with-tick').text
page.find("div", class_="banner-default-with-tick").text
)
assert (
flash_banner == f"Invitation cancelled for {sample_org_invite['email_address']}"
)
assert flash_banner == f"Invitation cancelled for {sample_org_invite['email_address']}"
mock_cancel.assert_called_once_with(
org_id=ORGANISATION_ID,
invited_user_id=sample_org_invite['id'],
invited_user_id=sample_org_invite["id"],
)
def test_accepted_invite_when_other_user_already_logged_in(
client_request,
mock_check_org_invite_token
client_request, mock_check_org_invite_token
):
page = client_request.get(
'main.accept_org_invite',
token='thisisnotarealtoken',
"main.accept_org_invite",
token="thisisnotarealtoken",
follow_redirects=True,
_expected_status=403,
)
assert 'This invite is for another email address.' in normalize_spaces(
page.select_one('.banner-dangerous').text
assert "This invite is for another email address." in normalize_spaces(
page.select_one(".banner-dangerous").text
)
@@ -109,47 +114,51 @@ def test_cancelled_invite_opened_by_user(
api_user_active,
mock_check_org_cancelled_invite_token,
mock_get_organization,
fake_uuid
fake_uuid,
):
client_request.logout()
mock_get_user = mocker.patch('app.user_api_client.get_user', return_value=api_user_active)
mock_get_user = mocker.patch(
"app.user_api_client.get_user", return_value=api_user_active
)
page = client_request.get(
'main.accept_org_invite',
token='thisisnotarealtoken',
"main.accept_org_invite",
token="thisisnotarealtoken",
_follow_redirects=True,
)
assert normalize_spaces(
page.select_one('h1').text
) == 'The invitation you were sent has been cancelled'
assert normalize_spaces(
page.select('main p')[0].text
) == 'Test User decided to cancel this invitation.'
assert normalize_spaces(
page.select('main p')[1].text
) == 'If you need access to Test organization, youll have to ask them to invite you again.'
assert (
normalize_spaces(page.select_one("h1").text)
== "The invitation you were sent has been cancelled"
)
assert (
normalize_spaces(page.select("main p")[0].text)
== "Test User decided to cancel this invitation."
)
assert (
normalize_spaces(page.select("main p")[1].text)
== "If you need access to Test organization, youll have to ask them to invite you again."
)
mock_get_user.assert_called_once_with(fake_uuid)
mock_get_organization.assert_called_once_with(ORGANISATION_ID)
def test_user_invite_already_accepted(
client_request,
mock_check_org_accepted_invite_token
client_request, mock_check_org_accepted_invite_token
):
client_request.logout()
client_request.get(
'main.accept_org_invite',
token='thisisnotarealtoken',
"main.accept_org_invite",
token="thisisnotarealtoken",
_expected_redirect=url_for(
'main.organization_dashboard',
"main.organization_dashboard",
org_id=ORGANISATION_ID,
),
)
@freeze_time('2021-12-12 12:12:12')
@freeze_time("2021-12-12 12:12:12")
def test_existing_user_invite_already_is_member_of_organization(
client_request,
mock_check_org_invite_token,
@@ -164,25 +173,25 @@ def test_existing_user_invite_already_is_member_of_organization(
client_request.logout()
mock_update_user_attribute.reset_mock()
client_request.get(
'main.accept_org_invite',
token='thisisnotarealtoken',
"main.accept_org_invite",
token="thisisnotarealtoken",
_expected_redirect=url_for(
'main.organization_dashboard',
"main.organization_dashboard",
org_id=ORGANISATION_ID,
),
)
mock_check_org_invite_token.assert_called_once_with('thisisnotarealtoken')
mock_check_org_invite_token.assert_called_once_with("thisisnotarealtoken")
mock_accept_org_invite.assert_called_once_with(ORGANISATION_ID, ANY)
mock_get_user_by_email.assert_called_once_with('invited_user@test.gsa.gov')
mock_get_user_by_email.assert_called_once_with("invited_user@test.gsa.gov")
mock_get_users_for_organization.assert_called_once_with(ORGANISATION_ID)
mock_update_user_attribute.assert_called_once_with(
api_user_active['id'],
email_access_validated_at='2021-12-12T12:12:12',
api_user_active["id"],
email_access_validated_at="2021-12-12T12:12:12",
)
@freeze_time('2021-12-12 12:12:12')
@freeze_time("2021-12-12 12:12:12")
def test_existing_user_invite_not_a_member_of_organization(
client_request,
api_user_active,
@@ -196,25 +205,25 @@ def test_existing_user_invite_not_a_member_of_organization(
client_request.logout()
mock_update_user_attribute.reset_mock()
client_request.get(
'main.accept_org_invite',
token='thisisnotarealtoken',
"main.accept_org_invite",
token="thisisnotarealtoken",
_expected_redirect=url_for(
'main.organization_dashboard',
"main.organization_dashboard",
org_id=ORGANISATION_ID,
),
)
mock_check_org_invite_token.assert_called_once_with('thisisnotarealtoken')
mock_check_org_invite_token.assert_called_once_with("thisisnotarealtoken")
mock_accept_org_invite.assert_called_once_with(ORGANISATION_ID, ANY)
mock_get_user_by_email.assert_called_once_with('invited_user@test.gsa.gov')
mock_get_user_by_email.assert_called_once_with("invited_user@test.gsa.gov")
mock_get_users_for_organization.assert_called_once_with(ORGANISATION_ID)
mock_add_user_to_organization.assert_called_once_with(
ORGANISATION_ID,
api_user_active['id'],
api_user_active["id"],
)
mock_update_user_attribute.assert_called_once_with(
mock_get_user_by_email.side_effect(None)['id'],
email_access_validated_at='2021-12-12T12:12:12',
mock_get_user_by_email.side_effect(None)["id"],
email_access_validated_at="2021-12-12T12:12:12",
)
@@ -226,13 +235,13 @@ def test_user_accepts_invite(
):
client_request.logout()
client_request.get(
'main.accept_org_invite',
token='thisisnotarealtoken',
_expected_redirect=url_for('main.register_from_org_invite')
"main.accept_org_invite",
token="thisisnotarealtoken",
_expected_redirect=url_for("main.register_from_org_invite"),
)
mock_check_org_invite_token.assert_called_once_with('thisisnotarealtoken')
mock_dont_get_user_by_email.assert_called_once_with('invited_user@test.gsa.gov')
mock_check_org_invite_token.assert_called_once_with("thisisnotarealtoken")
mock_dont_get_user_by_email.assert_called_once_with("invited_user@test.gsa.gov")
mock_get_users_for_organization.assert_called_once_with(ORGANISATION_ID)
@@ -241,23 +250,32 @@ def test_registration_from_org_invite_404s_if_user_not_in_session(
):
client_request.logout()
client_request.get(
'main.register_from_org_invite',
"main.register_from_org_invite",
_expected_status=404,
)
@pytest.mark.parametrize('data, error', [
[{
'name': 'Bad Mobile',
'mobile_number': 'not good',
'password': 'validPassword!'
}, 'The string supplied did not seem to be a phone number'],
[{
'name': 'Bad Password',
'mobile_number': '+12021234123',
'password': 'password'
}, 'Choose a password thats harder to guess'],
])
@pytest.mark.parametrize(
"data, error",
[
[
{
"name": "Bad Mobile",
"mobile_number": "not good",
"password": "validPassword!",
},
"The string supplied did not seem to be a phone number",
],
[
{
"name": "Bad Password",
"mobile_number": "+12021234123",
"password": "password",
},
"Choose a password thats harder to guess",
],
],
)
def test_registration_from_org_invite_has_bad_data(
client_request,
sample_org_invite,
@@ -268,10 +286,10 @@ def test_registration_from_org_invite_has_bad_data(
client_request.logout()
with client_request.session_transaction() as session:
session['invited_org_user_id'] = sample_org_invite['id']
session["invited_org_user_id"] = sample_org_invite["id"]
page = client_request.post(
'main.register_from_org_invite',
"main.register_from_org_invite",
_data=data,
_expected_status=200,
)
@@ -279,11 +297,10 @@ def test_registration_from_org_invite_has_bad_data(
assert error in page.text
@pytest.mark.parametrize('diff_data', [
['email_address'],
['organization'],
['email_address', 'organization']
])
@pytest.mark.parametrize(
"diff_data",
[["email_address"], ["organization"], ["email_address", "organization"]],
)
def test_registration_from_org_invite_has_different_email_or_organization(
client_request,
sample_org_invite,
@@ -292,20 +309,20 @@ def test_registration_from_org_invite_has_different_email_or_organization(
):
client_request.logout()
with client_request.session_transaction() as session:
session['invited_org_user_id'] = sample_org_invite['id']
session["invited_org_user_id"] = sample_org_invite["id"]
data = {
'name': 'Test User',
'mobile_number': '+12024900460',
'password': 'validPassword!',
'email_address': sample_org_invite['email_address'],
'organization': sample_org_invite['organization']
"name": "Test User",
"mobile_number": "+12024900460",
"password": "validPassword!",
"email_address": sample_org_invite["email_address"],
"organization": sample_org_invite["organization"],
}
for field in diff_data:
data[field] = 'different'
data[field] = "different"
client_request.post(
'main.register_from_org_invite',
"main.register_from_org_invite",
_data=data,
_expected_status=400,
)
@@ -323,23 +340,21 @@ def test_org_user_registers_with_email_already_in_use(
):
client_request.logout()
with client_request.session_transaction() as session:
session['invited_org_user_id'] = sample_org_invite['id']
session["invited_org_user_id"] = sample_org_invite["id"]
client_request.post(
'main.register_from_org_invite',
"main.register_from_org_invite",
_data={
'name': 'Test User',
'mobile_number': '+12024900460',
'password': 'validPassword!',
'email_address': sample_org_invite['email_address'],
'organization': sample_org_invite['organization'],
"name": "Test User",
"mobile_number": "+12024900460",
"password": "validPassword!",
"email_address": sample_org_invite["email_address"],
"organization": sample_org_invite["organization"],
},
_expected_redirect=url_for('main.verify'),
_expected_redirect=url_for("main.verify"),
)
mock_get_user_by_email.assert_called_once_with(
sample_org_invite['email_address']
)
mock_get_user_by_email.assert_called_once_with(sample_org_invite["email_address"])
assert mock_register_user.called is False
assert mock_send_already_registered_email.called is False
@@ -358,34 +373,34 @@ def test_org_user_registration(
):
client_request.logout()
with client_request.session_transaction() as session:
session['invited_org_user_id'] = sample_org_invite['id']
session["invited_org_user_id"] = sample_org_invite["id"]
client_request.post(
'main.register_from_org_invite',
"main.register_from_org_invite",
_data={
'name': 'Test User',
'email_address': sample_org_invite['email_address'],
'mobile_number': '+12024900460',
'password': 'validPassword!',
'organization': sample_org_invite['organization'],
"name": "Test User",
"email_address": sample_org_invite["email_address"],
"mobile_number": "+12024900460",
"password": "validPassword!",
"organization": sample_org_invite["organization"],
},
_expected_redirect=url_for('main.verify')
_expected_redirect=url_for("main.verify"),
)
assert mock_get_user_by_email.called is False
mock_register_user.assert_called_once_with(
'Test User',
sample_org_invite['email_address'],
'+12024900460',
'validPassword!',
'sms_auth'
"Test User",
sample_org_invite["email_address"],
"+12024900460",
"validPassword!",
"sms_auth",
)
mock_send_verify_code.assert_called_once_with(
'6ce466d0-fd6a-11e5-82f5-e0accb9d11a6',
'sms',
'+12024900460',
"6ce466d0-fd6a-11e5-82f5-e0accb9d11a6",
"sms",
"+12024900460",
)
mock_get_invited_org_user_by_id.assert_called_once_with(sample_org_invite['id'])
mock_get_invited_org_user_by_id.assert_called_once_with(sample_org_invite["id"])
def test_verified_org_user_redirects_to_dashboard(
@@ -399,15 +414,18 @@ def test_verified_org_user_redirects_to_dashboard(
client_request.logout()
invited_org_user = InvitedOrgUser(sample_org_invite).serialize()
with client_request.session_transaction() as session:
session['expiry_date'] = str(datetime.utcnow() + timedelta(hours=1))
session['user_details'] = {"email": invited_org_user['email_address'], "id": invited_org_user['id']}
session['organization_id'] = invited_org_user['organization']
session["expiry_date"] = str(datetime.utcnow() + timedelta(hours=1))
session["user_details"] = {
"email": invited_org_user["email_address"],
"id": invited_org_user["id"],
}
session["organization_id"] = invited_org_user["organization"]
client_request.post(
'main.verify',
_data={'sms_code': '123456'},
"main.verify",
_data={"sms_code": "123456"},
_expected_redirect=url_for(
'main.organization_dashboard',
org_id=invited_org_user['organization'],
"main.organization_dashboard",
org_id=invited_org_user["organization"],
),
)

File diff suppressed because it is too large Load Diff