diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 7134c1bae..0ce754453 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -1,7 +1,7 @@ import unittest 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 +240,7 @@ class Issue1386Tests(TestCase): Covers #1386 """ + @override_settings(URLIZE_ASSUME_HTTPS=True) def test_issue_1386(self): """ Test function urlize with different args @@ -248,7 +249,6 @@ class Issue1386Tests(TestCase): "asdf.com", "asdf.net", "www.as_df.org", - "as.d8f.ghj8.gov", ] for i in correct_urls: res = urlize(i) @@ -258,6 +258,7 @@ class Issue1386Tests(TestCase): incorrect_urls = [ "mailto://asdf@fdf.com", "asdf.netnet", + "as.d8f.ghj8.gov", ] for i in incorrect_urls: res = urlize(i) diff --git a/tests/test_validators.py b/tests/test_validators.py index 79d4c0cf8..f27ffb2b5 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -752,7 +752,7 @@ class TestUniqueConstraintValidation(TestCase): 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):