darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 07:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename property on ModelLists

Browse Source 
The property doesn’t represent the whole client, but just one method on
it. So this commit renames the property to better describe what it is
designed to store.
This commit is contained in:
Chris Hill-Scott
2020-01-16 15:57:51 +00:00
parent 721134dc17
commit c4818eb7f2
12 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/app/main/views/test_manage_users.py
View File

@@ -135,7 +135,7 @@ def test_should_show_overview_page(
other_user['id'] = 'zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz'
mocker.patch('app.user_api_client.get_user', return_value=current_user)
mock_get_users = mocker.patch('app.models.user.Users.client', return_value=[
mock_get_users = mocker.patch('app.models.user.Users.client_method', return_value=[
current_user,
other_user,
])
@@ -166,7 +166,7 @@ def test_should_show_caseworker_on_overview_page(
other_user['email_address'] = 'zzzzzzz@example.gov.uk'
mocker.patch('app.user_api_client.get_user', return_value=current_user)
mocker.patch('app.models.user.Users.client', return_value=[
mocker.patch('app.models.user.Users.client_method', return_value=[
current_user,
other_user,
])
@@ -699,8 +699,8 @@ def test_invite_user(
sample_invite['email_address'] = 'test@example.gov.uk'
assert is_gov_user(email_address) == gov_user
mocker.patch('app.models.user.InvitedUsers.client', return_value=[sample_invite])
mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
mocker.patch('app.models.user.InvitedUsers.client_method', return_value=[sample_invite])
mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
mocker.patch('app.invite_api_client.create_invite', return_value=sample_invite)
page = client_request.post(
'main.invite_user',
@@ -753,8 +753,8 @@ def test_invite_user_with_email_auth_service(
sample_invite['email_address'] = 'test@example.gov.uk'
assert is_gov_user(email_address) is gov_user
mocker.patch('app.models.user.InvitedUsers.client', return_value=[sample_invite])
mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
mocker.patch('app.models.user.InvitedUsers.client_method', return_value=[sample_invite])
mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
mocker.patch('app.invite_api_client.create_invite', return_value=sample_invite)
page = client_request.post(
@@ -855,8 +855,8 @@ def test_manage_users_shows_invited_user(
expected_text,
):
sample_invite['status'] = invite_status
mocker.patch('app.models.user.InvitedUsers.client', return_value=[sample_invite])
mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
mocker.patch('app.models.user.InvitedUsers.client_method', return_value=[sample_invite])
mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID)
assert page.h1.string.strip() == 'Team members'
@@ -873,8 +873,8 @@ def test_manage_users_does_not_show_accepted_invite(
invited_user_id = uuid.uuid4()
sample_invite['id'] = invited_user_id
sample_invite['status'] = 'accepted'
mocker.patch('app.models.user.InvitedUsers.client', return_value=[sample_invite])
mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
mocker.patch('app.models.user.InvitedUsers.client_method', return_value=[sample_invite])
mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID)
@@ -1018,7 +1018,7 @@ def test_can_invite_user_as_platform_admin(
mock_get_template_folders,
mocker,
):
mocker.patch('app.models.user.Users.client', return_value=[active_user_with_permissions])
mocker.patch('app.models.user.Users.client_method', return_value=[active_user_with_permissions])
page = client_request.get(
'main.manage_users',
@@ -1252,7 +1252,7 @@ def test_confirm_edit_user_email_changes_user_email(
# We want active_user_with_permissions (the current user) to update the email address for api_user_active
# By default both users would have the same id, so we change the id of api_user_active
api_user_active['id'] = str(uuid.uuid4())
mocker.patch('app.models.user.Users.client', return_value=[api_user_active, active_user_with_permissions])
mocker.patch('app.models.user.Users.client_method', return_value=[api_user_active, active_user_with_permissions])
# get_user gets called twice - first to check if current user can see the page, then to see if the team member
# whose email address we're changing belongs to the service
mocker.patch('app.user_api_client.get_user',
@@ -1468,7 +1468,7 @@ def test_confirm_edit_user_mobile_number_changes_user_mobile_number(
# By default both users would have the same id, so we change the id of api_user_active
api_user_active['id'] = str(uuid.uuid4())
mocker.patch('app.models.user.Users.client', return_value=[api_user_active, active_user_with_permissions])
mocker.patch('app.models.user.Users.client_method', return_value=[api_user_active, active_user_with_permissions])
# get_user gets called twice - first to check if current user can see the page, then to see if the team member
# whose mobile number we're changing belongs to the service
mocker.patch('app.user_api_client.get_user',