External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 04:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove UserResource and ensure RolePermission during migration

Browse Source
This commit is contained in:
Wayne Witzel III
2016-03-11 10:58:24 -05:00
parent 94e8058127
commit 80013e67bc
5 changed files with 20 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tests/functional/test_rbac_api.py
View File

@@ -1,7 +1,6 @@
import mock # noqa
import pytest
from django.contrib.contenttypes.models import ContentType
from django.core.urlresolvers import reverse
from awx.main.models.rbac import Role, ROLE_SINGLETON_SYSTEM_ADMINISTRATOR
@@ -47,7 +46,7 @@ def test_get_roles_list_user(organization, inventory, team, get, user):
assert Role.singleton(ROLE_SINGLETON_SYSTEM_ADMINISTRATOR).id in role_hash
assert organization.admin_role.id in role_hash
assert organization.member_role.id in role_hash
assert this_user.resource.admin_role.id in role_hash
assert this_user.admin_role.id in role_hash
assert custom_role.id in role_hash
assert inventory.admin_role.id not in role_hash
@@ -396,7 +395,6 @@ def test_role_children(get, team, admin, role):
@pytest.mark.django_db
def test_resource_access_list(get, team, admin, role):
team.member_role.members.add(admin)
content_type_id = ContentType.objects.get_for_model(team).pk
url = reverse('api:team_access_list', args=(team.id,))
res = get(url, admin)
assert res.status_code == 200