use client_api instead of client for tests

Signed-off-by: Nir Izraeli <[email protected]>

Author: nirizr

server/utils/__init__.py

@@ -1,9 +1,12 @@
 import os
 
 
-class ViewSetTemplateMixin(object):
+class ViewSetTemplateMixin:
+  def get_model_name(self):
+    return self.__class__.__name__.lower().replace('viewset', '')
+
   def get_template_names(self):
-    name_parts = [self.__class__.__name__.lower(),
+    name_parts = [self.get_model_name(),
                   "{}.html".format(self.action)]
     template_name = os.path.join(*name_parts)
     return [template_name]

tests/server/collab/test_all.py

@@ -1,7 +1,6 @@
 import pytest
-import json
 from functools import partial
-from rest_framework import status
+from rest_framework import status, test
 
 from django.db import models
 from collab.models import Project, File, FileVersion, Task, Instance, Vector
@@ -10,6 +9,18 @@
 import string
 
 
+@pytest.fixture
+def api_client(db):
+  return test.APIClient()
+
+
+@pytest.fixture
+def admin_api_client(db, admin_user):
+  client = test.APIClient()
+  client.force_authenticate(user=admin_user)
+  return client
+
+
 def rand_hash(n):
   return ''.join(random.choice(string.ascii_uppercase) for _ in range(n))
 
@@ -116,23 +127,23 @@ def assert_response(response, status):
 
 @pytest.mark.django_db
 @pytest.mark.parametrize('model_name', collab_models.keys())
-def test_empty_lists(client, model_name):
-  response = client.get('/collab/{}/'.format(model_name),
-                        content_type="application/json")
+def test_empty_lists(api_client, model_name):
+  response = api_client.get('/collab/{}/'.format(model_name),
+                            HTTP_ACCEPT='application/json')
   assert_response(response, status.HTTP_200_OK)
   json_response = response.json()
   assert json_response == []
 
 
 @pytest.mark.django_db
 @pytest.mark.parametrize('model_name', collab_models.keys())
-def test_model_guest_list(client, admin_user, model_name):
+def test_model_guest_list(api_client, admin_user, model_name):
   # setup objects
   obj = create_model(model_name, admin_user)
   obj.save()
 
-  response = client.get('/collab/{}/'.format(model_name),
-                        content_type="application/json")
+  response = api_client.get('/collab/{}/'.format(model_name),
+                            HTTP_ACCEPT="application/json")
   assert_response(response, status.HTTP_200_OK)
   dct_list = response.json()
   dct = dct_list[-1]
@@ -141,27 +152,27 @@ def test_model_guest_list(client, admin_user, model_name):
 
 @pytest.mark.django_db
 @pytest.mark.parametrize('model_name', collab_models.keys())
-def test_model_guest_creation(client, admin_user, model_name):
+def test_model_guest_creation(api_client, admin_user, model_name):
   model_data = setup_model(model_name, admin_user)
 
-  response = client.post('/collab/{}/'.format(model_name),
-                         data=json.dumps(model_data),
-                         content_type="application/json")
+  response = api_client.post('/collab/{}/'.format(model_name),
+                             data=model_data,
+                             HTTP_ACCEPT="application/json")
   assert_response(response, status.HTTP_401_UNAUTHORIZED)
 
 
 @pytest.mark.django_db
 @pytest.mark.parametrize('model_name', collab_models.keys())
-def test_model_creation(client, admin_client, admin_user, model_name):
+def test_model_creation(api_client, admin_api_client, admin_user, model_name):
   model_data = setup_model(model_name, admin_user)
 
-  response = admin_client.post('/collab/{}/'.format(model_name),
-                               data=json.dumps(model_data),
-                               content_type="application/json")
+  response = admin_api_client.post('/collab/{}/'.format(model_name),
+                                   data=model_data,
+                                   HTTP_ACCEPT='application/json')
 
   assert_response(response, status.HTTP_201_CREATED)
   projects_created = [response.json()]
 
-  response = client.get('/collab/{}/'.format(model_name),
-                        content_type="application/json")
+  response = api_client.get('/collab/{}/'.format(model_name),
+                            HTTP_ACCEPT="application/json")
   assert_eq(response.json(), projects_created)