Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions tests/results/test_clearable_file_field.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<form method="post" enctype="multipart/form-data">
<div id="div_id_clearable_file" class="mb-3">
<fieldset>
<legend for="id_clearable_file" class="form-label fs-6">Clearable file</legend>
<label for="id_clearable_file" class="form-label">Clearable file</label>
<div class="input-group mb-2">
<span class="input-group-text">Currently</span>
<div class="form-control d-flex h-auto">
Expand All @@ -20,6 +19,5 @@
<div>
<input type="file" name="clearable_file" class="form-control" id="id_clearable_file">
</div>
</fieldset>
</div>
</form>
7 changes: 3 additions & 4 deletions tests/results/test_clearable_file_field_failing.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<form method="post" enctype="multipart/form-data">
<div id="div_id_clearable_file" class="mb-3">
<fieldset aria-describedby="id_clearable_file_error">
<legend for="id_clearable_file" class="form-label fs-6 requiredField">
<label for="id_clearable_file" class="form-label requiredField">
Clearable file
<span class="asteriskField">*</span>
</legend>
</label>
<div class="is-invalid">
<input
aria-describedby="id_clearable_file_error"
type="file"
name="clearable_file"
class="form-control is-invalid"
Expand All @@ -20,6 +20,5 @@
</span>
</div>
</div>
</fieldset>
</div>
</form>
24 changes: 0 additions & 24 deletions tests/results/test_clearable_file_field_failing_lt60.html

This file was deleted.

23 changes: 0 additions & 23 deletions tests/results/test_clearable_file_field_lt60.html

This file was deleted.

7 changes: 1 addition & 6 deletions tests/test_layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -607,10 +607,7 @@ def test_file_field():
form.helper = FormHelper()
form.helper.layout = Layout("clearable_file")

if django.VERSION < (6, 0):
assert parse_form(form) == parse_expected("test_clearable_file_field_lt60.html")
else:
assert parse_form(form) == parse_expected("test_clearable_file_field.html")
assert parse_form(form) == parse_expected("test_clearable_file_field.html")

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

Expand All @@ -624,8 +621,6 @@ def test_file_field():
expected = "test_clearable_file_field_failing_lt50.html"
elif django.VERSION < (5, 2):
expected = "test_clearable_file_field_failing_lt52.html"
elif django.VERSION < (6, 0):
expected = "test_clearable_file_field_failing_lt60.html"
else:
expected = "test_clearable_file_field_failing.html"
assert parse_form(form) == parse_expected(expected)
Expand Down