From 47d238b69602711c06c369a5555bb554a4b3f7fb Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 20 Jan 2018 08:19:06 -0800
Subject: Fixed #29041 -- Changed SelectMultiple's multiple attribute to HTML5
 boolean syntax.

---
 .../forms_tests/field_tests/test_multivaluefield.py  |  4 ++--
 tests/forms_tests/tests/test_forms.py                | 18 +++++++++---------
 tests/forms_tests/tests/tests.py                     |  8 ++++----
 tests/forms_tests/widget_tests/test_multiwidget.py   |  2 +-
 .../forms_tests/widget_tests/test_selectmultiple.py  | 20 ++++++++++----------
 5 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'tests/forms_tests')

diff --git a/tests/forms_tests/field_tests/test_multivaluefield.py b/tests/forms_tests/field_tests/test_multivaluefield.py
index cd446d07ce..edb32957e3 100644
--- a/tests/forms_tests/field_tests/test_multivaluefield.py
+++ b/tests/forms_tests/field_tests/test_multivaluefield.py
@@ -129,7 +129,7 @@ class MultiValueFieldTest(SimpleTestCase):
             """
             <tr><th><label for="id_field1_0">Field1:</label></th>
             <td><input type="text" name="field1_0" id="id_field1_0" required />
-            <select multiple="multiple" name="field1_1" id="id_field1_1" required>
+            <select multiple name="field1_1" id="id_field1_1" required>
             <option value="J">John</option>
             <option value="P">Paul</option>
             <option value="G">George</option>
@@ -152,7 +152,7 @@ class MultiValueFieldTest(SimpleTestCase):
             """
             <tr><th><label for="id_field1_0">Field1:</label></th>
             <td><input type="text" name="field1_0" value="some text" id="id_field1_0" required />
-            <select multiple="multiple" name="field1_1" id="id_field1_1" required>
+            <select multiple name="field1_1" id="id_field1_1" required>
             <option value="J" selected>John</option>
             <option value="P" selected>Paul</option>
             <option value="G">George</option>
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index a6b157f044..4ec21f869e 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -760,7 +760,7 @@ Java</label></li>
             composers = MultipleChoiceField()
 
         f = SongForm(auto_id=False)
