From ab23e983f8a33179bacce346eb232f8b19a8240e Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Mon, 14 Mar 2016 17:00:59 -0400 Subject: [PATCH] More team/org users/admins -> member_role/admin_role updates --- awx/main/tests/functional/api/test_fact_versions.py | 4 ++-- awx/main/tests/functional/api/test_fact_view.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/tests/functional/api/test_fact_versions.py b/awx/main/tests/functional/api/test_fact_versions.py index 5aab13764a..fa42802077 100644 --- a/awx/main/tests/functional/api/test_fact_versions.py +++ b/awx/main/tests/functional/api/test_fact_versions.py @@ -205,7 +205,7 @@ def _test_user_access_control(hosts, fact_scans, get, user_obj, team_obj): hosts = hosts(host_count=1) fact_scans(fact_scans=1) - team_obj.users.add(user_obj) + team_obj.member_role.members.add(user_obj) url = reverse('api:host_fact_versions_list', args=(hosts[0].pk,)) response = get(url, user_obj) @@ -247,7 +247,7 @@ def test_user_admin_ok(organization, hosts, fact_scans, get, user, team): def test_user_admin_403(organization, organizations, hosts, fact_scans, get, user, team): user_admin = user('johnson', False) org2 = organizations(1) - org2[0].admins.add(user_admin) + org2[0].admin_role.members.add(user_admin) response = _test_user_access_control(hosts, fact_scans, get, user_admin, team) diff --git a/awx/main/tests/functional/api/test_fact_view.py b/awx/main/tests/functional/api/test_fact_view.py index 054a323844..2282baeef7 100644 --- a/awx/main/tests/functional/api/test_fact_view.py +++ b/awx/main/tests/functional/api/test_fact_view.py @@ -132,7 +132,7 @@ def _test_user_access_control(hosts, fact_scans, get, user_obj, team_obj): hosts = hosts(host_count=1) fact_scans(fact_scans=1) - team_obj.users.add(user_obj) + team_obj.member_role.members.add(user_obj) url = reverse('api:host_fact_compare_view', args=(hosts[0].pk,)) response = get(url, user_obj) @@ -174,7 +174,7 @@ def test_user_admin_ok(organization, hosts, fact_scans, get, user, team): def test_user_admin_403(organization, organizations, hosts, fact_scans, get, user, team): user_admin = user('johnson', False) org2 = organizations(1) - org2[0].admins.add(user_admin) + org2[0].admin_role.members.add(user_admin) response = _test_user_access_control(hosts, fact_scans, get, user_admin, team)