my new shiny tests

Author: AlanCoding

test_app/tests/rbac/remote/test_public_api_compat.py

@@ -5,6 +5,7 @@
 from ansible_base.lib.utils.response import get_relative_url
 from ansible_base.rbac import permission_registry
 from ansible_base.rbac.remote import RemoteObject
+from ansible_base.rbac.models import RoleUserAssignment
 from test_app.models import Organization
 
 # Role Definitions
@@ -111,5 +112,28 @@ def test_give_permission_to_remote_object_uuid(admin_api_client, rando, foo_type
     data = {"role_definition": foo_rd_uuid.id, "user": rando.pk, "object_id": pk_value}
     response = admin_api_client.post(path=url, data=data)
     assert response.status_code == 201, response.data
+    assignment = RoleUserAssignment.objects.get(pk=response.data['id'])
+
+    # Test that we can serialize the assignment in a GET
+    response = admin_api_client.get(url)
+    assert response.status_code == 200, response.data
+    valid_items = [item for item in response.data['results'] if item['id'] == assignment.id]
+    assert len(valid_items) == 1
+    assignment_data = valid_items[0]
+    import pdb; pdb.set_trace()
+    assert 'content_object' in assignment_data
+    assert assignment_data['content_object']['object_id'] == str(a_foo.object_id)
 
     assert rando.has_obj_perm(a_foo, 'foo')
+
+    service_url = get_relative_url('serviceuserassignment-list')
+    response = admin_api_client.get(service_url + f'?user={rando.id}', format="json")
+    assert response.status_code == 200, response.data
+    assert response.data['count'] == 1
+    assignment_data = response.data['results'][0]
+    assert assignment_data['object_id'] == str(assignment.object_id)
+
+    from ansible_base.rbac.service_api.serializers import ServiceRoleTeamAssignmentSerializer, ServiceRoleUserAssignmentSerializer
+    serializer = ServiceRoleUserAssignmentSerializer(assignment)
+    assignment_data = serializer.data
+    assert assignment_data['object_id'] == str(assignment.object_id)

test_app/tests/rbac/remote/test_remote_assignment.py

@@ -1,3 +1,5 @@
+import uuid
+
 import pytest
 
 from ansible_base.rbac.models import DABContentType, DABPermission, RoleDefinition, RoleUserAssignment
@@ -34,18 +36,23 @@ def test_give_remote_permission(rando, foo_type, foo_permission, foo_rd):
 
 
 @pytest.mark.django_db
-def test_prefetch_related_objects(foo_type, foo_rd, inv_rd, inventory):
+def test_prefetch_related_objects(django_assert_num_queries, foo_type, foo_type_uuid, foo_rd, foo_rd_uuid, inv_rd, inventory):
     users = [User.objects.create(username=f'user{i}') for i in range(10)]
 
     a_foo = RemoteObject(content_type=foo_type, object_id=42)
+    a_foo_uuid = RemoteObject(content_type=foo_type_uuid, object_id=str(uuid.uuid4()))
     for u in users:
         foo_rd.give_permission(u, a_foo)
+        foo_rd_uuid.give_permission(u, a_foo_uuid)
         inv_rd.give_permission(u, inventory)
 
-    assert RoleUserAssignment.objects.count() == 20
-    assert {assignment.content_object for assignment in RoleUserAssignment.objects.all()} == {a_foo, inventory}
-    assert {assignment.content_object for assignment in RoleUserAssignment.objects.all()} == {a_foo, inventory}
-    assert {assignment.content_object for assignment in RoleUserAssignment.objects.prefetch_related('content_object')} == {a_foo, inventory}
+    assert RoleUserAssignment.objects.count() == 10*3
+    with django_assert_num_queries(2):
+        assert {assignment.content_object for assignment in RoleUserAssignment.objects.all()} == {a_foo, inventory, a_foo_uuid}
+    with django_assert_num_queries(2):
+        assert {assignment.content_object for assignment in RoleUserAssignment.objects.all()} == {a_foo, inventory, a_foo_uuid}
+    with django_assert_num_queries(2):
+        assert {assignment.content_object for assignment in RoleUserAssignment.objects.prefetch_related('content_object')} == {a_foo, inventory, a_foo_uuid}
 
 
 @pytest.mark.django_db