Skip to content

[pull] main from django:main #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Nov 21, 2025
Merged

[pull] main from django:main #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be0620b
Refs #36031 -- Added tests of DecimalRangeField __contains lookup wit…
felixxm Nov 21, 2025
3f15935
Refs #36705 -- Added coverage for multiple types of enclosing punctua…
jacobtylerwalls Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions tests/postgres_tests/test_ranges.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,25 @@ def test_contains_range(self):
[self.objs[0]],
)

def test_decimal_contains_range(self):
decimals = RangesModel.objects.bulk_create(
[
RangesModel(decimals=NumericRange(None, 10)),
RangesModel(decimals=NumericRange(10, None)),
RangesModel(decimals=NumericRange(5, 15)),
RangesModel(decimals=NumericRange(5, 15, "(]")),
]
)
for contains, objs in [
(199, [decimals[1]]),
(1, [decimals[0]]),
(15, [decimals[1], decimals[3]]),
]:
with self.subTest(decimal_contains=contains):
self.assertSequenceEqual(
RangesModel.objects.filter(decimals__contains=contains), objs
)

def test_contained_by(self):
self.assertSequenceEqual(
RangesModel.objects.filter(ints__contained_by=NumericRange(0, 20)),
Expand Down
7 changes: 7 additions & 0 deletions tests/template_tests/filter_tests/test_urlize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,13 @@ def test_parenthesis(self):
'rel="nofollow">https://en.wikipedia.org/wiki/Django_(web_framework)</a>)',
)

def test_parenthesis_and_bracket(self):
self.assertEqual(
urlize("[(https://en.wikipedia.org/)]"),
'[(<a href="https://en.wikipedia.org/" '
'rel="nofollow">https://en.wikipedia.org/</a>)]',
)

def test_nofollow(self):
"""
#12183 - Check urlize adds nofollow properly - see #12183
Expand Down