Skip to content

Commit 99b295a

Browse files
committed
Fixed Django 4.0/4.1 deprecations in tests
1 parent df51d54 commit 99b295a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

polymorphic/tests/admintestcase.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from django.contrib.admin.templatetags.admin_urls import admin_urlname
55
from django.contrib.auth.models import User
66
from django.contrib.messages.middleware import MessageMiddleware
7+
from django.http.response import HttpResponse
78
from django.test import RequestFactory, TestCase
89
from django.urls import clear_url_caches, reverse, set_urlconf
910

@@ -208,7 +209,7 @@ def create_admin_request(self, method, url, data=None, **extra):
208209
# Add properties which middleware would typically do
209210
request.session = {}
210211
request.user = self.admin_user
211-
MessageMiddleware().process_request(request)
212+
MessageMiddleware(lambda r: HttpResponse("OK?")).process_request(request)
212213
return request
213214

214215
def assertFormSuccess(self, request_url, response):

polymorphic/tests/test_regression.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
import django
12
from django.test import TestCase
23

34
from polymorphic.tests.models import Bottom, Middle, Top
45

6+
transform_arg = {"transform": repr} if django.VERSION >= (3, 2) else {}
7+
58

69
class RegressionTests(TestCase):
710
def test_for_query_result_incomplete_with_inheritance(self):
@@ -16,15 +19,15 @@ def test_for_query_result_incomplete_with_inheritance(self):
1619

1720
expected_queryset = [top, middle, bottom]
1821
self.assertQuerysetEqual(
19-
Top.objects.order_by("pk"), [repr(r) for r in expected_queryset]
22+
Top.objects.order_by("pk"), [repr(r) for r in expected_queryset], **transform_arg
2023
)
2124

2225
expected_queryset = [middle, bottom]
2326
self.assertQuerysetEqual(
24-
Middle.objects.order_by("pk"), [repr(r) for r in expected_queryset]
27+
Middle.objects.order_by("pk"), [repr(r) for r in expected_queryset], **transform_arg
2528
)
2629

2730
expected_queryset = [bottom]
2831
self.assertQuerysetEqual(
29-
Bottom.objects.order_by("pk"), [repr(r) for r in expected_queryset]
32+
Bottom.objects.order_by("pk"), [repr(r) for r in expected_queryset], **transform_arg
3033
)

0 commit comments

Comments
 (0)