Skip to content

TT-156 add groups field in User model #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 1, 2021
Merged

TT-156 add groups field in User model #262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae854de
feat: TT-156 add group fields in model
Angeluz-07 Feb 24, 2021
59633d4
feat: TT-156 cache groups_and_users response for perfomance
Angeluz-07 Feb 25, 2021
956bfb5
test: TT-156 update tests
Angeluz-07 Feb 25, 2021
3d5fe42
test: TT-156 add get_grups_and_users test
Angeluz-07 Feb 26, 2021
5a11f04
fix: TT-156 remove debug statements
Angeluz-07 Feb 26, 2021
4c847ea
test: TT-156 add test for get_groups_by_user_id
Angeluz-07 Feb 26, 2021
8945be3
test: TT-156 parametrize test for get_groups_by_user_id
Angeluz-07 Feb 26, 2021
12ed65c
test: TT-156 get_groups_and_users_called_once_by_instance
Angeluz-07 Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: TT-156 update tests
  • Loading branch information
@Angeluz-07
Angeluz-07 committed Feb 26, 2021
commit 956bfb505f7e37505af6a13fb37b476c1bef6e05
31 changes: 18 additions & 13 deletions tests/time_tracker_api/users/users_namespace_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch('utils.azure_users.AzureConnection.get_user')
def test_get_user_response_contains_expected_props(
get_user_mock,
client: FlaskClient,
valid_header: dict,
get_user_mock, client: FlaskClient, valid_header: dict,
):
get_user_mock.return_value = {
'name': 'dummy',
'email': 'dummy',
'roles': ['dummy-role'],
'groups': ['dummy-group'],
}
user_id = (Faker().uuid4(),)
response = client.get(f'/users/{user_id}', headers=valid_header)
Expand All @@ -27,7 +26,9 @@ def test_get_user_response_contains_expected_props(
assert 'name' in json.loads(response.data)
assert 'email' in json.loads(response.data)
assert 'roles' in json.loads(response.data)
assert 'groups' in json.loads(response.data)
assert ['dummy-role'] == json.loads(response.data)['roles']
assert ['dummy-group'] == json.loads(response.data)['groups']


@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
Expand All @@ -37,12 +38,15 @@ def test_get_user_response_contains_expected_props(
)
@patch('utils.azure_users.AzureConnection.users')
def test_users_response_contains_expected_props(
users_mock,
client: FlaskClient,
valid_header: dict,
users_mock, client: FlaskClient, valid_header: dict,
):
users_mock.return_value = [
{'name': 'dummy', 'email': 'dummy', 'roles': ['dummy-role']}
{
'name': 'dummy',
'email': 'dummy',
'roles': ['dummy-role'],
'groups': ['dummy-group'],
}
]
response = client.get('/users', headers=valid_header)

Expand All @@ -51,15 +55,16 @@ def test_users_response_contains_expected_props(
assert 'name' in json.loads(response.data)[0]
assert 'email' in json.loads(response.data)[0]
assert 'roles' in json.loads(response.data)[0]
assert 'groups' in json.loads(response.data)[0]
assert ['dummy-role'] == json.loads(response.data)[0]['roles']
assert ['dummy-group'] == json.loads(response.data)[0]['groups']


@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch('utils.azure_users.AzureConnection.update_role')
@mark.parametrize(
'role_id,action',
[('test', 'grant'), ('admin', 'revoke')],
'role_id,action', [('test', 'grant'), ('admin', 'revoke')],
)
def test_update_role_response_contains_expected_props(
update_role_mock,
Expand All @@ -73,15 +78,16 @@ def test_update_role_response_contains_expected_props(
'name': 'dummy',
'email': 'dummy',
'roles': [],
'groups': [],
}
response = client.post(
f'/users/{user_id}/roles/{role_id}/{action}',
headers=valid_header,
f'/users/{user_id}/roles/{role_id}/{action}', headers=valid_header,
)
assert HTTPStatus.OK == response.status_code
assert 'name' in json.loads(response.data)
assert 'email' in json.loads(response.data)
assert 'roles' in json.loads(response.data)
assert 'groups' in json.loads(response.data)


@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
Expand All @@ -107,8 +113,7 @@ def test_update_role_is_called_properly_on_each_action(
):
update_role_mock.return_value = {}
response = client.post(
f'/users/{user_id}/roles/{role_id}/{action}',
headers=valid_header,
f'/users/{user_id}/roles/{role_id}/{action}', headers=valid_header,
)

assert HTTPStatus.OK == response.status_code
Expand Down
16 changes: 4 additions & 12 deletions tests/utils/azure_users_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
],
)
def test_azure_connection_is_test_user(
get_mock,
field_name,
field_value,
is_test_user_expected_value,
get_mock, field_name, field_value, is_test_user_expected_value,
):
response_mock = Mock()
response_mock.status_code = 200
Expand All @@ -36,12 +33,7 @@ def test_azure_connection_get_test_user_ids(get_mock):
response_mock = Mock()
response_mock.status_code = 200
response_mock.json = Mock(
return_value={
'value': [
{'objectId': 'ID1'},
{'objectId': 'ID2'},
]
}
return_value={'value': [{'objectId': 'ID1'}, {'objectId': 'ID2'},]}
)
get_mock.return_value = response_mock

Expand All @@ -57,8 +49,8 @@ def test_azure_connection_get_test_user_ids(get_mock):
def test_azure_connection_get_non_test_users(
users_mock, get_test_user_ids_mock
):
test_user = AzureUser('ID1', None, None, [])
non_test_user = AzureUser('ID2', None, None, [])
test_user = AzureUser('ID1', None, None, [], [])
non_test_user = AzureUser('ID2', None, None, [], [])
users_mock.return_value = [test_user, non_test_user]
get_test_user_ids_mock.return_value = ['ID1']
non_test_users = [non_test_user]
Expand Down