External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 03:17:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

updating some tests to use new factories

Browse Source
This commit is contained in:
Wayne Witzel III
2016-05-23 17:14:50 -04:00
parent 0516ef02ca
commit bcef4a698c
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/main/tests/functional/conftest.py
View File

@@ -38,6 +38,11 @@ from awx.main.models.organization import (
from awx.main.models.notifications import NotificationTemplate from awx.main.models.notifications import NotificationTemplate
from awx.main.tests.factories import (
create_organization,
create_job_template,
)
''' '''
Disable all django model signals. Disable all django model signals.
''' '''
@@ -147,18 +152,6 @@ def instance(settings):
def organization(instance): def organization(instance):
return Organization.objects.create(name="test-org", description="test-org-desc") return Organization.objects.create(name="test-org", description="test-org-desc")
@pytest.fixture
def organization_factory(instance):
def factory(name):
try:
org = Organization.objects.get(name=name)
except Organization.DoesNotExist:
org = Organization.objects.create(name=name,
description="description for " + name,
)
return org
return factory
@pytest.fixture @pytest.fixture
def credential(): def credential():
return Credential.objects.create(kind='aws', name='test-cred') return Credential.objects.create(kind='aws', name='test-cred')
@@ -474,3 +467,11 @@ def job_template_labels(organization, job_template):
job_template.labels.create(name="label-2", organization=organization) job_template.labels.create(name="label-2", organization=organization)
return job_template return job_template
@pytest.fixture
def job_template_factory():
return create_job_template
@pytest.fixture
def organization_factory():
return create_organization

20
awx/main/tests/functional/test_rbac_label.py
View File

@@ -31,20 +31,22 @@ def test_label_access_superuser(label, user):
assert access.can_delete(label) assert access.can_delete(label)
@pytest.mark.django_db @pytest.mark.django_db
def test_label_access_admin(label, user, organization_factory): def test_label_access_admin(organization_factory):
'''can_change because I am an admin of that org''' '''can_change because I am an admin of that org'''
a = user('admin', False) no_members = organization_factory("no_members")
org_no_members = organization_factory("no_members") members = organization_factory("has_members",
org_members = organization_factory("has_members") users=['admin'],
labels=['test'])
label.organization.admin_role.members.add(a) label = members.labels.test
org_members.admin_role.members.add(a) admin = members.users.admin
members.organization.admin_role.members.add(admin)
access = LabelAccess(user('admin', False)) access = LabelAccess(admin)
assert not access.can_change(label, {'organization': org_no_members.id}) assert not access.can_change(label, {'organization': no_members.organization.id})
assert access.can_read(label) assert access.can_read(label)
assert access.can_change(label, None) assert access.can_change(label, None)
assert access.can_change(label, {'organization': org_members.id}) assert access.can_change(label, {'organization': members.organization.id})
assert access.can_delete(label) assert access.can_delete(label)
@pytest.mark.django_db @pytest.mark.django_db