From 50e299dbfbbfd796e63e7e13b4566cf69d2c4acb Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Thu, 21 Jul 2016 22:05:17 -0700
Subject: Fixed #26928 -- Changed forms' checked attribute to HTML5 boolean
 style.

---
 tests/forms_tests/tests/test_forms.py              | 16 ++++++++--------
 tests/forms_tests/tests/test_widgets.py            | 22 +++++++++++-----------
 .../forms_tests/widget_tests/test_checkboxinput.py | 14 +++++++-------
 .../widget_tests/test_checkboxselectmultiple.py    | 18 +++++++++---------
 tests/forms_tests/widget_tests/test_radioselect.py |  8 ++++----
 5 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'tests/forms_tests')

diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index a9c3c74b69..2da04a4ef4 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -423,19 +423,19 @@ class FormsTestCase(SimpleTestCase):
         self.assertHTMLEqual(str(f['email']), '<input type="email" name="email" value="test@example.com" required />')
         self.assertHTMLEqual(
             str(f['get_spam']),
-            '<input checked="checked" type="checkbox" name="get_spam" required />',
+            '<input checked type="checkbox" name="get_spam" required />',
         )
 
         # 'True' or 'true' should be rendered without a value attribute
         f = SignupForm({'email': 'test@example.com', 'get_spam': 'True'}, auto_id=False)
         self.assertHTMLEqual(
             str(f['get_spam']),
-            '<input checked="checked" type="checkbox" name="get_spam" required />',
+            '<input checked type="checkbox" name="get_spam" required />',
         )
 
         f = SignupForm({'email': 'test@example.com', 'get_spam': 'true'}, auto_id=False)
         self.assertHTMLEqual(
-            str(f['get_spam']), '<input checked="checked" type="checkbox" name="get_spam" required />')
+            str(f['get_spam']), '<input checked type="checkbox" name="get_spam" required />')
 
         # A value of 'False' or 'false' should be rendered unchecked
         f = SignupForm({'email': 'test@example.com', 'get_spam': 'False'}, auto_id=False)
@@ -808,20 +808,20 @@ Java</label></li>
 </ul>""")
         f = SongForm({'composers': ['J']}, auto_id=False)
         self.assertHTMLEqual(str(f['composers']), """<ul>
-<li><label><input checked="checked" type="checkbox" name="composers" value="J" /> John Lennon</label></li>
+<li><label><input checked type="checkbox" name="composers" value="J" /> John Lennon</label></li>
 <li><label><input type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
 </ul>""")
         f = SongForm({'composers': ['J', 'P']}, auto_id=False)
         self.assertHTMLEqual(str(f['composers']), """<ul>
-<li><label><input checked="checked" type="checkbox" name="composers" value="J" /> John Lennon</label></li>
-<li><label><input checked="checked" type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
+<li><label><input checked type="checkbox" name="composers" value="J" /> John Lennon</label></li>
+<li><label><input checked type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
 </ul>""")
         # Test iterating on individual checkboxes in a template
         t = Template('{% for checkbox in form.composers %}<div class="mycheckbox">{{ checkbox }}</div>{% endfor %}')
         self.assertHTMLEqual(t.render(Context({'form': f})), """<div class="mycheckbox"><label>
-<input checked="checked" name="composers" type="checkbox" value="J" /> John Lennon</label></div>
+<input checked name="composers" type="checkbox" value="J" /> John Lennon</label></div>
 <div class="mycheckbox"><label>
-<input checked="checked" name="composers" type="checkbox" value="P" /> Paul McCartney</label></div>""")
+<input checked name="composers" type="checkbox" value="P" /> Paul McCartney</label></div>""")
 
     def test_checkbox_auto_id(self):
         # Regarding auto_id, CheckboxSelectMultiple is a special case. Each checkbox
diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py
index 66d1cbd9b9..fadb786c3b 100644
--- a/tests/forms_tests/tests/test_widgets.py
+++ b/tests/forms_tests/tests/test_widgets.py
@@ -44,15 +44,15 @@ class FormsWidgetTests(SimpleTestCase):
                 )
             )
 
