Merge pull request #17 from matthewhegarty/django-3-2-update

updated to work with Django3.2

Author: vtemian

example/db.sqlite3

@@ -1,7 +1,7 @@
-attrs==17.4.0
-Django==2.2.13
-pluggy==0.6.0
-py==1.5.2
-pytest==3.4.0
-pytz==2018.3
-six==1.11.0
+attrs==21.2.0
+Django==3.2.5
+pluggy==0.13.1
+py==1.10.0
+pytest==6.2.4
+pytz==2021.1
+six==1.16.0

example/requirements.txt

@@ -1,8 +1,9 @@
-Django<=2.0.11
-attrs==17.4.0
-pluggy==0.6.0
-py==1.5.2
-pytest==3.4.0
-pytest-django==3.1.2
-pytz==2018.3
-six==1.11.0
+Django==3.2.5
+attrs==21.2.0
+pluggy==0.13.1
+py==1.10.0
+pytest==6.2.4
+pytest-cov==2.12.1
+pytest-django==4.4.0
+pytz==2021.1
+six==1.16.0

requirements.dev.txt

@@ -2,6 +2,7 @@
 import threading
 from contextlib import contextmanager
 
+import django
 from django.utils.deprecation import MiddlewareMixin
 
 
@@ -68,6 +69,9 @@ def process_response(self, request, response):
             for service in get_services()
         ]
         if services:
-            response._headers['server-timing'] = ('Server-Timing', ','.join(services))
+            if django.VERSION >= (3, 2):
+                response.headers['Server-Timing'] = ','.join(services)
+            else:
+                response._headers['Server-Timing'] = ','.join(services)
             discard_all_services()
         return response

server_timing/middleware.py

@@ -9,6 +9,7 @@
 
 
 settings.configure(
+    SECRET_KEY = "local_key",
     DEBUG=True,
     ROOT_URLCONF='tests.urls',
     DATABASES={

tests/conftest.py

@@ -1,12 +1,22 @@
-def test_header_complex_header(client):
-    response = client.get('/complex')
+from unittest import skipUnless
+from unittest.mock import patch, PropertyMock
+
+import django
+
+
+@skipUnless(django.VERSION[0] == 3 and django.VERSION[1] >= 2, "response.headers not included until Django 3.2")
+def test_header_complex_header_django_32(client):
+    with patch('server_timing.middleware.TimedService.duration', new_callable=PropertyMock) as mock_duration:
+        mock_duration.return_value = 10
+        response = client.get('/complex')
 
     assert response.has_header('Server-Timing')
-    assert response._headers['server-timing'] == (
-        'Server-Timing',
-        'index;desc="Index View";dur=8,first;desc="First '
-        'service";dur=3,second;desc="Second service";dur=5'
+    res = response.headers['server-timing']
+    target = (
+        "index;desc=\"Index View\";dur=10,first;"
+        "desc=\"First service\";dur=10,second;desc=\"Second service\";dur=10"
     )
+    assert res == target
 
 
 def test_header_no_header(client):

tests/test_integration.py

@@ -1,7 +1,7 @@
 import time
 
-from django.conf.urls import url
 from django.http import HttpResponse
+from django.urls import path
 
 from server_timing.middleware import TimedService, timed, timed_wrapper
 
@@ -26,6 +26,6 @@ def no_header_view(request):
 
 
 urlpatterns = [
-    url('complex', complex_view),
-    url('no-header', no_header_view),
+    path('complex', complex_view),
+    path('no-header', no_header_view),
 ]