Refactour test_user_management to fix test failures

Author: Val Brodsky

libs/labelbox/tests/conftest.py

@@ -594,14 +594,8 @@ def sample_bulk_conversation() -> list:
 def organization(client):
     # Must have at least one seat open in your org to run these tests
     org = client.get_organization()
-    # Clean up before and after incase this wasn't run for some reason.
-    for invite in get_invites(client):
-        if "@labelbox.com" in invite.email:
-            cancel_invite(client, invite.uid)
+
     yield org
-    for invite in get_invites(client):
-        if "@labelbox.com" in invite.email:
-            cancel_invite(client, invite.uid)
 
 
 @pytest.fixture

libs/labelbox/tests/integration/test_user_management.py

@@ -5,9 +5,12 @@
 
 faker = Faker()
 
-def test_org_invite(client, organization, environ, queries):
+
+@pytest.fixture
+def org_invite(client, organization, environ, queries):
     role = client.get_roles()['LABELER']
-    dummy_email = "none+{}@labelbox.com".format("".join(faker.random_letters(26)))
+    dummy_email = "none+{}@labelbox.com".format("".join(
+        faker.random_letters(26)))
     invite_limit = organization.invite_limit()
 
     if environ.value == "prod":
@@ -18,6 +21,45 @@ def test_org_invite(client, organization, environ, queries):
 
     invite = organization.invite_user(dummy_email, role)
 
+    yield invite, invite_limit
+
+    queries.cancel_invite(client, invite.uid)
+
+
+@pytest.fixture
+def project_role_1(client, project_pack):
+    project_1, _ = project_pack
+    roles = client.get_roles()
+    return ProjectRole(project=project_1, role=roles['LABELER'])
+
+
+@pytest.fixture
+def project_role_2(client, project_pack):
+    _, project_2 = project_pack
+    roles = client.get_roles()
+    return ProjectRole(project=project_2, role=roles['REVIEWER'])
+
+
+@pytest.fixture
+def create_project_invite(client, organization, project_pack, queries,
+                          project_role_1, project_role_2):
+    roles = client.get_roles()
+    dummy_email = "none+{}@labelbox.com".format("".join(
+        faker.random_letters(26)))
+    invite = organization.invite_user(
+        dummy_email,
+        roles['NONE'],
+        project_roles=[project_role_1, project_role_2])
+
+    yield invite
+
+    queries.cancel_invite(client, invite.uid)
+
+
+def test_org_invite(client, organization, environ, queries, org_invite):
+    invite, invite_limit = org_invite
+    role = client.get_roles()['LABELER']
+
     if environ.value == "prod":
 
         invite_limit_after = organization.invite_limit()
@@ -35,23 +77,28 @@ def test_org_invite(client, organization, environ, queries):
             assert org_role == role.name.lower(
             ), "Role should be labeler. Found {org_role} "
     assert in_list, "Invite not found"
+
+
+def test_cancel_invite(
+    client,
+    organization,
+    queries,
+):
+    role = client.get_roles()['LABELER']
+    dummy_email = "none+{}@labelbox.com".format("".join(
+        faker.random_letters(26)))
+    invite_limit = organization.invite_limit()
+    invite = organization.invite_user(dummy_email, role)
     queries.cancel_invite(client, invite.uid)
     assert invite_limit.remaining - organization.invite_limit().remaining == 0
 
 
-def test_project_invite(client, organization, project_pack, queries):
-    project_1, project_2 = project_pack
+def test_project_invite(client, organization, project_pack, queries,
+                        create_project_invite, project_role_1, project_role_2):
+    project_1, _ = project_pack
     roles = client.get_roles()
-    dummy_email = "none+{}@labelbox.com".format("".join(faker.random_letters(26)))
-    project_role_1 = ProjectRole(project=project_1, role=roles['LABELER'])
-    project_role_2 = ProjectRole(project=project_2, role=roles['REVIEWER'])
-    invite = organization.invite_user(
-        dummy_email,
-        roles['NONE'],
-        project_roles=[project_role_1, project_role_2])
 
     project_invite = next(queries.get_project_invites(client, project_1.uid))
-
     assert set([(proj_invite.project.uid, proj_invite.role.uid)
                 for proj_invite in project_invite.project_roles
                ]) == set([(proj_role.project.uid, proj_role.role.uid)
@@ -74,7 +121,6 @@ def test_project_invite(client, organization, project_pack, queries):
 
     assert project_member.access_from == 'ORGANIZATION'
     assert project_member.role().name.upper() == roles['ADMIN'].name.upper()
-    queries.cancel_invite(client, invite.uid)
 
 
 @pytest.mark.skip(