Skip to content

Commit 7a95d7f

Browse files
authored
Updated tests for Django 6.0.1. (#220)
1 parent 7fd9389 commit 7a95d7f

5 files changed

Lines changed: 5 additions & 60 deletions

tests/results/test_clearable_file_field.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<form method="post" enctype="multipart/form-data">
22
<div id="div_id_clearable_file" class="mb-3">
3-
<fieldset>
4-
<legend for="id_clearable_file" class="form-label fs-6">Clearable file</legend>
3+
<label for="id_clearable_file" class="form-label">Clearable file</label>
54
<div class="input-group mb-2">
65
<span class="input-group-text">Currently</span>
76
<div class="form-control d-flex h-auto">
@@ -20,6 +19,5 @@
2019
<div>
2120
<input type="file" name="clearable_file" class="form-control" id="id_clearable_file">
2221
</div>
23-
</fieldset>
2422
</div>
2523
</form>

tests/results/test_clearable_file_field_failing.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<form method="post" enctype="multipart/form-data">
22
<div id="div_id_clearable_file" class="mb-3">
3-
<fieldset aria-describedby="id_clearable_file_error">
4-
<legend for="id_clearable_file" class="form-label fs-6 requiredField">
3+
<label for="id_clearable_file" class="form-label requiredField">
54
Clearable file
65
<span class="asteriskField">*</span>
7-
</legend>
6+
</label>
87
<div class="is-invalid">
98
<input
9+
aria-describedby="id_clearable_file_error"
1010
type="file"
1111
name="clearable_file"
1212
class="form-control is-invalid"
@@ -20,6 +20,5 @@
2020
</span>
2121
</div>
2222
</div>
23-
</fieldset>
2423
</div>
2524
</form>

tests/results/test_clearable_file_field_failing_lt60.html

Lines changed: 0 additions & 24 deletions
This file was deleted.

tests/results/test_clearable_file_field_lt60.html

Lines changed: 0 additions & 23 deletions
This file was deleted.

tests/test_layout.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -607,10 +607,7 @@ def test_file_field():
607607
form.helper = FormHelper()
608608
form.helper.layout = Layout("clearable_file")
609609

610-
if django.VERSION < (6, 0):
611-
assert parse_form(form) == parse_expected("test_clearable_file_field_lt60.html")
612-
else:
613-
assert parse_form(form) == parse_expected("test_clearable_file_field.html")
610+
assert parse_form(form) == parse_expected("test_clearable_file_field.html")
614611

615612
form.helper.layout = Layout("file_field")
616613

@@ -624,8 +621,6 @@ def test_file_field():
624621
expected = "test_clearable_file_field_failing_lt50.html"
625622
elif django.VERSION < (5, 2):
626623
expected = "test_clearable_file_field_failing_lt52.html"
627-
elif django.VERSION < (6, 0):
628-
expected = "test_clearable_file_field_failing_lt60.html"
629624
else:
630625
expected = "test_clearable_file_field_failing.html"
631626
assert parse_form(form) == parse_expected(expected)

0 commit comments

Comments
 (0)