7
7
import pytest
8
8
from rest_framework .test import APIClient
9
9
10
+ from core .api .serializers import UserSerializer
10
11
from core .factories import (
11
12
DocumentAskForAccessFactory ,
12
13
DocumentFactory ,
@@ -203,6 +204,8 @@ def test_api_documents_ask_for_access_list_authenticated_own_request():
203
204
)
204
205
205
206
user = UserFactory ()
207
+ user_data = UserSerializer (instance = user ).data
208
+
206
209
document_ask_for_access = DocumentAskForAccessFactory (
207
210
document = document , user = user , role = RoleChoices .READER
208
211
)
@@ -220,7 +223,7 @@ def test_api_documents_ask_for_access_list_authenticated_own_request():
220
223
{
221
224
"id" : str (document_ask_for_access .id ),
222
225
"document" : str (document .id ),
223
- "user" : str ( user . id ) ,
226
+ "user" : user_data ,
224
227
"role" : RoleChoices .READER ,
225
228
"created_at" : document_ask_for_access .created_at .isoformat ().replace (
226
229
"+00:00" , "Z"
@@ -286,12 +289,12 @@ def test_api_documents_ask_for_access_list_non_owner_or_admin(role):
286
289
}
287
290
288
291
289
- @pytest .mark .parametrize ("role" , [RoleChoices .OWNER , RoleChoices . ADMIN ])
292
+ @pytest .mark .parametrize ("role" , [RoleChoices .OWNER ])
290
293
def test_api_documents_ask_for_access_list_owner_or_admin (role ):
291
294
"""Owner or admin users should be able to list document ask for access."""
292
295
user = UserFactory ()
293
296
document = DocumentFactory (users = [(user , role )])
294
- document_ask_for_access = DocumentAskForAccessFactory .create_batch (
297
+ document_ask_for_accesses = DocumentAskForAccessFactory .create_batch (
295
298
3 , document = document , role = RoleChoices .READER
296
299
)
297
300
@@ -308,7 +311,7 @@ def test_api_documents_ask_for_access_list_owner_or_admin(role):
308
311
{
309
312
"id" : str (document_ask_for_access .id ),
310
313
"document" : str (document .id ),
311
- "user" : str ( document_ask_for_access .user . id ) ,
314
+ "user" : UserSerializer ( instance = document_ask_for_access .user ). data ,
312
315
"role" : RoleChoices .READER ,
313
316
"created_at" : document_ask_for_access .created_at .isoformat ().replace (
314
317
"+00:00" , "Z"
@@ -321,7 +324,7 @@ def test_api_documents_ask_for_access_list_owner_or_admin(role):
321
324
"retrieve" : True ,
322
325
},
323
326
}
324
- for document_ask_for_access in document_ask_for_access
327
+ for document_ask_for_access in document_ask_for_accesses
325
328
],
326
329
}
327
330
@@ -385,6 +388,7 @@ def test_api_documents_ask_for_access_retrieve_owner_or_admin(role):
385
388
document_ask_for_access = DocumentAskForAccessFactory (
386
389
document = document , role = RoleChoices .READER
387
390
)
391
+ user_data = UserSerializer (instance = document_ask_for_access .user ).data
388
392
389
393
client = APIClient ()
390
394
client .force_login (user )
@@ -396,7 +400,7 @@ def test_api_documents_ask_for_access_retrieve_owner_or_admin(role):
396
400
assert response .json () == {
397
401
"id" : str (document_ask_for_access .id ),
398
402
"document" : str (document .id ),
399
- "user" : str ( document_ask_for_access . user . id ) ,
403
+ "user" : user_data ,
400
404
"role" : RoleChoices .READER ,
401
405
"created_at" : document_ask_for_access .created_at .isoformat ().replace (
402
406
"+00:00" , "Z"
0 commit comments