revert tests

auth-api/tests/unit/services/test_membership.py

@@ -16,7 +16,6 @@
 Test suite to ensure that the Membership service routines are working as expected.
 """
 
-import pytest
 from unittest import mock
 from unittest.mock import ANY, patch
 
@@ -26,13 +25,11 @@
 from auth_api.services import Membership as MembershipService
 from auth_api.services import Org as OrgService
 from auth_api.services.keycloak import KeycloakService
-from auth_api.utils.constants import GROUP_ACCOUNT_HOLDERS, GROUP_GOV_ACCOUNT_USERS
-from auth_api.utils.enums import ActivityAction, OrgType, ProductCode, Status
+from auth_api.utils.constants import GROUP_ACCOUNT_HOLDERS
+from auth_api.utils.enums import ActivityAction, ProductCode, Status
 from tests.conftest import mock_token
 from tests.utilities.factory_scenarios import KeycloakScenario, TestOrgInfo, TestUserInfo
-from tests.utilities.factory_utils import (
-    convert_org_to_staff_org, factory_membership_model, factory_product_model, factory_user_model
-)
+from tests.utilities.factory_utils import factory_membership_model, factory_product_model, factory_user_model
 
 
 @mock.patch("auth_api.services.affiliation_invitation.RestService.get_service_account_token", mock_token)
@@ -83,8 +80,7 @@ def token_info():  # pylint: disable=unused-argument; mocks of library methods
 
 
 @mock.patch("auth_api.services.affiliation_invitation.RestService.get_service_account_token", mock_token)
-@pytest.mark.parametrize("group_check", [GROUP_ACCOUNT_HOLDERS, GROUP_GOV_ACCOUNT_USERS])
-def test_remove_member_removes_group_to_the_user(session, monkeypatch, group_check):  # pylint:disable=unused-argument
+def test_remove_member_removes_group_to_the_user(session, monkeypatch):  # pylint:disable=unused-argument
     """Assert that accepting an invite adds group to the user."""
     # Create a user in keycloak
     keycloak_service = KeycloakService()
@@ -95,32 +91,24 @@ def test_remove_member_removes_group_to_the_user(session, monkeypatch, group_che
 
     # Patch token info
     def token_info():  # pylint: disable=unused-argument; mocks of library methods
-        roles = ["edit", "account_holder"]
-        if group_check == GROUP_GOV_ACCOUNT_USERS:
-            roles = ["edit", "staff"]
         return {
             "sub": str(kc_user.id),
             "idp_userid": str(kc_user.id),
             "username": "public_user",
-            "realm_access": {"roles": roles},
+            "realm_access": {"roles": ["edit", "account_holder"]},
             "product_code": ProductCode.BUSINESS.value,
         }
 
     monkeypatch.setattr("auth_api.utils.user_context._get_token_info", token_info)
     org = OrgService.create_org(TestOrgInfo.org1, user_id=user.id)
-    if group_check == GROUP_GOV_ACCOUNT_USERS:
-        convert_org_to_staff_org(org.as_dict().get("id"), OrgType.STAFF.value)
     # Create another user
     request = KeycloakScenario.create_user_request()
     keycloak_service.add_user(request, return_if_exists=True)
     kc_user2 = keycloak_service.get_user_by_username(request.user_name)
     user2 = factory_user_model(TestUserInfo.get_user_with_kc_guid(kc_guid=kc_user2.id))
-    if group_check == GROUP_GOV_ACCOUNT_USERS:
-        keycloak_service.add_user_to_group(kc_user2.id, GROUP_GOV_ACCOUNT_USERS)
 
     # Add a membership to the user for the org created
-    member_type = 'ADMIN' if group_check == GROUP_GOV_ACCOUNT_USERS else 'COORDINATOR'
-    factory_membership_model(user2.id, org.as_dict().get("id"), member_type=member_type, member_status=4)
+    factory_membership_model(user2.id, org.as_dict().get("id"), member_type="COORDINATOR", member_status=4)
 
     # Add a product to org
     factory_product_model(org.as_dict().get("id"), product_code=ProductCode.BUSINESS.value)
@@ -138,7 +126,7 @@ def token_info():  # pylint: disable=unused-argument; mocks of library methods
     groups = []
     for group in user_groups:
         groups.append(group.get("name"))
-    assert group_check in groups
+    assert GROUP_ACCOUNT_HOLDERS in groups
 
     # Deactivate Membership
     with patch.object(ActivityLogPublisher, "publish_activity", return_value=None) as mock_alp:
@@ -165,7 +153,6 @@ def token_info():  # pylint: disable=unused-argument; mocks of library methods
     groups = []
     for group in user_groups:
         groups.append(group.get("name"))
-    assert group_check not in groups
+    assert GROUP_ACCOUNT_HOLDERS not in groups
 
-    if group_check != GROUP_GOV_ACCOUNT_USERS:
-        MembershipService(membership).deactivate_membership()
+    MembershipService(membership).deactivate_membership()