Skip to content

Commit ffa7878

Browse files
powderflaskpowderflask
authored
D5 versions matrix (#7)
* update supported versions grid drop unsupported versions of python and django add support for crispy-forms 2.x and django 5.x * fix test suite for Dj5.x breaking changes. Dj5.0 adds new aria attributes to fields - see release notes. Added Dj5.x specific test logic where this change broke tests. * update supported versions grid drop unsupported versions of python from CI scripts * update supported versions grid drop unsupported versions of python from CI scripts * black
1 parent 4ca9ae5 commit ffa7878

13 files changed

+375
-25
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
strategy:
1313
matrix:
1414
python-version:
15-
- '3.7'
1615
- '3.8'
1716
- '3.9'
1817
- '3.10'

‎.github/workflows/test.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
strategy:
1515
matrix:
1616
python-version:
17-
- '3.7'
1817
- '3.8'
1918
- '3.9'
2019
- '3.10'

‎tests/results/bootstrap3/test_form_helper/bootstrap_form_show_errors_bs3_false_gte50.html‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<form method="post">
2+
<div id="div_id_email" class="form-group">
3+
<label for="id_email" class=" control-label requiredField"> email<span class="asteriskField">*</span> </label>
4+
<div class=" controls">
5+
<div class="input-group"><input type="text" name="email" value="invalidemail" maxlength="30"
6+
aria-describedby="id_email_helptext" aria-invalid="true"
7+
class="textinput textInput inputtext form-control" required id="id_email" />
8+
<span class="input-group-addon">whatever</span></div>
9+
<div id="hint_id_email" class="help-block">Insert your email</div>
10+
</div>
11+
</div>
12+
<div id="div_id_first_name" class="form-group">
13+
<label for="id_first_name" class=" control-label requiredField"> first name<span class="asteriskField">*</span> </label>
14+
<div class=" controls">
15+
<div class="input-group">
16+
<span class="input-group-addon">blabla</span>
17+
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" aria-invalid="true"
18+
class="textinput textInput inputtext form-control" required id="id_first_name" />
19+
</div>
20+
</div>
21+
</div>
22+
<div id="div_id_last_name" class="form-group">
23+
<label for="id_last_name" class=" control-label requiredField"> last name<span class="asteriskField">*</span> </label>
24+
<div class=" controls">
25+
<div class="input-group">
26+
<span class="input-group-addon">foo</span>
27+
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" aria-invalid="true"
28+
class="textinput textInput inputtext form-control" required id="id_last_name" />
29+
<span class="input-group-addon">bar</span>
30+
</div>
31+
</div>
32+
</div>
33+
<div id="div_id_password1" class="form-group">
34+
<label for="id_password1" class=" control-label requiredField"> password<span class="asteriskField">*</span> </label>
35+
<div class=" controls">
36+
<div class="input-group"><input type="password" name="password1" maxlength="30" class="textInput textinput form-control" required id="id_password1" /> <span class="input-group-addon">whatever</span></div>
37+
</div>
38+
</div>
39+
<div id="div_id_password2" class="form-group">
40+
<label for="id_password2" class=" control-label requiredField"> re-enter password<span class="asteriskField">*</span> </label>
41+
<div class=" controls">
42+
<div class="input-group"><span class="input-group-addon">blabla</span> <input type="password" name="password2" maxlength="30" class="textInput textinput form-control" required id="id_password2" /></div>
43+
</div>
44+
</div>
45+
</form>

‎tests/results/bootstrap3/test_form_helper/bootstrap_form_show_errors_bs3_true_gte50.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<form method="post">
2+
<div id="div_id_email" class="form-group has-error">
3+
<label for="id_email" class=" control-label requiredField"> email<span class="asteriskField">*</span> </label>
4+
<div class=" controls">
5+
<div class="input-group"><input type="text" name="email" value="invalidemail" maxlength="30"
6+
aria-describedby="id_email_helptext" aria-invalid="true"
7+
class="textinput textInput inputtext form-control" required id="id_email" />
8+
<span class="input-group-addon">whatever</span></div>
9+
<span id="error_1_id_email" class="help-block"><strong>Enter a valid email address.</strong></span>
10+
<div id="hint_id_email" class="help-block">Insert your email</div>
11+
</div>
12+
</div>
13+
<div id="div_id_first_name" class="form-group has-error">
14+
<label for="id_first_name" class=" control-label requiredField"> first name<span class="asteriskField">*</span> </label>
15+
<div class=" controls">
16+
<div class="input-group">
17+
<span class="input-group-addon">blabla</span>
18+
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" aria-invalid="true"
19+
class="textinput textInput inputtext form-control" required id="id_first_name" />
20+
</div>
21+
22+
<span id="error_1_id_first_name" class="help-block"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
23+
</div>
24+
</div>
25+
<div id="div_id_last_name" class="form-group has-error">
26+
<label for="id_last_name" class=" control-label requiredField"> last name<span class="asteriskField">*</span> </label>
27+
<div class=" controls">
28+
<div class="input-group">
29+
<span class="input-group-addon">foo</span>
30+
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" aria-invalid="true"
31+
class="textinput textInput inputtext form-control" required id="id_last_name" />
32+
<span class="input-group-addon">bar</span>
33+
</div>
34+
<span id="error_1_id_last_name" class="help-block"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
35+
</div>
36+
</div>
37+
<div id="div_id_password1" class="form-group">
38+
<label for="id_password1" class=" control-label requiredField"> password<span class="asteriskField">*</span> </label>
39+
<div class=" controls">
40+
<div class="input-group"><input type="password" name="password1" maxlength="30" class="textInput textinput form-control" required id="id_password1" /> <span class="input-group-addon">whatever</span></div>
41+
</div>
42+
</div>
43+
<div id="div_id_password2" class="form-group">
44+
<label for="id_password2" class=" control-label requiredField"> re-enter password<span class="asteriskField">*</span> </label>
45+
<div class=" controls">
46+
<div class="input-group"><span class="input-group-addon">blabla</span> <input type="password" name="password2" maxlength="30" class="textInput textinput form-control" required id="id_password2" /></div>
47+
</div>
48+
</div>
49+
</form>

‎tests/results/bootstrap3/test_form_helper/test_form_show_errors_non_field_errors_false_gte50.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<form method="post">
2+
<div class="form-group">
3+
<div id="div_id_is_company" class="checkbox"> <label for="id_is_company" class=""> <input type="checkbox"
4+
name="is_company" class="checkboxinput" id="id_is_company"> company </label> </div>
5+
</div>
6+
<div id="div_id_email" class="form-group"> <label for="id_email" class="control-label requiredField"> email<span
7+
class="asteriskField">*</span> </label>
8+
<div class="controls "> <input type="text" name="email" maxlength="30"
9+
aria-describedby="id_email_helptext" aria-invalid="true"
10+
class="textinput textInput inputtext form-control" required id="id_email">
11+
<div id="hint_id_email" class="help-block">Insert your email</div>
12+
</div>
13+
</div>
14+
<div id="div_id_password1" class="form-group"> <label for="id_password1" class="control-label requiredField">
15+
password<span class="asteriskField">*</span> </label>
16+
<div class="controls "> <input type="password" name="password1" maxlength="30"
17+
class="textInput textinput form-control" required id="id_password1"> </div>
18+
</div>
19+
<div id="div_id_password2" class="form-group"> <label for="id_password2" class="control-label requiredField">
20+
re-enter password<span class="asteriskField">*</span> </label>
21+
<div class="controls "> <input type="password" name="password2" maxlength="30"
22+
class="textInput textinput form-control" required id="id_password2"> </div>
23+
</div>
24+
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class="control-label requiredField">
25+
first name<span class="asteriskField">*</span> </label>
26+
<div class="controls "> <input type="text" name="first_name" maxlength="5" aria-invalid="true"
27+
class="textinput textInput inputtext form-control" required id="id_first_name"> </div>
28+
</div>
29+
<div id="div_id_last_name" class="form-group"> <label for="id_last_name" class="control-label requiredField"> last
30+
name<span class="asteriskField">*</span> </label>
31+
<div class="controls "> <input type="text" name="last_name" maxlength="5" aria-invalid="true"
32+
class="textinput textInput inputtext form-control" required id="id_last_name"> </div>
33+
</div>
34+
<div id="div_id_datetime_field" class="form-group">
35+
<label class="control-label requiredField"> date time<span class="asteriskField">*</span> </label>
36+
<div class="controls "> <input type="text" name="datetime_field_0" class="dateinput" required aria-invalid="true"
37+
id="id_datetime_field_0"><input type="text" name="datetime_field_1" class="timeinput" required aria-invalid="true"
38+
id="id_datetime_field_1"> </div>
39+
</div>
40+
</form>

‎tests/results/bootstrap3/test_form_helper/test_form_show_errors_non_field_errors_true_gte50.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<form method="post">
2+
<div class="alert alert-block alert-danger">
3+
<ul>
4+
<li>Passwords dont match</li>
5+
</ul>
6+
</div>
7+
<div class="form-group">
8+
<div id="div_id_is_company" class="checkbox"> <label for="id_is_company" class=""> <input type="checkbox"
9+
name="is_company" class="checkboxinput" id="id_is_company"> company </label> </div>
10+
</div>
11+
<div id="div_id_email" class="form-group has-error"> <label for="id_email" class="control-label requiredField">
12+
email<span class="asteriskField">*</span> </label>
13+
<div class="controls "> <input type="text" name="email" maxlength="30"
14+
aria-describedby="id_email_helptext" aria-invalid="true"
15+
class="textinput textInput inputtext form-control" required id="id_email"> <span id="error_1_id_email"
16+
class="help-block"><strong>This field is required.</strong></span>
17+
<div id="hint_id_email" class="help-block">Insert your email</div>
18+
</div>
19+
</div>
20+
<div id="div_id_password1" class="form-group"> <label for="id_password1" class="control-label requiredField">
21+
password<span class="asteriskField">*</span> </label>
22+
<div class="controls "> <input type="password" name="password1" maxlength="30"
23+
class="textInput textinput form-control" required id="id_password1"> </div>
24+
</div>
25+
<div id="div_id_password2" class="form-group"> <label for="id_password2" class="control-label requiredField">
26+
re-enter password<span class="asteriskField">*</span> </label>
27+
<div class="controls "> <input type="password" name="password2" maxlength="30"
28+
class="textInput textinput form-control" required id="id_password2"> </div>
29+
</div>
30+
<div id="div_id_first_name" class="form-group has-error"> <label for="id_first_name"
31+
class="control-label requiredField"> first name<span class="asteriskField">*</span> </label>
32+
<div class="controls "> <input type="text" name="first_name" maxlength="5" aria-invalid="true"
33+
class="textinput textInput inputtext form-control" required id="id_first_name"> <span
34+
id="error_1_id_first_name" class="help-block"><strong>This field is required.</strong></span> </div>
35+
</div>
36+
<div id="div_id_last_name" class="form-group has-error"> <label for="id_last_name"
37+
class="control-label requiredField"> last name<span class="asteriskField">*</span> </label>
38+
<div class="controls "> <input type="text" name="last_name" maxlength="5" aria-invalid="true"
39+
class="textinput textInput inputtext form-control" required id="id_last_name"> <span
40+
id="error_1_id_last_name" class="help-block"><strong>This field is required.</strong></span> </div>
41+
</div>
42+
<div id="div_id_datetime_field" class="form-group has-error">
43+
<label class="control-label requiredField"> date time<span class="asteriskField">*</span> </label>
44+
<div class="controls "> <input type="text" name="datetime_field_0" class="dateinput" required aria-invalid="true"
45+
id="id_datetime_field_0"><input type="text" name="datetime_field_1" class="timeinput" required aria-invalid="true"
46+
id="id_datetime_field_1"> <span id="error_1_id_datetime_field" class="help-block"><strong>This field is
47+
required.</strong></span> </div>
48+
</div>
49+
</form>

‎tests/results/bootstrap3/test_layout/test_layout_composition_gte50.html‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<form method="post">
2+
<div id="multifield_info" class="ctrlHolder">
3+
<div class="alert alert-danger" role="alert"> </div>
4+
<p class="blockLabel">Some company data</p>
5+
<div class="multiField">
6+
<div class="checkbox"> <label for="id_is_company" class="blockLabel"> <input type="checkbox"
7+
name="is_company" class="checkboxinput" id="id_is_company"> company </label> </div>
8+
<div class="form-group "> <label class="control-label" for="id_email" class="blockLabel"> email </label>
9+
<input type="text" name="email" maxlength="30" class="textinput textInput" required
10+
aria-describedby="id_email_helptext"
11+
id="id_email"> <span id="help_id_email" class="help-block">Insert your email</span> </div>
12+
</div>
13+
</div>
14+
<div id="column_name" class="formColumn columns">
15+
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class="control-label requiredField">
16+
first name<span class="asteriskField">*</span> </label>
17+
<div class="controls "> <input type="text" name="first_name" maxlength="5"
18+
class="textinput textInput form-control" required id="id_first_name"> </div>
19+
</div>
20+
</div>
21+
<div class="buttonHolder"> <input type="submit" name="Save" value="Save" class="btn btn-primary button white"
22+
id="submit-id-save" /></div>
23+
<div id="custom-div" class="customdivs">
24+
<div id="div_id_password1" class="form-group"> <label for="id_password1" class="control-label requiredField">
25+
password<span class="asteriskField">*</span> </label>
26+
<div class="controls "> <input type="password" name="password1" maxlength="30"
27+
class="textInput textinput form-control" required id="id_password1"> </div>
28+
</div>
29+
<div id="div_id_password2" class="form-group"> <label for="id_password2" class="control-label requiredField">
30+
re-enter password<span class="asteriskField">*</span> </label>
31+
<div class="controls "> <input type="password" name="password2" maxlength="30"
32+
class="textInput textinput form-control" required id="id_password2"> </div>
33+
</div>
34+
</div>
35+
</form>

‎tests/results/bootstrap3/test_layout/test_second_layout_multifield_column_buttonholder_submit_div_gte50.html‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<form method="post">
2+
<div id="multifield_info" class="ctrlHolder" multifield-test="123" title="multifield_title">
3+
<div class="alert alert-danger" role="alert"> </div>
4+
<p class="blockLabel">Some company data</p>
5+
<div class="multiField">
6+
<div class="checkbox"> <label for="id_is_company" class="blockLabel"> <input type="checkbox"
7+
name="is_company" class="checkboxinput" id="id_is_company"> company </label> </div>
8+
<div class="form-group "> <label class="control-label" for="id_email" class="blockLabel"> email </label>
9+
<input type="text" name="email" maxlength="30" class="textinput textInput" required
10+
aria-describedby="id_email_helptext"
11+
id="id_email"> <span id="help_id_email" class="help-block">Insert your email</span> </div>
12+
</div>
13+
</div>
14+
<div id="column_name" class="formColumn columns">
15+
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class="control-label requiredField">
16+
first name<span class="asteriskField">*</span> </label>
17+
<div class="controls "> <input type="text" name="first_name" maxlength="5"
18+
class="textinput textInput form-control" required id="id_first_name"> </div>
19+
</div>
20+
<div id="div_id_last_name" class="form-group"> <label for="id_last_name" class="control-label requiredField">
21+
last name<span class="asteriskField">*</span> </label>
22+
<div class="controls "> <input type="text" name="last_name" maxlength="5"
23+
class="textinput textInput form-control" required id="id_last_name"> </div>
24+
</div>
25+
</div>
26+
<div class="buttonHolder"> <input type="submit" name="save-the-world" value="Save"
27+
class="btn btn-primary button white" id="submit-id-save-the-world" data-id="test" data-name="test" /><input
28+
type="submit" name="store" value="Store results" class="btn btn-primary" id="submit-id-store" /></div>
29+
<div id="custom-div" class="customdivs" test-markup="123">
30+
<div id="div_id_password1" class="form-group"> <label for="id_password1" class="control-label requiredField">
31+
password<span class="asteriskField">*</span> </label>
32+
<div class="controls "> <input type="password" name="password1" maxlength="30"
33+
class="textInput textinput form-control" required id="id_password1"> </div>
34+
</div>
35+
<div id="div_id_password2" class="form-group"> <label for="id_password2" class="control-label requiredField">
36+
re-enter password<span class="asteriskField">*</span> </label>
37+
<div class="controls "> <input type="password" name="password2" maxlength="30"
38+
class="textInput textinput form-control" required id="id_password2"> </div>
39+
</div>
40+
</div>
41+
</form>

‎tests/results/bootstrap3/test_layout_objects/test_prepended_appended_text_gte50.html‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<form method="post">
2+
<div id="div_id_email" class="form-group">
3+
<label for="id_email" class="control-label requiredField">
4+
email
5+
<span class="asteriskField">*</span>
6+
</label>
7+
<div class="controls ">
8+
<div class="input-group">
9+
<span class="input-group-addon active">@</span>
10+
<input type="text" name="email" maxlength="30" class="textinput textInput form-control custom-size-class"
11+
required id="id_email" aria-describedby="id_email_helptext">
12+
<span class="input-group-addon active">gmail.com</span>
13+
</div>
14+
<div id="hint_id_email" class="help-block">Insert your email</div>
15+
</div>
16+
</div>
17+
<div id="div_id_password1" class="form-group">
18+
<label for="id_password1" class="control-label requiredField">
19+
password<span class="asteriskField">*</span> </label>
20+
<div class="controls ">
21+
<div class="input-group">
22+
<input type="password" name="password1" maxlength="30" class="textInput textinput form-control input-lg" required id="id_password1">
23+
<span class="input-lg input-group-addon">#</span>
24+
</div>
25+
</div>
26+
</div>
27+
<div id="div_id_password2" class="form-group">
28+
<label for="id_password2" class="control-label requiredField">
29+
re-enter password<span class="asteriskField">*</span> </label>
30+
<div class="controls ">
31+
<div class="input-group">
32+
<span class="input-sm input-group-addon">$</span>
33+
<input type="password" name="password2" maxlength="30" class="input-sm textInput textinput form-control" required id="id_password2">
34+
</div>
35+
</div>
36+
</div>
37+
</form>

0 commit comments

Comments
 (0)