Dear maintainer,
as suggested in the tests Tracebacks, one simple way to fix the tests is
to create another pair of fixture html files, with the tag "required"
removied from the choice fields. Otherwise they're the same as for
Django 1.10.
Find a proposed patch attached; just let me mention I'm new to Django.
Maybe there's a more elegant fix.
Best,
Johannes
>From 14569b763dcfa2b48e33937ec73aeb275c40726b Mon Sep 17 00:00:00 2001
From: Johannes Keyser <johanneskey...@posteo.de>
Date: Sun, 9 Jul 2017 19:47:00 +0200
Subject: [PATCH] Fixed fixture html files for Django 1.11.3 (Closes:
#865938).
---
bootstrapform/fixtures/basic_dj111.html | 99 ++++++++++++++++++++++++++
bootstrapform/fixtures/horizontal_dj111.html | 102 +++++++++++++++++++++++++++
bootstrapform/tests.py | 9 ++-
3 files changed, 207 insertions(+), 3 deletions(-)
create mode 100644 bootstrapform/fixtures/basic_dj111.html
create mode 100644 bootstrapform/fixtures/horizontal_dj111.html
diff --git a/bootstrapform/fixtures/basic_dj111.html b/bootstrapform/fixtures/basic_dj111.html
new file mode 100644
index 0000000..87c4948
--- /dev/null
+++ b/bootstrapform/fixtures/basic_dj111.html
@@ -0,0 +1,99 @@
+<div class="form-group">
+ <label class="control-label " for="id_char_field">Char field</label>
+ <div class=" ">
+ <input class=" form-control" id="id_char_field" name="char_field" required type="text" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_choice_field">Choice field</label>
+ <div class=" ">
+ <select class=" form-control" id="id_choice_field" name="choice_field">
+ <option value="0">Zero</option>
+ <option value="1">One</option>
+ <option value="2">Two</option>
+ </select>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label ">Radio choice</label>
+ <div class="">
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_0" name="radio_choice" required type="radio" value="0" />
+ Zero
+ </label>
+ </div>
+
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_1" name="radio_choice" required type="radio" value="1" />
+ One
+ </label>
+ </div>
+
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_2" name="radio_choice" required type="radio" value="2" />
+ Two
+ </label>
+ </div>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_multiple_choice">Multiple choice</label>
+ <div class=" ">
+ <select multiple="multiple" class=" form-control" id="id_multiple_choice" name="multiple_choice" required>
+ <option value="0">Zero</option>
+ <option value="1">One</option>
+ <option value="2">Two</option>
+ </select>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_multiple_checkbox">Multiple checkbox</label>
+ <div class=" multiple-checkbox">
+ <ul id="id_multiple_checkbox">
+ <li><label for="id_multiple_checkbox_0"><input id="id_multiple_checkbox_0" name="multiple_checkbox" type="checkbox" value="0" /> Zero</label></li>
+ <li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" type="checkbox" value="1" /> One</label></li>
+ <li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" type="checkbox" value="2" /> Two</label></li>
+ </ul>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_file_fied">File fied</label>
+
+ <div class=" ">
+ <input id="id_file_fied" name="file_fied" required type="file" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_password_field">Password field</label>
+
+ <div class=" ">
+ <input class=" form-control" id="id_password_field" name="password_field" required type="password" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_textarea">Textarea</label>
+ <div class=" ">
+ <textarea class=" form-control" cols="40" id="id_textarea" name="textarea" required rows="10">
+ </textarea>
+ </div>
+</div>
+
+<div class="form-group">
+ <div class="">
+ <div class="checkbox">
+ <label >
+ <input id="id_boolean_field" name="boolean_field" required type="checkbox" /> <span>Boolean field</span>
+ </label>
+ </div>
+ </div>
+</div>
diff --git a/bootstrapform/fixtures/horizontal_dj111.html b/bootstrapform/fixtures/horizontal_dj111.html
new file mode 100644
index 0000000..038bfe1
--- /dev/null
+++ b/bootstrapform/fixtures/horizontal_dj111.html
@@ -0,0 +1,102 @@
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_char_field">Char field</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <input class=" form-control" id="id_char_field" name="char_field" required type="text" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_choice_field">Choice field</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <select class=" form-control" id="id_choice_field" name="choice_field">
+ <option value="0">Zero</option>
+ <option value="1">One</option>
+ <option value="2">Two</option>
+ </select>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 ">Radio choice</label>
+
+ <div class=" col-sm-10 col-lg-10">
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_0" name="radio_choice" required type="radio" value="0" />
+ Zero
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_1" name="radio_choice" required type="radio" value="1" />
+ One
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_2" name="radio_choice" required type="radio" value="2" />
+ Two
+ </label>
+ </div>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_multiple_choice">Multiple choice</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <select multiple="multiple" class=" form-control" id="id_multiple_choice" name="multiple_choice" required>
+ <option value="0">Zero</option>
+ <option value="1">One</option>
+ <option value="2">Two</option>
+ </select>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_multiple_checkbox">Multiple checkbox</label>
+ <div class=" col-sm-10 col-lg-10 multiple-checkbox">
+ <ul id="id_multiple_checkbox">
+ <li><label for="id_multiple_checkbox_0"><input id="id_multiple_checkbox_0" name="multiple_checkbox" type="checkbox" value="0" /> Zero</label></li>
+ <li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" type="checkbox" value="1" /> One</label></li>
+ <li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" type="checkbox" value="2" /> Two</label></li>
+ </ul>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_file_fied">File fied</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <input id="id_file_fied" name="file_fied" required type="file" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_password_field">Password field</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <input class=" form-control" id="id_password_field" name="password_field" required type="password" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_textarea">Textarea</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <textarea class=" form-control" cols="40" id="id_textarea" name="textarea" required rows="10">
+ </textarea>
+ </div>
+</div>
+
+<div class="form-group">
+ <div class=" col-sm-offset-2 col-sm-10 col-lg-offset-2 col-lg-10">
+ <div class="checkbox">
+ <label >
+ <input id="id_boolean_field" name="boolean_field" required type="checkbox" /> <span>Boolean field</span>
+ </label>
+ </div>
+ </div>
+</div>
diff --git a/bootstrapform/tests.py b/bootstrapform/tests.py
index 571ac9e..458b810 100644
--- a/bootstrapform/tests.py
+++ b/bootstrapform/tests.py
@@ -42,8 +42,9 @@ class BootstrapTemplateTagTests(TestCase):
html = Template("{% load bootstrap %}{{ form|bootstrap }}").render(Context({'form': form}))
-
- if StrictVersion(django.get_version()) >= StrictVersion('1.10b1'):
+ if StrictVersion(django.get_version()) >= StrictVersion('1.11.3'):
+ fixture = 'basic_dj111.html'
+ elif StrictVersion(django.get_version()) >= StrictVersion('1.10b1'):
fixture = 'basic_dj110.html'
elif StrictVersion(django.get_version()) >= StrictVersion('1.7'):
fixture = 'basic.html'
@@ -63,7 +64,9 @@ class BootstrapTemplateTagTests(TestCase):
html = Template("{% load bootstrap %}{{ form|bootstrap_horizontal }}").render(Context({'form': form}))
- if StrictVersion(django.get_version()) >= StrictVersion('1.10b1'):
+ if StrictVersion(django.get_version()) >= StrictVersion('1.11.3'):
+ fixture = 'horizontal_dj111.html'
+ elif StrictVersion(django.get_version()) >= StrictVersion('1.10b1'):
fixture = 'horizontal_dj110.html'
elif StrictVersion(django.get_version()) >= StrictVersion('1.7'):
fixture = 'horizontal.html'
--
2.13.2