-        self.assertHTMLEqual('\n'.join(inp_set1), """<label><input checked="checked" type="radio" name="beatle" value="J" /> John</label>
+        self.assertHTMLEqual('\n'.join(inp_set1), """<label><input checked type="radio" name="beatle" value="J" /> John</label>
 <label><input type="radio" name="beatle" value="P" /> Paul</label>
 <label><input type="radio" name="beatle" value="G" /> George</label>
 <label><input type="radio" name="beatle" value="R" /> Ringo</label>""")
-        self.assertHTMLEqual('\n'.join(inp_set2), """<label><input checked="checked" type="radio" name="beatle" value="J" /> John</label><br />
+        self.assertHTMLEqual('\n'.join(inp_set2), """<label><input checked type="radio" name="beatle" value="J" /> John</label><br />
 <label><input type="radio" name="beatle" value="P" /> Paul</label><br />
 <label><input type="radio" name="beatle" value="G" /> George</label><br />
 <label><input type="radio" name="beatle" value="R" /> Ringo</label><br />""")
-        self.assertHTMLEqual('\n'.join(inp_set3), """<p><input checked="checked" type="radio" name="beatle" value="J" /> John</p>
+        self.assertHTMLEqual('\n'.join(inp_set3), """<p><input checked type="radio" name="beatle" value="J" /> John</p>
 <p><input type="radio" name="beatle" value="P" /> Paul</p>
 <p><input type="radio" name="beatle" value="G" /> George</p>
 <p><input type="radio" name="beatle" value="R" /> Ringo</p>""")
@@ -67,7 +67,7 @@ beatle J R Ringo False""")
         self.assertHTMLEqual(str(r[1]), '<label><input type="radio" name="beatle" value="P" /> Paul</label>')
         self.assertHTMLEqual(
             str(r[0]),
-            '<label><input checked="checked" type="radio" name="beatle" value="J" /> John</label>'
+            '<label><input checked type="radio" name="beatle" value="J" /> John</label>'
         )
         self.assertTrue(r[0].is_checked())
         self.assertFalse(r[1].is_checked())
@@ -91,7 +91,7 @@ beatle J R Ringo False""")
             w.render('beatle', 'G'),
             """<label><input type="radio" name="beatle" value="J" /> John</label><br />
 <label><input type="radio" name="beatle" value="P" /> Paul</label><br />
-<label><input checked="checked" type="radio" name="beatle" value="G" /> George</label><br />
+<label><input checked type="radio" name="beatle" value="G" /> George</label><br />
 <label><input type="radio" name="beatle" value="R" /> Ringo</label>"""
         )
 
@@ -103,7 +103,7 @@ beatle J R Ringo False""")
             w.render('beatle', 'G'),
             """<label><input type="radio" name="beatle" value="J" /> John</label><br />
 <label><input type="radio" name="beatle" value="P" /> Paul</label><br />
-<label><input checked="checked" type="radio" name="beatle" value="G" /> George</label><br />
+<label><input checked type="radio" name="beatle" value="G" /> George</label><br />
 <label><input type="radio" name="beatle" value="R" /> Ringo</label>"""
         )
 
@@ -118,7 +118,7 @@ beatle J R Ringo False""")
         self.assertHTMLEqual(
             output,
             """<div id="bar">
-<p><label for="bar_0"><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label></p>
+<p><label for="bar_0"><input checked type="radio" id="bar_0" value="J" name="beatle" /> John</label></p>
 <p><label for="bar_1"><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label></p>
 <p><label for="bar_2"><input type="radio" id="bar_2" value="G" name="beatle" /> George</label></p>
 <p><label for="bar_3"><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</label></p>
@@ -133,18 +133,18 @@ beatle J R Ringo False""")
                     choices=zip('abc', 'ABC')
                 ).subwidgets('letters', list('ac'))
             ),
-            """<input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" />
+            """<input checked type="checkbox" name="letters" value="a" id="abc_0" />
 <input type="checkbox" name="letters" value="b" id="abc_1" />
-<input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" />""")
+<input checked type="checkbox" name="letters" value="c" id="abc_2" />""")
 
         # Each subwidget tag does not get an ID if the widget does not have an ID specified
         self.assertHTMLEqual(
             "\n".join(c.tag() for c in CheckboxSelectMultiple(
                 choices=zip('abc', 'ABC'),
             ).subwidgets('letters', list('ac'))),
-            """<input checked="checked" type="checkbox" name="letters" value="a" />
+            """<input checked type="checkbox" name="letters" value="a" />
 <input type="checkbox" name="letters" value="b" />
-<input checked="checked" type="checkbox" name="letters" value="c" />""")
+<input checked type="checkbox" name="letters" value="c" />""")
 
         # The id_for_label property of the subwidget should return the ID that is used on the subwidget's tag
         self.assertHTMLEqual(
diff --git a/tests/forms_tests/widget_tests/test_checkboxinput.py b/tests/forms_tests/widget_tests/test_checkboxinput.py
index 77b03b9ea9..18ffd88d56 100644
--- a/tests/forms_tests/widget_tests/test_checkboxinput.py
+++ b/tests/forms_tests/widget_tests/test_checkboxinput.py
@@ -18,7 +18,7 @@ class CheckboxInputTest(WidgetTest):
     def test_render_true(self):
         self.check_html(
             self.widget, 'is_cool', True,
-            html='<input checked="checked" type="checkbox" name="is_cool" />'
+            html='<input checked type="checkbox" name="is_cool" />'
         )
 
     def test_render_value(self):
@@ -28,7 +28,7 @@ class CheckboxInputTest(WidgetTest):
         """
         self.check_html(
             self.widget, 'is_cool', 'foo',
-            html='<input checked="checked" type="checkbox" name="is_cool" value="foo" />',
+            html='<input checked type="checkbox" name="is_cool" value="foo" />',
         )
 
     def test_render_int(self):
