Skip to content

Commit 2ba9c89

Browse files
committed
test fixed
1 parent 02ab0c9 commit 2ba9c89

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

tests/test_templatetags.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import unittest
22

33
from django.template import Context, Template
4-
from django.test import TestCase
4+
from django.test import TestCase, override_settings
55
from django.utils.html import urlize
66

77
from rest_framework.compat import coreapi, coreschema
@@ -240,6 +240,7 @@ class Issue1386Tests(TestCase):
240240
Covers #1386
241241
"""
242242

243+
@override_settings(URLIZE_ASSUME_HTTPS=True)
243244
def test_issue_1386(self):
244245
"""
245246
Test function urlize with different args
@@ -248,7 +249,6 @@ def test_issue_1386(self):
248249
"asdf.com",
249250
"asdf.net",
250251
"www.as_df.org",
251-
"as.d8f.ghj8.gov",
252252
]
253253
for i in correct_urls:
254254
res = urlize(i)
@@ -258,6 +258,7 @@ def test_issue_1386(self):
258258
incorrect_urls = [
259259
"mailto://[email protected]",
260260
"asdf.netnet",
261+
"as.d8f.ghj8.gov",
261262
]
262263
for i in incorrect_urls:
263264
res = urlize(i)

tests/test_validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ def test_single_field_uniq_validators(self):
752752

753753
validators = serializer.fields['fancy_conditions'].validators
754754
assert len(validators) == 2 + extra_validators_qty
755-
ids_in_qs = {frozenset(v.queryset.values_list(flat=True)) for v in validators if hasattr(v, "queryset")}
755+
ids_in_qs = {frozenset(v.queryset.values_list('id',flat=True)) for v in validators if hasattr(v, "queryset")}
756756
assert ids_in_qs == {frozenset([1]), frozenset([3])}
757757

758758
def test_nullable_unique_constraint_fields_are_not_required(self):

0 commit comments

Comments
 (0)