Skip to content

Commit

Permalink
D5 versions matrix (#7)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@powderflask
powderflask authored Jan 9, 2024
1 parent 4ca9ae5 commit ffa7878
Show file tree
Hide file tree
Showing 13 changed files with 375 additions and 25 deletions.
1 change: 0 additions & 1 deletion .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
strategy:
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
- '3.10'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
strategy:
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
- '3.10'
Expand Down
45 changes: 45 additions & 0 deletions tests/results/bootstrap3/test_form_helper/bootstrap_form_show_errors_bs3_false_gte50.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<form method="post">
<div id="div_id_email" class="form-group">
<label for="id_email" class=" control-label requiredField"> email<span class="asteriskField">*</span> </label>
<div class=" controls">
<div class="input-group"><input type="text" name="email" value="invalidemail" maxlength="30"
aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_email" />
<span class="input-group-addon">whatever</span></div>
<div id="hint_id_email" class="help-block">Insert your email</div>
</div>
</div>
<div id="div_id_first_name" class="form-group">
<label for="id_first_name" class=" control-label requiredField"> first name<span class="asteriskField">*</span> </label>
<div class=" controls">
<div class="input-group">
<span class="input-group-addon">blabla</span>
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_first_name" />
</div>
</div>
</div>
<div id="div_id_last_name" class="form-group">
<label for="id_last_name" class=" control-label requiredField"> last name<span class="asteriskField">*</span> </label>
<div class=" controls">
<div class="input-group">
<span class="input-group-addon">foo</span>
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_last_name" />
<span class="input-group-addon">bar</span>
</div>
</div>
</div>
<div id="div_id_password1" class="form-group">
<label for="id_password1" class=" control-label requiredField"> password<span class="asteriskField">*</span> </label>
<div class=" controls">
<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>
</div>
</div>
<div id="div_id_password2" class="form-group">
<label for="id_password2" class=" control-label requiredField"> re-enter password<span class="asteriskField">*</span> </label>
<div class=" controls">
<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>
</div>
</div>
</form>
49 changes: 49 additions & 0 deletions tests/results/bootstrap3/test_form_helper/bootstrap_form_show_errors_bs3_true_gte50.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<form method="post">
<div id="div_id_email" class="form-group has-error">
<label for="id_email" class=" control-label requiredField"> email<span class="asteriskField">*</span> </label>
<div class=" controls">
<div class="input-group"><input type="text" name="email" value="invalidemail" maxlength="30"
aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_email" />
<span class="input-group-addon">whatever</span></div>
<span id="error_1_id_email" class="help-block"><strong>Enter a valid email address.</strong></span>
<div id="hint_id_email" class="help-block">Insert your email</div>
</div>
</div>
<div id="div_id_first_name" class="form-group has-error">
<label for="id_first_name" class=" control-label requiredField"> first name<span class="asteriskField">*</span> </label>
<div class=" controls">
<div class="input-group">
<span class="input-group-addon">blabla</span>
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_first_name" />
</div>

<span id="error_1_id_first_name" class="help-block"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
</div>
</div>
<div id="div_id_last_name" class="form-group has-error">
<label for="id_last_name" class=" control-label requiredField"> last name<span class="asteriskField">*</span> </label>
<div class=" controls">
<div class="input-group">
<span class="input-group-addon">foo</span>
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_last_name" />
<span class="input-group-addon">bar</span>
</div>
<span id="error_1_id_last_name" class="help-block"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
</div>
</div>
<div id="div_id_password1" class="form-group">
<label for="id_password1" class=" control-label requiredField"> password<span class="asteriskField">*</span> </label>
<div class=" controls">
<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>
</div>
</div>
<div id="div_id_password2" class="form-group">
<label for="id_password2" class=" control-label requiredField"> re-enter password<span class="asteriskField">*</span> </label>
<div class=" controls">
<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>
</div>
</div>
</form>
40 changes: 40 additions & 0 deletions ...sults/bootstrap3/test_form_helper/test_form_show_errors_non_field_errors_false_gte50.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<form method="post">
<div class="form-group">
<div id="div_id_is_company" class="checkbox"> <label for="id_is_company" class=""> <input type="checkbox"
name="is_company" class="checkboxinput" id="id_is_company"> company </label> </div>
</div>
<div id="div_id_email" class="form-group"> <label for="id_email" class="control-label requiredField"> email<span
class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="email" maxlength="30"
aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_email">
<div id="hint_id_email" class="help-block">Insert your email</div>
</div>
</div>
<div id="div_id_password1" class="form-group"> <label for="id_password1" class="control-label requiredField">
password<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="password" name="password1" maxlength="30"
class="textInput textinput form-control" required id="id_password1"> </div>
</div>
<div id="div_id_password2" class="form-group"> <label for="id_password2" class="control-label requiredField">
re-enter password<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="password" name="password2" maxlength="30"
class="textInput textinput form-control" required id="id_password2"> </div>
</div>
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class="control-label requiredField">
first name<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="first_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_first_name"> </div>
</div>
<div id="div_id_last_name" class="form-group"> <label for="id_last_name" class="control-label requiredField"> last
name<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="last_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_last_name"> </div>
</div>
<div id="div_id_datetime_field" class="form-group">
<label class="control-label requiredField"> date time<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="datetime_field_0" class="dateinput" required aria-invalid="true"
id="id_datetime_field_0"><input type="text" name="datetime_field_1" class="timeinput" required aria-invalid="true"
id="id_datetime_field_1"> </div>
</div>
</form>
49 changes: 49 additions & 0 deletions ...esults/bootstrap3/test_form_helper/test_form_show_errors_non_field_errors_true_gte50.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<form method="post">
<div class="alert alert-block alert-danger">
<ul>
<li>Passwords dont match</li>
</ul>
</div>
<div class="form-group">
<div id="div_id_is_company" class="checkbox"> <label for="id_is_company" class=""> <input type="checkbox"
name="is_company" class="checkboxinput" id="id_is_company"> company </label> </div>
</div>
<div id="div_id_email" class="form-group has-error"> <label for="id_email" class="control-label requiredField">
email<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="email" maxlength="30"
aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_email"> <span id="error_1_id_email"
class="help-block"><strong>This field is required.</strong></span>
<div id="hint_id_email" class="help-block">Insert your email</div>
</div>
</div>
<div id="div_id_password1" class="form-group"> <label for="id_password1" class="control-label requiredField">
password<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="password" name="password1" maxlength="30"
class="textInput textinput form-control" required id="id_password1"> </div>
</div>
<div id="div_id_password2" class="form-group"> <label for="id_password2" class="control-label requiredField">
re-enter password<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="password" name="password2" maxlength="30"
class="textInput textinput form-control" required id="id_password2"> </div>
</div>
<div id="div_id_first_name" class="form-group has-error"> <label for="id_first_name"
class="control-label requiredField"> first name<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="first_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_first_name"> <span
id="error_1_id_first_name" class="help-block"><strong>This field is required.</strong></span> </div>
</div>
<div id="div_id_last_name" class="form-group has-error"> <label for="id_last_name"
class="control-label requiredField"> last name<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="last_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control" required id="id_last_name"> <span
id="error_1_id_last_name" class="help-block"><strong>This field is required.</strong></span> </div>
</div>
<div id="div_id_datetime_field" class="form-group has-error">
<label class="control-label requiredField"> date time<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="datetime_field_0" class="dateinput" required aria-invalid="true"
id="id_datetime_field_0"><input type="text" name="datetime_field_1" class="timeinput" required aria-invalid="true"
id="id_datetime_field_1"> <span id="error_1_id_datetime_field" class="help-block"><strong>This field is
required.</strong></span> </div>
</div>
</form>
35 changes: 35 additions & 0 deletions tests/results/bootstrap3/test_layout/test_layout_composition_gte50.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<form method="post">
<div id="multifield_info" class="ctrlHolder">
<div class="alert alert-danger" role="alert"> </div>
<p class="blockLabel">Some company data</p>
<div class="multiField">
<div class="checkbox"> <label for="id_is_company" class="blockLabel"> <input type="checkbox"
name="is_company" class="checkboxinput" id="id_is_company"> company </label> </div>
<div class="form-group "> <label class="control-label" for="id_email" class="blockLabel"> email </label>
<input type="text" name="email" maxlength="30" class="textinput textInput" required
aria-describedby="id_email_helptext"
id="id_email"> <span id="help_id_email" class="help-block">Insert your email</span> </div>
</div>
</div>
<div id="column_name" class="formColumn columns">
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class="control-label requiredField">
first name<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="first_name" maxlength="5"
class="textinput textInput form-control" required id="id_first_name"> </div>
</div>
</div>
<div class="buttonHolder"> <input type="submit" name="Save" value="Save" class="btn btn-primary button white"
id="submit-id-save" /></div>
<div id="custom-div" class="customdivs">
<div id="div_id_password1" class="form-group"> <label for="id_password1" class="control-label requiredField">
password<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="password" name="password1" maxlength="30"
class="textInput textinput form-control" required id="id_password1"> </div>
</div>
<div id="div_id_password2" class="form-group"> <label for="id_password2" class="control-label requiredField">
re-enter password<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="password" name="password2" maxlength="30"
class="textInput textinput form-control" required id="id_password2"> </div>
</div>
</div>
</form>
41 changes: 41 additions & 0 deletions ...trap3/test_layout/test_second_layout_multifield_column_buttonholder_submit_div_gte50.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<form method="post">
<div id="multifield_info" class="ctrlHolder" multifield-test="123" title="multifield_title">
<div class="alert alert-danger" role="alert"> </div>
<p class="blockLabel">Some company data</p>
<div class="multiField">
<div class="checkbox"> <label for="id_is_company" class="blockLabel"> <input type="checkbox"
name="is_company" class="checkboxinput" id="id_is_company"> company </label> </div>
<div class="form-group "> <label class="control-label" for="id_email" class="blockLabel"> email </label>
<input type="text" name="email" maxlength="30" class="textinput textInput" required
aria-describedby="id_email_helptext"
id="id_email"> <span id="help_id_email" class="help-block">Insert your email</span> </div>
</div>
</div>
<div id="column_name" class="formColumn columns">
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class="control-label requiredField">
first name<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="first_name" maxlength="5"
class="textinput textInput form-control" required id="id_first_name"> </div>
</div>
<div id="div_id_last_name" class="form-group"> <label for="id_last_name" class="control-label requiredField">
last name<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="text" name="last_name" maxlength="5"
class="textinput textInput form-control" required id="id_last_name"> </div>
</div>
</div>
<div class="buttonHolder"> <input type="submit" name="save-the-world" value="Save"
class="btn btn-primary button white" id="submit-id-save-the-world" data-id="test" data-name="test" /><input
type="submit" name="store" value="Store results" class="btn btn-primary" id="submit-id-store" /></div>
<div id="custom-div" class="customdivs" test-markup="123">
<div id="div_id_password1" class="form-group"> <label for="id_password1" class="control-label requiredField">
password<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="password" name="password1" maxlength="30"
class="textInput textinput form-control" required id="id_password1"> </div>
</div>
<div id="div_id_password2" class="form-group"> <label for="id_password2" class="control-label requiredField">
re-enter password<span class="asteriskField">*</span> </label>
<div class="controls "> <input type="password" name="password2" maxlength="30"
class="textInput textinput form-control" required id="id_password2"> </div>
</div>
</div>
</form>
37 changes: 37 additions & 0 deletions tests/results/bootstrap3/test_layout_objects/test_prepended_appended_text_gte50.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<form method="post">
<div id="div_id_email" class="form-group">
<label for="id_email" class="control-label requiredField">
email
<span class="asteriskField">*</span>
</label>
<div class="controls ">
<div class="input-group">
<span class="input-group-addon active">@</span>
<input type="text" name="email" maxlength="30" class="textinput textInput form-control custom-size-class"
required id="id_email" aria-describedby="id_email_helptext">
<span class="input-group-addon active">gmail.com</span>
</div>
<div id="hint_id_email" class="help-block">Insert your email</div>
</div>
</div>
<div id="div_id_password1" class="form-group">
<label for="id_password1" class="control-label requiredField">
password<span class="asteriskField">*</span> </label>
<div class="controls ">
<div class="input-group">
<input type="password" name="password1" maxlength="30" class="textInput textinput form-control input-lg" required id="id_password1">
<span class="input-lg input-group-addon">#</span>
</div>
</div>
</div>
<div id="div_id_password2" class="form-group">
<label for="id_password2" class="control-label requiredField">
re-enter password<span class="asteriskField">*</span> </label>
<div class="controls ">
<div class="input-group">
<span class="input-sm input-group-addon">$</span>
<input type="password" name="password2" maxlength="30" class="input-sm textInput textinput form-control" required id="id_password2">
</div>
</div>
</div>
</form>
Loading

0 comments on commit ffa7878

Please sign in to comment.