Fix tests

Author: Ivan Katanovic

daguerre/tests/unit/test_views.py

@@ -3,7 +3,7 @@
 from django.contrib.auth.models import AnonymousUser
 from django.http import Http404
 from django.test import RequestFactory
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from daguerre.helpers import AdjustmentHelper
 from daguerre.models import Area
@@ -100,7 +100,7 @@ def test_get__pk(self):
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response['Content-Type'], "application/json")
-        data = json.loads(force_text(response.content))
+        data = json.loads(force_str(response.content))
         self.assertEqual(data, area.serialize())
 
     def test_get__pk__wrong(self):
@@ -128,7 +128,7 @@ def test_get__no_pk(self):
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response['Content-Type'], "application/json")
-        data = json.loads(force_text(response.content))
+        data = json.loads(force_str(response.content))
         self.assertEqual(data, [area1.serialize(), area2.serialize()])
 
     def test_post__no_change_perms(self):
@@ -141,7 +141,7 @@ def test_post__no_change_perms(self):
             response = view.post(request)
 
         self.assertEqual(response.status_code, 403)
-        self.assertEqual(force_text(response.content), '')
+        self.assertEqual(force_str(response.content), '')
 
     def test_post__invalid_params(self):
         area = self.create_area(x2=50, y2=50)
@@ -200,7 +200,7 @@ def test_post__update(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response['Content-Type'], "application/json")
         self.assertEqual(Area.objects.count(), 1)
-        data = json.loads(force_text(response.content))
+        data = json.loads(force_str(response.content))
         new_area = Area.objects.get(pk=area.pk, storage_path=area.storage_path)
         self.assertEqual(data, new_area.serialize())
         self.assertNotEqual(data, old_serialize)
@@ -234,7 +234,7 @@ def test_post__update__invalid(self):
 
         self.assertEqual(response.status_code, 400)
         self.assertEqual(Area.objects.count(), 1)
-        data = json.loads(force_text(response.content))
+        data = json.loads(force_str(response.content))
         self.assertEqual(list(data.keys()), ['error'])
 
     def test_post__add(self):
@@ -266,7 +266,7 @@ def test_post__add(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response['Content-Type'], "application/json")
         self.assertEqual(Area.objects.count(), 2)
-        data = json.loads(force_text(response.content))
+        data = json.loads(force_str(response.content))
         new_area = Area.objects.exclude(pk=area.pk).get()
         self.assertEqual(data, new_area.serialize())
         del data['storage_path']
@@ -299,7 +299,7 @@ def test_post__add__no_perms(self):
 
         self.assertEqual(response.status_code, 403)
         self.assertEqual(Area.objects.count(), 1)
-        self.assertEqual(force_text(response.content), '')
+        self.assertEqual(force_str(response.content), '')
 
     def test_delete__no_perms(self):
         area = self.create_area(x2=50, y2=50)
@@ -319,7 +319,7 @@ def test_delete__no_perms(self):
 
         self.assertEqual(response.status_code, 403)
         self.assertEqual(Area.objects.count(), 1)
-        self.assertEqual(force_text(response.content), '')
+        self.assertEqual(force_str(response.content), '')
 
     def test_delete__no_pk(self):
         area = self.create_area(x2=50, y2=50)
@@ -356,5 +356,5 @@ def test_delete(self):
             response = view.delete(request)
 
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(force_text(response.content), '')
+        self.assertEqual(force_str(response.content), '')
         self.assertEqual(Area.objects.count(), 0)

daguerre/views.py

@@ -10,6 +10,10 @@
 from daguerre.models import Area
 
 
+def is_ajax(request):
+    return request.headers.get('x-requested-with') == 'XMLHttpRequest'
+
+
 class AdjustedImageRedirectView(View):
     """
     Returns a redirect to an :attr:`~AdjustedImage.adjusted` file,
@@ -46,7 +50,7 @@ class AjaxAdjustmentInfoView(AdjustedImageRedirectView):
     secure = False
 
     def get(self, request, *args, **kwargs):
-        if not request.is_ajax():
+        if not is_ajax(request):
             raise Http404("Request is not AJAX.")
 
         helper = self.get_helper(generate=False)
@@ -77,7 +81,7 @@ def has_delete_permission(self, request):
         return self.has_permission(request.user, 'delete', Area)
 
     def get(self, request, *args, **kwargs):
-        if not request.is_ajax():
+        if not is_ajax(request):
             raise Http404("Request is not AJAX.")
 
         storage_path = self.kwargs['storage_path']
@@ -96,7 +100,7 @@ def get(self, request, *args, **kwargs):
         return HttpResponse(json.dumps(data), content_type="application/json")
 
     def post(self, request, *args, **kwargs):
-        if not request.is_ajax():
+        if not is_ajax(request):
             raise Http404("Request is not AJAX.")
 
         if not self.has_change_permission(request):
@@ -138,7 +142,7 @@ def post(self, request, *args, **kwargs):
                             status=status)
 
     def delete(self, request, *args, **kwargs):
-        if not request.is_ajax():
+        if not is_ajax(request):
             raise Http404("Request is not AJAX.")
 
         if self.kwargs['pk'] is None:

test_project/requirements-4.2.txt

@@ -1,3 +1,2 @@
 Django==4.2.27
-pytz==2019.3
 -r requirements.txt