diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 7134c1bae0..072796628c 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -1,7 +1,8 @@ import unittest +import django from django.template import Context, Template -from django.test import TestCase +from django.test import TestCase, override_settings from django.utils.html import urlize from rest_framework.compat import coreapi, coreschema @@ -240,6 +241,7 @@ class Issue1386Tests(TestCase): Covers #1386 """ + @override_settings(URLIZE_ASSUME_HTTPS=True) def test_issue_1386(self): """ Test function urlize with different args @@ -248,8 +250,9 @@ def test_issue_1386(self): "asdf.com", "asdf.net", "www.as_df.org", - "as.d8f.ghj8.gov", ] + if django.VERSION < (5, 3): + correct_urls.append("as.d8f.ghj8.gov") for i in correct_urls: res = urlize(i) self.assertNotEqual(res, i) @@ -259,6 +262,8 @@ def test_issue_1386(self): "mailto://asdf@fdf.com", "asdf.netnet", ] + if django.VERSION >= (5, 3): + incorrect_urls.append("as.d8f.ghj8.gov") for i in incorrect_urls: res = urlize(i) self.assertEqual(i, res) diff --git a/tests/test_validators.py b/tests/test_validators.py index 79d4c0cf81..96354b9b13 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -752,7 +752,7 @@ def test_single_field_uniq_validators(self): validators = serializer.fields['fancy_conditions'].validators assert len(validators) == 2 + extra_validators_qty - ids_in_qs = {frozenset(v.queryset.values_list(flat=True)) for v in validators if hasattr(v, "queryset")} + ids_in_qs = {frozenset(v.queryset.values_list('id', flat=True)) for v in validators if hasattr(v, "queryset")} assert ids_in_qs == {frozenset([1]), frozenset([3])} def test_nullable_unique_constraint_fields_are_not_required(self): diff --git a/tox.ini b/tox.ini index cbaaf159e5..0d609854a7 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,9 @@ envlist = {py310}-{django42,django51,django52} {py311}-{django42,django51,django52} - {py312}-{django42,django51,django52,djangomain} - {py313}-{django51,django52,djangomain} - {py314}-{django52,djangomain} + {py312}-{django42,django51,django52,django60,djangomain} + {py313}-{django51,django52,django60,djangomain} + {py314}-{django52,django60,djangomain} base dist docs @@ -20,6 +20,7 @@ deps = django50: Django>=5.0,<5.1 django51: Django>=5.1,<5.2 django52: Django>=5.2,<6.0 + django60: Django>=6.0b1,<6.1 djangomain: https://github.com/django/django/archive/main.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt