Skip to content

Commit c1029a4

Browse files
author
Matt Sokoloff
committed
fixed test bug
1 parent a413f33 commit c1029a4

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

tests/integration/conftest.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,12 @@ def get_invites(client):
110110

111111
@pytest.fixture
112112
def queries():
113-
return SimpleNamespace({
114-
'cancel_invite': cancel_invite,
115-
'get_project_invites': get_project_invites,
116-
'get_invites': get_invites
117-
})
113+
return SimpleNamespace(
114+
**{
115+
'cancel_invite': cancel_invite,
116+
'get_project_invites': get_project_invites,
117+
'get_invites': get_invites
118+
})
118119

119120

120121
class IntegrationClient(Client):

tests/integration/test_user_management.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
from conftest import cancel_invite, get_invites, get_project_invites
2-
import pytest
3-
41
from labelbox import ProjectRole
52

63

7-
def test_org_invite(client, organization, environ):
4+
def test_org_invite(client, organization, environ, queries):
85
role = client.get_roles()['LABELER']
96
dummy_email = "none@labelbox.com"
107
invite_limit = organization.invite_limit()
@@ -23,7 +20,7 @@ def test_org_invite(client, organization, environ):
2320
assert invite_limit.remaining - invite_limit_after.remaining == 1
2421
# An invite shouldn't effect the user count until after it is accepted
2522

26-
outstanding_invites = get_invites(client)
23+
outstanding_invites = queries.get_invites(client)
2724
in_list = False
2825
for invite in outstanding_invites:
2926
if invite.uid == invite.uid:
@@ -32,11 +29,11 @@ def test_org_invite(client, organization, environ):
3229
assert org_role == role.name.lower(
3330
), "Role should be labeler. Found {org_role} "
3431
assert in_list, "Invite not found"
35-
cancel_invite(client, invite.uid)
32+
queries.cancel_invite(client, invite.uid)
3633
assert invite_limit.remaining - organization.invite_limit().remaining == 0
3734

3835

39-
def test_project_invite(client, organization, project_pack):
36+
def test_project_invite(client, organization, project_pack, queries):
4037
project_1, project_2 = project_pack
4138
roles = client.get_roles()
4239
dummy_email = "none1@labelbox.com"
@@ -47,7 +44,7 @@ def test_project_invite(client, organization, project_pack):
4744
roles['NONE'],
4845
project_roles=[project_role_1, project_role_2])
4946

50-
project_invite = get_project_invites(client, project_1.uid)[0]
47+
project_invite = queries.get_project_invites(client, project_1.uid)[0]
5148

5249
assert set([(proj_invite.project.uid, proj_invite.role.uid)
5350
for proj_invite in project_invite.project_roles
@@ -69,7 +66,7 @@ def test_project_invite(client, organization, project_pack):
6966
project_member = project_member[0]
7067

7168
assert project_member.role().name.upper() == roles['ADMIN'].name.upper()
72-
cancel_invite(client, invite.uid)
69+
queries.cancel_invite(client, invite.uid)
7370

7471

7572
def test_member_management(client, organization, project, project_based_user):

0 commit comments

Comments
 (0)