@@ -37,11 +37,11 @@ class CheckboxInputTest(WidgetTest):
         """
         self.check_html(
             self.widget, 'is_cool', 0,
-            html='<input checked="checked" type="checkbox" name="is_cool" value="0" />',
+            html='<input checked type="checkbox" name="is_cool" value="0" />',
         )
         self.check_html(
             self.widget, 'is_cool', 1,
-            html='<input checked="checked" type="checkbox" name="is_cool" value="1" />',
+            html='<input checked type="checkbox" name="is_cool" value="1" />',
         )
 
     def test_render_check_test(self):
@@ -54,13 +54,13 @@ class CheckboxInputTest(WidgetTest):
             '<input type="checkbox" name="greeting" />'
         ))
         self.check_html(widget, 'greeting', 'hello', html=(
-            '<input checked="checked" type="checkbox" name="greeting" value="hello" />'
+            '<input checked type="checkbox" name="greeting" value="hello" />'
         ))
         self.check_html(widget, 'greeting', 'hello there', html=(
-            '<input checked="checked" type="checkbox" name="greeting" value="hello there" />'
+            '<input checked type="checkbox" name="greeting" value="hello there" />'
         ))
         self.check_html(widget, 'greeting', 'hello & goodbye', html=(
-            '<input checked="checked" type="checkbox" name="greeting" value="hello &amp; goodbye" />'
+            '<input checked type="checkbox" name="greeting" value="hello &amp; goodbye" />'
         ))
 
     def test_render_check_exception(self):
diff --git a/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py b/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py
index 1e9d31e6a7..10d025e4c2 100644
--- a/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py
+++ b/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py
@@ -9,7 +9,7 @@ class CheckboxSelectMultipleTest(WidgetTest):
     def test_render_value(self):
         self.check_html(self.widget(choices=self.beatles), 'beatles', ['J'], html=(
             """<ul>
-            <li><label><input checked="checked" type="checkbox" name="beatles" value="J" /> John</label></li>
+            <li><label><input checked type="checkbox" name="beatles" value="J" /> John</label></li>
             <li><label><input type="checkbox" name="beatles" value="P" /> Paul</label></li>
             <li><label><input type="checkbox" name="beatles" value="G" /> George</label></li>
             <li><label><input type="checkbox" name="beatles" value="R" /> Ringo</label></li>
