test fixes and read_role

This commit is contained in:
Wayne Witzel III
2016-04-15 11:56:08 -04:00
parent d508254742
commit ff3be050fa
9 changed files with 93 additions and 85 deletions

View File

@@ -16,13 +16,13 @@ def test_credential_migration_user(credential, user, permissions):
rbac.migrate_credential(apps, None)
assert credential.accessible_by(u, permissions['admin'])
assert u in credential.owner_role
@pytest.mark.django_db
def test_credential_use_role(credential, user, permissions):
u = user('user', False)
credential.use_role.members.add(u)
assert credential.accessible_by(u, permissions['usage'])
assert u in credential.owner_role
@pytest.mark.django_db
def test_credential_migration_team_member(credential, team, user, permissions):
@@ -35,12 +35,12 @@ def test_credential_migration_team_member(credential, team, user, permissions):
# No permissions pre-migration (this happens automatically so we patch this)
team.admin_role.children.remove(credential.owner_role)
team.member_role.children.remove(credential.use_role)
assert not credential.accessible_by(u, permissions['admin'])
assert u not in credential.owner_role
rbac.migrate_credential(apps, None)
# Admin permissions post migration
assert credential.accessible_by(u, permissions['admin'])
assert u in credential.owner_role
@pytest.mark.django_db
def test_credential_migration_team_admin(credential, team, user, permissions):
@@ -49,11 +49,11 @@ def test_credential_migration_team_admin(credential, team, user, permissions):
credential.deprecated_team = team
credential.save()
assert not credential.accessible_by(u, permissions['usage'])
assert u not in credential.use_role
# Usage permissions post migration
rbac.migrate_credential(apps, None)
assert credential.accessible_by(u, permissions['usage'])
assert u in credential.use_role
def test_credential_access_superuser():
u = User(username='admin', is_superuser=True)
@@ -166,10 +166,10 @@ def test_cred_inventory_source(user, inventory, credential):
inventory=inventory,
)
assert not credential.accessible_by(u, {'use':True})
assert u not in credential.use_role
rbac.migrate_credential(apps, None)
assert credential.accessible_by(u, {'use':True})
assert u in credential.use_role
@pytest.mark.django_db
def test_cred_project(user, credential, project):
@@ -178,10 +178,10 @@ def test_cred_project(user, credential, project):
project.credential = credential
project.save()
assert not credential.accessible_by(u, {'use':True})
assert u not in credential.use_role
rbac.migrate_credential(apps, None)
assert credential.accessible_by(u, {'use':True})
assert u in credential.use_role
@pytest.mark.django_db
def test_cred_no_org(user, credential):
@@ -196,7 +196,7 @@ def test_cred_team(user, team, credential):
credential.deprecated_team = team
credential.save()
assert not credential.accessible_by(u, {'use':True})
assert u not in credential.use_role
rbac.migrate_credential(apps, None)
assert credential.accessible_by(u, {'use':True})
assert u in credential.use_role