feat: TT-122 update tests

tests/time_tracker_api/users/users_namespace_test.py

@@ -2,7 +2,7 @@
 from flask import json
 from flask.testing import FlaskClient
 from flask_restplus._http import HTTPStatus
-from utils.azure_users import AzureConnection, ROLE_FIELD_VALUES, AzureUser_v2
+from utils.azure_users import AzureConnection
 from pytest import mark
 
 
@@ -186,19 +186,3 @@ def test_update_role_is_called_properly_on_each_action(
     update_role_mock.assert_called_once_with(
         user_id, role_id, is_grant=is_grant
     )
-
-
-@patch('msal.ConfidentialClientApplication', Mock())
-@patch('utils.azure_users.AzureConnection.get_token', Mock())
-@patch('utils.azure_users.AzureConnection.get_test_user_ids')
-@patch('utils.azure_users.AzureConnection.users_v2')
-def test_azure_connection_get_non_test_users(
-    users_v2_mock, get_test_user_ids_mock
-):
-    test_user = AzureUser_v2('ID1', None, None, [])
-    non_test_user = AzureUser_v2('ID2', None, None, [])
-    users_v2_mock.return_value = [test_user, non_test_user]
-    get_test_user_ids_mock.return_value = ['ID1']
-    non_test_users = [non_test_user]
-    az_conn = AzureConnection()
-    assert az_conn.get_non_test_users() == non_test_users

tests/utils/azure_users_test.py

@@ -1,5 +1,5 @@
 from unittest.mock import Mock, patch
-from utils.azure_users import AzureConnection, ROLE_FIELD_VALUES
+from utils.azure_users import AzureConnection, ROLE_FIELD_VALUES, AzureUser_v2
 from pytest import mark
 
 
@@ -40,3 +40,19 @@ def test_azure_connection_get_test_user_ids(get_mock):
     ids = ['ID1', 'ID2']
     az_conn = AzureConnection()
     assert az_conn.get_test_user_ids() == ids
+
+
+@patch('msal.ConfidentialClientApplication', Mock())
+@patch('utils.azure_users.AzureConnection.get_token', Mock())
+@patch('utils.azure_users.AzureConnection.get_test_user_ids')
+@patch('utils.azure_users.AzureConnection.users_v2')
+def test_azure_connection_get_non_test_users(
+    users_v2_mock, get_test_user_ids_mock
+):
+    test_user = AzureUser_v2('ID1', None, None, [])
+    non_test_user = AzureUser_v2('ID2', None, None, [])
+    users_v2_mock.return_value = [test_user, non_test_user]
+    get_test_user_ids_mock.return_value = ['ID1']
+    non_test_users = [non_test_user]
+    az_conn = AzureConnection()
+    assert az_conn.get_non_test_users() == non_test_users

utils/azure_users.py

@@ -178,28 +178,6 @@ def update_role(self, user_id, role_id, is_grant):
 
         return self.to_azure_user_v2(response.json())
 
-    def is_test_user(self, user_id):
-        endpoint = "{endpoint}/users/{user_id}?api-version=1.6".format(
-            endpoint=self.config.ENDPOINT, user_id=user_id
-        )
-        response = requests.get(endpoint, auth=BearerAuth(self.access_token))
-        assert 200 == response.status_code
-        item = response.json()
-        field_name, field_value = ROLE_FIELD_VALUES['test']
-        return field_name in item and field_value == item[field_name]
-
-    def get_test_user_ids(self):
-        field_name, field_value = ROLE_FIELD_VALUES['test']
-        endpoint = "{endpoint}/users?api-version=1.6&$select=objectId,{field_name}&$filter={field_name} eq '{field_value}'".format(
-            endpoint=self.config.ENDPOINT,
-            field_name=field_name,
-            field_value=field_value,
-        )
-        response = requests.get(endpoint, auth=BearerAuth(self.access_token))
-        assert 200 == response.status_code
-        assert 'value' in response.json()
-        return [item['objectId'] for item in response.json()['value']]
-
     def get_non_test_users(self) -> List[AzureUser]:
         test_user_ids = self.get_test_user_ids()
         return [