-        self.assertHTMLEqual(str(f['composers']), """<select multiple="multiple" name="composers" required>
+        self.assertHTMLEqual(str(f['composers']), """<select multiple name="composers" required>
 </select>""")
 
         class SongForm(Form):
@@ -768,13 +768,13 @@ Java</label></li>
             composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')])
 
         f = SongForm(auto_id=False)
-        self.assertHTMLEqual(str(f['composers']), """<select multiple="multiple" name="composers" required>
+        self.assertHTMLEqual(str(f['composers']), """<select multiple name="composers" required>
 <option value="J">John Lennon</option>
 <option value="P">Paul McCartney</option>
 </select>""")
         f = SongForm({'name': 'Yesterday', 'composers': ['P']}, auto_id=False)
         self.assertHTMLEqual(str(f['name']), '<input type="text" name="name" value="Yesterday" required />')
-        self.assertHTMLEqual(str(f['composers']), """<select multiple="multiple" name="composers" required>
+        self.assertHTMLEqual(str(f['composers']), """<select multiple name="composers" required>
 <option value="J">John Lennon</option>
 <option value="P" selected>Paul McCartney</option>
 </select>""")
@@ -1865,7 +1865,7 @@ Password: <input type="password" name="password" required /></li>"""
             p.as_ul(),
             """<li>Username: <input type="text" name="username" value="django" maxlength="10" required /></li>
 <li>Password: <input type="password" name="password" required /></li>
-<li>Options: <select multiple="multiple" name="options" required>
+<li>Options: <select multiple name="options" required>
 <option value="f" selected>foo</option>
 <option value="b" selected>bar</option>
 <option value="w">whiz</option>
@@ -1881,7 +1881,7 @@ Username: <input type="text" name="username" maxlength="10" required /></li>
 <li><ul class="errorlist"><li>This field is required.</li></ul>
 Password: <input type="password" name="password" required /></li>
 <li><ul class="errorlist"><li>This field is required.</li></ul>
-Options: <select multiple="multiple" name="options" required>
+Options: <select multiple name="options" required>
 <option value="f">foo</option>
 <option value="b">bar</option>
 <option value="w">whiz</option>
@@ -1895,7 +1895,7 @@ Options: <select multiple="multiple" name="options" required>
 <li><ul class="errorlist"><li>This field is required.</li></ul>
 Password: <input type="password" name="password" required /></li>
 <li><ul class="errorlist"><li>This field is required.</li></ul>
-Options: <select multiple="multiple" name="options" required>
+Options: <select multiple name="options" required>
 <option value="f">foo</option>
 <option value="b">bar</option>
 <option value="w">whiz</option>
@@ -1909,7 +1909,7 @@ Options: <select multiple="multiple" name="options" required>
             """<li>Username: <input type="text" name="username" value="foo" maxlength="10" required /></li>
 <li><ul class="errorlist"><li>This field is required.</li></ul>
 Password: <input type="password" name="password" required /></li>
-<li>Options: <select multiple="multiple" name="options" required>
+<li>Options: <select multiple name="options" required>
 <option value="f" selected>foo</option>
 <option value="b" selected>bar</option>
 <option value="w">whiz</option>
@@ -1938,7 +1938,7 @@ Password: <input type="password" name="password" required /></li>
             p.as_ul(),
             """<li>Username: <input type="text" name="username" value="django" maxlength="10" required /></li>
 <li>Password: <input type="password" name="password" required /></li>
-<li>Options: <select multiple="multiple" name="options" required>
+<li>Options: <select multiple name="options" required>
 <option value="f">foo</option>
 <option value="b" selected>bar</option>
 <option value="w" selected>whiz</option>
@@ -1949,7 +1949,7 @@ Password: <input type="password" name="password" required /></li>
             p.as_ul(),
             """<li>Username: <input type="text" name="username" value="stephane" maxlength="10" required /></li>
 <li>Password: <input type="password" name="password" required /></li>
-<li>Options: <select multiple="multiple" name="options" required>
+<li>Options: <select multiple name="options" required>
 <option value="f" selected>foo</option>
 <option value="b" selected>bar</option>
 <option value="w">whiz</option>
diff --git a/tests/forms_tests/tests/tests.py b/tests/forms_tests/tests/tests.py
index a54ad09c26..bf0d588f53 100644
--- a/tests/forms_tests/tests/tests.py
+++ b/tests/forms_tests/tests/tests.py
@@ -116,13 +116,13 @@ class ModelFormCallableModelDefault(TestCase):
 <option value="3">ChoiceOption 3</option>
 </select><input type="hidden" name="initial-choice_int" value="1" id="initial-id_choice_int" /></p>
 <p><label for="id_multi_choice">Multi choice:</label>
-<select multiple="multiple" name="multi_choice" id="id_multi_choice" required>
+<select multiple name="multi_choice" id="id_multi_choice" required>
 <option value="1" selected>ChoiceOption 1</option>
 <option value="2">ChoiceOption 2</option>
 <option value="3">ChoiceOption 3</option>
 </select><input type="hidden" name="initial-multi_choice" value="1" id="initial-id_multi_choice_0" /></p>
 <p><label for="id_multi_choice_int">Multi choice int:</label>
-<select multiple="multiple" name="multi_choice_int" id="id_multi_choice_int" required>
+<select multiple name="multi_choice_int" id="id_multi_choice_int" required>
 <option value="1" selected>ChoiceOption 1</option>
 <option value="2">ChoiceOption 2</option>
 <option value="3">ChoiceOption 3</option>
@@ -152,14 +152,14 @@ class ModelFormCallableModelDefault(TestCase):
 <option value="3">ChoiceOption 3</option>
 </select><input type="hidden" name="initial-choice_int" value="2" id="initial-id_choice_int" /></p>
 <p><label for="id_multi_choice">Multi choice:</label>
-<select multiple="multiple" name="multi_choice" id="id_multi_choice" required>
+<select multiple name="multi_choice" id="id_multi_choice" required>
 <option value="1">ChoiceOption 1</option>
 <option value="2" selected>ChoiceOption 2</option>
 <option value="3" selected>ChoiceOption 3</option>
 </select><input type="hidden" name="initial-multi_choice" value="2" id="initial-id_multi_choice_0" />
 <input type="hidden" name="initial-multi_choice" value="3" id="initial-id_multi_choice_1" /></p>
 <p><label for="id_multi_choice_int">Multi choice int:</label>
-<select multiple="multiple" name="multi_choice_int" id="id_multi_choice_int" required>
+<select multiple name="multi_choice_int" id="id_multi_choice_int" required>
 <option value="1">ChoiceOption 1</option>
 <option value="2" selected>ChoiceOption 2</option>
 <option value="3" selected>ChoiceOption 3</option>
diff --git a/tests/forms_tests/widget_tests/test_multiwidget.py b/tests/forms_tests/widget_tests/test_multiwidget.py
index f452ad2ad3..bce806231d 100644
--- a/tests/forms_tests/widget_tests/test_multiwidget.py
+++ b/tests/forms_tests/widget_tests/test_multiwidget.py
@@ -155,7 +155,7 @@ class MultiWidgetTest(WidgetTest):
         self.check_html(widget, 'name', 'some text,JP,2007-04-25 06:24:00', html=(
             """
             <input type="text" name="name_0" value="some text" />
-            <select multiple="multiple" name="name_1">
+            <select multiple name="name_1">
                 <option value="J" selected>John</option>
                 <option value="P" selected>Paul</option>
                 <option value="G">George</option>
diff --git a/tests/forms_tests/widget_tests/test_selectmultiple.py b/tests/forms_tests/widget_tests/test_selectmultiple.py
index 149fae6d4b..08606a18c4 100644
--- a/tests/forms_tests/widget_tests/test_selectmultiple.py
+++ b/tests/forms_tests/widget_tests/test_selectmultiple.py
@@ -15,7 +15,7 @@ class SelectMultipleTest(WidgetTest):
 
     def test_render_selected(self):
         self.check_html(self.widget(choices=self.beatles), 'beatles', ['J'], html=(
-            """<select multiple="multiple" name="beatles">
+            """<select multiple name="beatles">
             <option value="J" selected>John</option>
             <option value="P">Paul</option>
             <option value="G">George</option>
@@ -25,7 +25,7 @@ class SelectMultipleTest(WidgetTest):
 
     def test_render_multiple_selected(self):
         self.check_html(self.widget(choices=self.beatles), 'beatles', ['J', 'P'], html=(
-            """<select multiple="multiple" name="beatles">
+            """<select multiple name="beatles">
             <option value="J" selected>John</option>
             <option value="P" selected>Paul</option>
             <option value="G">George</option>
@@ -38,7 +38,7 @@ class SelectMultipleTest(WidgetTest):
         If the value is None, none of the options are selected.
         """
         self.check_html(self.widget(choices=self.beatles), 'beatles', None, html=(
-            """<select multiple="multiple" name="beatles">
+            """<select multiple name="beatles">
             <option value="J">John</option>
             <option value="P">Paul</option>
             <option value="G">George</option>
@@ -52,7 +52,7 @@ class SelectMultipleTest(WidgetTest):
         of the options are selected.
         """
         self.check_html(self.widget(choices=self.beatles), 'beatles', ['John'], html=(
-            """<select multiple="multiple" name="beatles">
+            """<select multiple name="beatles">
             <option value="J">John</option>
             <option value="P">Paul</option>
             <option value="G">George</option>
@@ -65,7 +65,7 @@ class SelectMultipleTest(WidgetTest):
         Multiple options with the same value can be selected (#8103).
         """
         self.check_html(self.widget(choices=self.numeric_choices), 'choices', ['0'], html=(
-            """<select multiple="multiple" name="choices">
+            """<select multiple name="choices">
             <option value="0" selected>0</option>
             <option value="1">1</option>
             <option value="2">2</option>
@@ -80,7 +80,7 @@ class SelectMultipleTest(WidgetTest):
         ones are selected.
         """
         self.check_html(self.widget(choices=self.beatles), 'beatles', ['J', 'G', 'foo'], html=(
-            """<select multiple="multiple" name="beatles">
+            """<select multiple name="beatles">
             <option value="J" selected>John</option>
             <option value="P">Paul</option>
             <option value="G" selected>George</option>
@@ -92,7 +92,7 @@ class SelectMultipleTest(WidgetTest):
         choices = [('1', '1'), ('2', '2'), ('3', '3')]
 
         self.check_html(self.widget(choices=choices), 'nums', [2], html=(
-            """<select multiple="multiple" name="nums">
+            """<select multiple name="nums">
             <option value="1">1</option>
             <option value="2" selected>2</option>
             <option value="3">3</option>
@@ -100,7 +100,7 @@ class SelectMultipleTest(WidgetTest):
         ))
 
         self.check_html(self.widget(choices=choices), 'nums', ['2'], html=(
-            """<select multiple="multiple" name="nums">
+            """<select multiple name="nums">
             <option value="1">1</option>
             <option value="2" selected>2</option>
             <option value="3">3</option>
@@ -108,7 +108,7 @@ class SelectMultipleTest(WidgetTest):
         ))
 
         self.check_html(self.widget(choices=choices), 'nums', [2], html=(
-            """<select multiple="multiple" name="nums">
+            """<select multiple name="nums">
             <option value="1">1</option>
             <option value="2" selected>2</option>
             <option value="3">3</option>
@@ -121,7 +121,7 @@ class SelectMultipleTest(WidgetTest):
             ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2'))),
         ))
         self.check_html(widget, 'nestchoice', ['outer1', 'inner2'], html=(
-            """<select multiple="multiple" name="nestchoice">
+            """<select multiple name="nestchoice">
             <option value="outer1" selected>Outer 1</option>
             <optgroup label="Group &quot;1&quot;">
             <option value="inner1">Inner 1</option>
-- 
cgit v1.3