External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 16:58:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3389 from jakemcdermott/fix_role_unit_tests

Browse Source 
fix skipped role unit tests
This commit is contained in:
Jake McDermott
2016-09-01 09:44:49 -04:00
committed by GitHub
parent 95563c7637 d2407b549e
commit f20185c113
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/tests/unit/api/test_roles.py
View File

@@ -19,7 +19,6 @@ from awx.main.models import (
Role, Role,
) )
@pytest.mark.skip(reason="Seeing pk error, suspect weirdness in mocking requests")
@pytest.mark.parametrize("pk, err", [ @pytest.mark.parametrize("pk, err", [
(111, "not change the membership"), (111, "not change the membership"),
(1, "may not perform"), (1, "may not perform"),
@@ -38,18 +37,17 @@ def test_user_roles_list_user_admin_role(pk, err):
factory = APIRequestFactory() factory = APIRequestFactory()
view = UserRolesList.as_view() view = UserRolesList.as_view()
user = User(username="root", is_superuser=True) user = User(username="root", is_superuser=True, pk=1, id=1)
request = factory.post("/user/1/roles", {'id':pk}, format="json") request = factory.post("/user/1/roles", {'id':pk}, format="json")
force_authenticate(request, user) force_authenticate(request, user)
response = view(request) response = view(request, pk=user.pk)
response.render() response.render()
assert response.status_code == 403 assert response.status_code == 403
assert err in response.content assert err in response.content
@pytest.mark.skip(reason="db access or mocking needed for new tests in role assignment code")
@pytest.mark.parametrize("admin_role, err", [ @pytest.mark.parametrize("admin_role, err", [
(True, "may not perform"), (True, "may not perform"),
(False, "not change the membership"), (False, "not change the membership"),
@@ -70,10 +68,13 @@ def test_role_users_list_other_user_admin_role(admin_role, err):
view = RoleUsersList.as_view() view = RoleUsersList.as_view()
user = User(username="root", is_superuser=True, pk=1, id=1) user = User(username="root", is_superuser=True, pk=1, id=1)
queried_user = User(username="maynard")
request = factory.post("/role/1/users", {'id':1}, format="json") request = factory.post("/role/1/users", {'id':1}, format="json")
force_authenticate(request, user) force_authenticate(request, user)
response = view(request) with mock.patch('awx.api.views.get_object_or_400', return_value=queried_user):
response = view(request)
response.render() response.render()
assert response.status_code == 403 assert response.status_code == 403