@@ -19,8 +19,8 @@ class CheckboxSelectMultipleTest(WidgetTest):
     def test_render_value_multiple(self):
         self.check_html(self.widget(choices=self.beatles), 'beatles', ['J', 'P'], html=(
             """<ul>
-            <li><label><input checked="checked" type="checkbox" name="beatles" value="J" /> John</label></li>
-            <li><label><input checked="checked" type="checkbox" name="beatles" value="P" /> Paul</label></li>
+            <li><label><input checked type="checkbox" name="beatles" value="J" /> John</label></li>
+            <li><label><input checked type="checkbox" name="beatles" value="P" /> Paul</label></li>
             <li><label><input type="checkbox" name="beatles" value="G" /> George</label></li>
             <li><label><input type="checkbox" name="beatles" value="R" /> Ringo</label></li>
             </ul>"""
@@ -53,7 +53,7 @@ class CheckboxSelectMultipleTest(WidgetTest):
         <li>Audio<ul id="media_1">
         <li>
         <label for="media_1_0">
-        <input checked="checked" id="media_1_0" name="nestchoice" type="checkbox" value="vinyl" /> Vinyl
+        <input checked id="media_1_0" name="nestchoice" type="checkbox" value="vinyl" /> Vinyl
         </label>
         </li>
         <li>
@@ -66,7 +66,7 @@ class CheckboxSelectMultipleTest(WidgetTest):
         </li>
         <li>
         <label for="media_2_1">
-        <input checked="checked" id="media_2_1" name="nestchoice" type="checkbox" value="dvd" /> DVD
+        <input checked id="media_2_1" name="nestchoice" type="checkbox" value="dvd" /> DVD
         </label>
         </li>
         </ul></li>
@@ -85,11 +85,11 @@ class CheckboxSelectMultipleTest(WidgetTest):
         html = """
         <ul id="abc">
         <li>
-        <label for="abc_0"><input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" /> A</label>
+        <label for="abc_0"><input checked type="checkbox" name="letters" value="a" id="abc_0" /> A</label>
         </li>
         <li><label for="abc_1"><input type="checkbox" name="letters" value="b" id="abc_1" /> B</label></li>
         <li>
-        <label for="abc_2"><input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" /> C</label>
+        <label for="abc_2"><input checked type="checkbox" name="letters" value="c" id="abc_2" /> C</label>
         </li>
         </ul>
         """
@@ -103,11 +103,11 @@ class CheckboxSelectMultipleTest(WidgetTest):
         html = """
         <ul id="abc">
         <li>
-        <label for="abc_0"><input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" /> A</label>
+        <label for="abc_0"><input checked type="checkbox" name="letters" value="a" id="abc_0" /> A</label>
         </li>
         <li><label for="abc_1"><input type="checkbox" name="letters" value="b" id="abc_1" /> B</label></li>
         <li>
-        <label for="abc_2"><input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" /> C</label>
+        <label for="abc_2"><input checked type="checkbox" name="letters" value="c" id="abc_2" /> C</label>
         </li>
         </ul>
         """
diff --git a/tests/forms_tests/widget_tests/test_radioselect.py b/tests/forms_tests/widget_tests/test_radioselect.py
index cdb9420b15..fea26cece1 100644
--- a/tests/forms_tests/widget_tests/test_radioselect.py
+++ b/tests/forms_tests/widget_tests/test_radioselect.py
@@ -9,7 +9,7 @@ class RadioSelectTest(WidgetTest):
     def test_render(self):
         self.check_html(self.widget(choices=self.beatles), 'beatle', 'J', html=(
             """<ul>
-            <li><label><input checked="checked" type="radio" name="beatle" value="J" /> John</label></li>
+            <li><label><input checked type="radio" name="beatle" value="J" /> John</label></li>
             <li><label><input type="radio" name="beatle" value="P" /> Paul</label></li>
             <li><label><input type="radio" name="beatle" value="G" /> George</label></li>
             <li><label><input type="radio" name="beatle" value="R" /> Ringo</label></li>
@@ -37,7 +37,7 @@ class RadioSelectTest(WidgetTest):
         <li><label for="media_2_0"><input id="media_2_0" name="nestchoice" type="radio" value="vhs" /> VHS</label></li>
         <li>
         <label for="media_2_1">
-        <input checked="checked" id="media_2_1" name="nestchoice" type="radio" value="dvd" /> DVD
+        <input checked id="media_2_1" name="nestchoice" type="radio" value="dvd" /> DVD
         </label>
         </li>
         </ul></li>
@@ -57,7 +57,7 @@ class RadioSelectTest(WidgetTest):
         html = """
         <ul id="foo">
         <li>
-        <label for="foo_0"><input checked="checked" type="radio" id="foo_0" value="J" name="beatle" /> John</label>
+        <label for="foo_0"><input checked type="radio" id="foo_0" value="J" name="beatle" /> John</label>
         </li>
         <li><label for="foo_1"><input type="radio" id="foo_1" value="P" name="beatle" /> Paul</label></li>
         <li><label for="foo_2"><input type="radio" id="foo_2" value="G" name="beatle" /> George</label></li>
@@ -74,7 +74,7 @@ class RadioSelectTest(WidgetTest):
         html = """
         <ul id="bar">
         <li>
-        <label for="bar_0"><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label>
+        <label for="bar_0"><input checked type="radio" id="bar_0" value="J" name="beatle" /> John</label>
         </li>
         <li><label for="bar_1"><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label></li>
         <li><label for="bar_2"><input type="radio" id="bar_2" value="G" name="beatle" /> George</label></li>
-- 
cgit v1.3