From 3df4c4ec9318f080ba5eaffd884fb688dfa69461 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Tue, 8 Mar 2016 14:09:16 -0500 Subject: [PATCH] fixing tests and migration issues --- awx/main/migrations/_rbac.py | 2 +- awx/main/tests/functional/test_rbac_team.py | 18 +++++++++--------- .../tests/functional/test_rbac_userresource.py | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/awx/main/migrations/_rbac.py b/awx/main/migrations/_rbac.py index f26970f9ba..2cf0b6e775 100644 --- a/awx/main/migrations/_rbac.py +++ b/awx/main/migrations/_rbac.py @@ -210,7 +210,7 @@ def migrate_job_templates(apps, schema_editor): for user in User.objects.all(): if permission.filter(user=user).exists(): - jt.exector_role.members.add(user) + jt.executor_role.members.add(user) migrations[jt.name]['users'].add(user) if jt.accessible_by(user, {'execute': True}): diff --git a/awx/main/tests/functional/test_rbac_team.py b/awx/main/tests/functional/test_rbac_team.py index ad10351fa9..4ba4218c01 100644 --- a/awx/main/tests/functional/test_rbac_team.py +++ b/awx/main/tests/functional/test_rbac_team.py @@ -22,7 +22,7 @@ def test_team_migration_user(team, user, permissions): @pytest.mark.django_db def test_team_access_superuser(team, user): - team.users.add(user('member', False)) + team.member_role.members.add(user('member', False)) access = TeamAccess(user('admin', True)) @@ -31,13 +31,13 @@ def test_team_access_superuser(team, user): assert access.can_delete(team) t = access.get_queryset()[0] - assert len(t.users.all()) == 1 - assert len(t.organization.admins.all()) == 0 + assert len(t.member_role.members.all()) == 1 + assert len(t.organization.admin_role.members.all()) == 0 @pytest.mark.django_db def test_team_access_org_admin(organization, team, user): a = user('admin', False) - organization.admins.add(a) + organization.admin_role.members.add(a) team.organization = organization team.save() @@ -47,13 +47,13 @@ def test_team_access_org_admin(organization, team, user): assert access.can_delete(team) t = access.get_queryset()[0] - assert len(t.users.all()) == 0 - assert len(t.organization.admins.all()) == 1 + assert len(t.member_role.members.all()) == 0 + assert len(t.organization.admin_role.members.all()) == 1 @pytest.mark.django_db def test_team_access_member(organization, team, user): u = user('member', False) - team.users.add(u) + team.member_role.members.add(u) team.organization = organization team.save() @@ -63,6 +63,6 @@ def test_team_access_member(organization, team, user): assert not access.can_delete(team) t = access.get_queryset()[0] - assert len(t.users.all()) == 1 - assert len(t.organization.admins.all()) == 0 + assert len(t.member_role.members.all()) == 1 + assert len(t.organization.admin_role.members.all()) == 0 diff --git a/awx/main/tests/functional/test_rbac_userresource.py b/awx/main/tests/functional/test_rbac_userresource.py index f5e83438df..517b297298 100644 --- a/awx/main/tests/functional/test_rbac_userresource.py +++ b/awx/main/tests/functional/test_rbac_userresource.py @@ -19,13 +19,13 @@ def test_org_user_admin(user, organization): admin = user('orgadmin') member = user('orgmember') - organization.users.add(member) + organization.member_role.members.add(member) assert not member.resource.accessible_by(admin, {'write':True}) - organization.admins.add(admin) + organization.admin_role.members.add(admin) assert member.resource.accessible_by(admin, {'write':True}) - organization.admins.remove(admin) + organization.admin_role.members.remove(admin) assert not member.resource.accessible_by(admin, {'write':True}) @pytest.mark.django_db @@ -33,10 +33,10 @@ def test_org_user_removed(user, organization): admin = user('orgadmin') member = user('orgmember') - organization.admins.add(admin) - organization.users.add(member) + organization.admin_role.members.add(admin) + organization.member_role.members.add(member) assert member.resource.accessible_by(admin, {'write':True}) - organization.users.remove(member) + organization.member_role.members.remove(member) assert not member.resource.accessible_by(admin, {'write':True})