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

Various org.admins -> org.admin_role.members transformations

Browse Source
This commit is contained in:
Akita Noek
2016-03-14 16:28:24 -04:00
parent 0c0ed45b44
commit 6549a0225b
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tests/functional/api/test_fact_versions.py
View File

@@ -235,7 +235,7 @@ def test_super_user_ok(hosts, fact_scans, get, user, team):
@pytest.mark.django_db @pytest.mark.django_db
def test_user_admin_ok(organization, hosts, fact_scans, get, user, team): def test_user_admin_ok(organization, hosts, fact_scans, get, user, team):
user_admin = user('johnson', False) user_admin = user('johnson', False)
organization.admins.add(user_admin) organization.admin_role.members.add(user_admin)
response = _test_user_access_control(hosts, fact_scans, get, user_admin, team) response = _test_user_access_control(hosts, fact_scans, get, user_admin, team)

2
awx/main/tests/functional/api/test_fact_view.py
View File

@@ -162,7 +162,7 @@ def test_super_user_ok(hosts, fact_scans, get, user, team):
@pytest.mark.django_db @pytest.mark.django_db
def test_user_admin_ok(organization, hosts, fact_scans, get, user, team): def test_user_admin_ok(organization, hosts, fact_scans, get, user, team):
user_admin = user('johnson', False) user_admin = user('johnson', False)
organization.admins.add(user_admin) organization.admin_role.members.add(user_admin)
response = _test_user_access_control(hosts, fact_scans, get, user_admin, team) response = _test_user_access_control(hosts, fact_scans, get, user_admin, team)

2
awx/main/tests/old/ad_hoc.py
View File

@@ -39,7 +39,7 @@ class BaseAdHocCommandTest(BaseJobExecutionTest):
self.setup_instances() self.setup_instances()
self.setup_users() self.setup_users()
self.organization = self.make_organizations(self.super_django_user, 1)[0] self.organization = self.make_organizations(self.super_django_user, 1)[0]
self.organization.admins.add(self.normal_django_user) self.organization.admin_role.members.add(self.normal_django_user)
self.inventory = self.organization.inventories.create(name='test-inventory', description='description for test-inventory') self.inventory = self.organization.inventories.create(name='test-inventory', description='description for test-inventory')
self.host = self.inventory.hosts.create(name='host.example.com') self.host = self.inventory.hosts.create(name='host.example.com')
self.host2 = self.inventory.hosts.create(name='host2.example.com') self.host2 = self.inventory.hosts.create(name='host2.example.com')