Merge pull request #1396 from chrismeyersfsu/labels-rbac

Labels rbac
This commit is contained in:
Chris Meyers
2016-04-05 08:53:49 -04:00
3 changed files with 82 additions and 7 deletions

View File

@@ -158,6 +158,10 @@ def credential():
def inventory(organization):
return organization.inventories.create(name="test-inv")
@pytest.fixture
def label(organization):
return organization.labels.create(name="test-label", description="test-label-desc")
@pytest.fixture
def role():
return Role.objects.create(name='role')
@@ -226,9 +230,6 @@ def hosts(group):
return hosts
return rf
@pytest.fixture
def permissions():
return {