diff options
Diffstat (limited to 'tests/forms_tests/widget_tests')
18 files changed, 185 insertions, 185 deletions
diff --git a/tests/forms_tests/widget_tests/test_checkboxinput.py b/tests/forms_tests/widget_tests/test_checkboxinput.py index 1ae6ab73b6..6483b7f211 100644 --- a/tests/forms_tests/widget_tests/test_checkboxinput.py +++ b/tests/forms_tests/widget_tests/test_checkboxinput.py @@ -7,18 +7,18 @@ class CheckboxInputTest(WidgetTest): widget = CheckboxInput() def test_render_empty(self): - self.check_html(self.widget, 'is_cool', '', html='<input type="checkbox" name="is_cool" />') + self.check_html(self.widget, 'is_cool', '', html='<input type="checkbox" name="is_cool">') def test_render_none(self): - self.check_html(self.widget, 'is_cool', None, html='<input type="checkbox" name="is_cool" />') + self.check_html(self.widget, 'is_cool', None, html='<input type="checkbox" name="is_cool">') def test_render_false(self): - self.check_html(self.widget, 'is_cool', False, html='<input type="checkbox" name="is_cool" />') + self.check_html(self.widget, 'is_cool', False, html='<input type="checkbox" name="is_cool">') def test_render_true(self): self.check_html( self.widget, 'is_cool', True, - html='<input 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 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 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 type="checkbox" name="is_cool" value="1" />', + html='<input checked type="checkbox" name="is_cool" value="1">', ) def test_render_check_test(self): @@ -51,16 +51,16 @@ class CheckboxInputTest(WidgetTest): """ widget = CheckboxInput(check_test=lambda value: value.startswith('hello')) self.check_html(widget, 'greeting', '', html=( - '<input type="checkbox" name="greeting" />' + '<input type="checkbox" name="greeting">' )) self.check_html(widget, 'greeting', 'hello', html=( - '<input 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 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 type="checkbox" name="greeting" value="hello & goodbye" />' + '<input checked type="checkbox" name="greeting" value="hello & 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 239f80da47..ef31ce9d36 100644 --- a/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py +++ b/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py @@ -13,20 +13,20 @@ class CheckboxSelectMultipleTest(WidgetTest): def test_render_value(self): self.check_html(self.widget(choices=self.beatles), 'beatles', ['J'], html=( """<ul> - <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> + <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> </ul>""" )) def test_render_value_multiple(self): self.check_html(self.widget(choices=self.beatles), 'beatles', ['J', 'P'], html=( """<ul> - <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> + <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>""" )) @@ -36,10 +36,10 @@ class CheckboxSelectMultipleTest(WidgetTest): """ self.check_html(self.widget(choices=self.beatles), 'beatles', None, html=( """<ul> - <li><label><input 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> + <li><label><input 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> </ul>""" )) @@ -52,25 +52,25 @@ class CheckboxSelectMultipleTest(WidgetTest): html = """ <ul id="media"> <li> - <label for="media_0"><input id="media_0" name="nestchoice" type="checkbox" value="unknown" /> Unknown</label> + <label for="media_0"><input id="media_0" name="nestchoice" type="checkbox" value="unknown"> Unknown</label> </li> <li>Audio<ul id="media_1"> <li> <label for="media_1_0"> - <input 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> - <label for="media_1_1"><input id="media_1_1" name="nestchoice" type="checkbox" value="cd" /> CD</label> + <label for="media_1_1"><input id="media_1_1" name="nestchoice" type="checkbox" value="cd"> CD</label> </li> </ul></li> <li>Video<ul id="media_2"> <li> - <label for="media_2_0"><input id="media_2_0" name="nestchoice" type="checkbox" value="vhs" /> VHS</label> + <label for="media_2_0"><input id="media_2_0" name="nestchoice" type="checkbox" value="vhs"> VHS</label> </li> <li> <label for="media_2_1"> - <input 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> @@ -90,25 +90,25 @@ class CheckboxSelectMultipleTest(WidgetTest): html = """ <ul> <li> - <label><input name="nestchoice" type="checkbox" value="unknown" /> Unknown</label> + <label><input name="nestchoice" type="checkbox" value="unknown"> Unknown</label> </li> <li>Audio<ul> <li> <label> - <input checked name="nestchoice" type="checkbox" value="vinyl" /> Vinyl + <input checked name="nestchoice" type="checkbox" value="vinyl"> Vinyl </label> </li> <li> - <label><input name="nestchoice" type="checkbox" value="cd" /> CD</label> + <label><input name="nestchoice" type="checkbox" value="cd"> CD</label> </li> </ul></li> <li>Video<ul> <li> - <label><input name="nestchoice" type="checkbox" value="vhs" /> VHS</label> + <label><input name="nestchoice" type="checkbox" value="vhs"> VHS</label> </li> <li> <label> - <input checked name="nestchoice" type="checkbox" value="dvd" /> DVD + <input checked name="nestchoice" type="checkbox" value="dvd"> DVD </label> </li> </ul></li> @@ -124,11 +124,11 @@ class CheckboxSelectMultipleTest(WidgetTest): html = """ <ul id="abc"> <li> - <label for="abc_0"><input 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_1"><input type="checkbox" name="letters" value="b" id="abc_1"> B</label></li> <li> - <label for="abc_2"><input 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> """ @@ -142,11 +142,11 @@ class CheckboxSelectMultipleTest(WidgetTest): html = """ <ul id="abc"> <li> - <label for="abc_0"><input 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_1"><input type="checkbox" name="letters" value="b" id="abc_1"> B</label></li> <li> - <label for="abc_2"><input 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> """ @@ -161,9 +161,9 @@ class CheckboxSelectMultipleTest(WidgetTest): ] html = """ <ul> - <li><label><input type="checkbox" name="numbers" value="1" /> One</label></li> - <li><label><input type="checkbox" name="numbers" value="1000" /> One thousand</label></li> - <li><label><input type="checkbox" name="numbers" value="1000000" /> One million</label></li> + <li><label><input type="checkbox" name="numbers" value="1"> One</label></li> + <li><label><input type="checkbox" name="numbers" value="1000"> One thousand</label></li> + <li><label><input type="checkbox" name="numbers" value="1000000"> One million</label></li> </ul> """ self.check_html(self.widget(choices=choices), 'numbers', None, html=html) @@ -174,8 +174,8 @@ class CheckboxSelectMultipleTest(WidgetTest): ] html = """ <ul> - <li><label><input type="checkbox" name="times" value="00:00:00" /> midnight</label></li> - <li><label><input type="checkbox" name="times" value="12:00:00" /> noon</label></li> + <li><label><input type="checkbox" name="times" value="00:00:00"> midnight</label></li> + <li><label><input type="checkbox" name="times" value="12:00:00"> noon</label></li> </ul> """ self.check_html(self.widget(choices=choices), 'times', None, html=html) diff --git a/tests/forms_tests/widget_tests/test_clearablefileinput.py b/tests/forms_tests/widget_tests/test_clearablefileinput.py index f338269d09..2ba376db8a 100644 --- a/tests/forms_tests/widget_tests/test_clearablefileinput.py +++ b/tests/forms_tests/widget_tests/test_clearablefileinput.py @@ -26,9 +26,9 @@ class ClearableFileInputTest(WidgetTest): self.check_html(self.widget, 'myfile', FakeFieldFile(), html=( """ Currently: <a href="something">something</a> - <input type="checkbox" name="myfile-clear" id="myfile-clear_id" /> - <label for="myfile-clear_id">Clear</label><br /> - Change: <input type="file" name="myfile" /> + <input type="checkbox" name="myfile-clear" id="myfile-clear_id"> + <label for="myfile-clear_id">Clear</label><br> + Change: <input type="file" name="myfile"> """ )) @@ -47,9 +47,9 @@ class ClearableFileInputTest(WidgetTest): """ Currently: <a href="something?chapter=1&sect=2&copy=3&lang=en"> something<div onclick="alert('oops')">.jpg</a> - <input type="checkbox" name="my<div>file-clear" id="my<div>file-clear_id" /> - <label for="my<div>file-clear_id">Clear</label><br /> - Change: <input type="file" name="my<div>file" /> + <input type="checkbox" name="my<div>file-clear" id="my<div>file-clear_id"> + <label for="my<div>file-clear_id">Clear</label><br> + Change: <input type="file" name="my<div>file"> """ )) @@ -62,8 +62,8 @@ class ClearableFileInputTest(WidgetTest): widget.is_required = True self.check_html(widget, 'myfile', FakeFieldFile(), html=( """ - Currently: <a href="something">something</a> <br /> - Change: <input type="file" name="myfile" /> + Currently: <a href="something">something</a> <br> + Change: <input type="file" name="myfile"> """ )) @@ -72,7 +72,7 @@ class ClearableFileInputTest(WidgetTest): A ClearableFileInput instantiated with no initial value does not render a clear checkbox. """ - self.check_html(self.widget, 'myfile', None, html='<input type="file" name="myfile" />') + self.check_html(self.widget, 'myfile', None, html='<input type="file" name="myfile">') def test_render_as_subwidget(self): """A ClearableFileInput as a subwidget of MultiWidget.""" @@ -80,9 +80,9 @@ class ClearableFileInputTest(WidgetTest): self.check_html(widget, 'myfile', [FakeFieldFile()], html=( """ Currently: <a href="something">something</a> - <input type="checkbox" name="myfile_0-clear" id="myfile_0-clear_id" /> - <label for="myfile_0-clear_id">Clear</label><br /> - Change: <input type="file" name="myfile_0" /> + <input type="checkbox" name="myfile_0-clear" id="myfile_0-clear_id"> + <label for="myfile_0-clear_id">Clear</label><br> + Change: <input type="file" name="myfile_0"> """ )) @@ -148,7 +148,7 @@ class ClearableFileInputTest(WidgetTest): return 'value' html = self.widget.render('myfile', NoURLFieldFile()) - self.assertHTMLEqual(html, '<input name="myfile" type="file" />') + self.assertHTMLEqual(html, '<input name="myfile" type="file">') def test_use_required_attribute(self): # False when initial data exists. The file input is left blank by the diff --git a/tests/forms_tests/widget_tests/test_dateinput.py b/tests/forms_tests/widget_tests/test_dateinput.py index 3cf15fed8a..8fae6c672a 100644 --- a/tests/forms_tests/widget_tests/test_dateinput.py +++ b/tests/forms_tests/widget_tests/test_dateinput.py @@ -11,15 +11,15 @@ class DateInputTest(WidgetTest): widget = DateInput() def test_render_none(self): - self.check_html(self.widget, 'date', None, html='<input type="text" name="date" />') + self.check_html(self.widget, 'date', None, html='<input type="text" name="date">') def test_render_value(self): d = date(2007, 9, 17) self.assertEqual(str(d), '2007-09-17') - self.check_html(self.widget, 'date', d, html='<input type="text" name="date" value="2007-09-17" />') + self.check_html(self.widget, 'date', d, html='<input type="text" name="date" value="2007-09-17">') self.check_html(self.widget, 'date', date(2007, 9, 17), html=( - '<input type="text" name="date" value="2007-09-17" />' + '<input type="text" name="date" value="2007-09-17">' )) def test_string(self): @@ -27,7 +27,7 @@ class DateInputTest(WidgetTest): Should be able to initialize from a string value. """ self.check_html(self.widget, 'date', '2007-09-17', html=( - '<input type="text" name="date" value="2007-09-17" />' + '<input type="text" name="date" value="2007-09-17">' )) def test_format(self): @@ -36,12 +36,12 @@ class DateInputTest(WidgetTest): """ d = date(2007, 9, 17) widget = DateInput(format='%d/%m/%Y', attrs={'type': 'date'}) - self.check_html(widget, 'date', d, html='<input type="date" name="date" value="17/09/2007" />') + self.check_html(widget, 'date', d, html='<input type="date" name="date" value="17/09/2007">') @override_settings(USE_L10N=True) @translation.override('de-at') def test_l10n(self): self.check_html( self.widget, 'date', date(2007, 9, 17), - html='<input type="text" name="date" value="17.09.2007" />', + html='<input type="text" name="date" value="17.09.2007">', ) diff --git a/tests/forms_tests/widget_tests/test_datetimeinput.py b/tests/forms_tests/widget_tests/test_datetimeinput.py index 50fd7f5442..682ded3c84 100644 --- a/tests/forms_tests/widget_tests/test_datetimeinput.py +++ b/tests/forms_tests/widget_tests/test_datetimeinput.py @@ -11,7 +11,7 @@ class DateTimeInputTest(WidgetTest): widget = DateTimeInput() def test_render_none(self): - self.check_html(self.widget, 'date', None, '<input type="text" name="date" />') + self.check_html(self.widget, 'date', None, '<input type="text" name="date">') def test_render_value(self): """ @@ -20,13 +20,13 @@ class DateTimeInputTest(WidgetTest): d = datetime(2007, 9, 17, 12, 51, 34, 482548) self.assertEqual(str(d), '2007-09-17 12:51:34.482548') self.check_html(self.widget, 'date', d, html=( - '<input type="text" name="date" value="2007-09-17 12:51:34" />' + '<input type="text" name="date" value="2007-09-17 12:51:34">' )) self.check_html(self.widget, 'date', datetime(2007, 9, 17, 12, 51, 34), html=( - '<input type="text" name="date" value="2007-09-17 12:51:34" />' + '<input type="text" name="date" value="2007-09-17 12:51:34">' )) self.check_html(self.widget, 'date', datetime(2007, 9, 17, 12, 51), html=( - '<input type="text" name="date" value="2007-09-17 12:51:00" />' + '<input type="text" name="date" value="2007-09-17 12:51:00">' )) def test_render_formatted(self): @@ -37,14 +37,14 @@ class DateTimeInputTest(WidgetTest): format='%d/%m/%Y %H:%M', attrs={'type': 'datetime'}, ) d = datetime(2007, 9, 17, 12, 51, 34, 482548) - self.check_html(widget, 'date', d, html='<input type="datetime" name="date" value="17/09/2007 12:51" />') + self.check_html(widget, 'date', d, html='<input type="datetime" name="date" value="17/09/2007 12:51">') @override_settings(USE_L10N=True) @translation.override('de-at') def test_l10n(self): d = datetime(2007, 9, 17, 12, 51, 34, 482548) self.check_html(self.widget, 'date', d, html=( - '<input type="text" name="date" value="17.09.2007 12:51:34" />' + '<input type="text" name="date" value="17.09.2007 12:51:34">' )) @override_settings(USE_L10N=True) @@ -54,10 +54,10 @@ class DateTimeInputTest(WidgetTest): with self.settings(USE_L10N=False): self.check_html( self.widget, 'date', d, - html='<input type="text" name="date" value="2007-09-17 12:51:34" />', + html='<input type="text" name="date" value="2007-09-17 12:51:34">', ) with translation.override('es'): self.check_html( self.widget, 'date', d, - html='<input type="text" name="date" value="17/09/2007 12:51:34" />', + html='<input type="text" name="date" value="17/09/2007 12:51:34">', ) diff --git a/tests/forms_tests/widget_tests/test_fileinput.py b/tests/forms_tests/widget_tests/test_fileinput.py index 6e96dc7b5f..bbd7c7fe52 100644 --- a/tests/forms_tests/widget_tests/test_fileinput.py +++ b/tests/forms_tests/widget_tests/test_fileinput.py @@ -11,9 +11,9 @@ class FileInputTest(WidgetTest): FileInput widgets never render the value attribute. The old value isn't useful if a form is updated or an error occurred. """ - self.check_html(self.widget, 'email', 'test@example.com', html='<input type="file" name="email" />') - self.check_html(self.widget, 'email', '', html='<input type="file" name="email" />') - self.check_html(self.widget, 'email', None, html='<input type="file" name="email" />') + self.check_html(self.widget, 'email', 'test@example.com', html='<input type="file" name="email">') + self.check_html(self.widget, 'email', '', html='<input type="file" name="email">') + self.check_html(self.widget, 'email', None, html='<input type="file" name="email">') def test_value_omitted_from_data(self): self.assertIs(self.widget.value_omitted_from_data({}, {}, 'field'), True) diff --git a/tests/forms_tests/widget_tests/test_hiddeninput.py b/tests/forms_tests/widget_tests/test_hiddeninput.py index d1604a31e4..a7d036410c 100644 --- a/tests/forms_tests/widget_tests/test_hiddeninput.py +++ b/tests/forms_tests/widget_tests/test_hiddeninput.py @@ -7,7 +7,7 @@ class HiddenInputTest(WidgetTest): widget = HiddenInput() def test_render(self): - self.check_html(self.widget, 'email', '', html='<input type="hidden" name="email" />') + self.check_html(self.widget, 'email', '', html='<input type="hidden" name="email">') def test_use_required_attribute(self): # Always False to avoid browser validation on inputs hidden from the diff --git a/tests/forms_tests/widget_tests/test_input.py b/tests/forms_tests/widget_tests/test_input.py index e773d94d8a..8be971826e 100644 --- a/tests/forms_tests/widget_tests/test_input.py +++ b/tests/forms_tests/widget_tests/test_input.py @@ -8,8 +8,8 @@ class InputTests(WidgetTest): def test_attrs_with_type(self): attrs = {'type': 'date'} widget = Input(attrs) - self.check_html(widget, 'name', 'value', '<input type="date" name="name" value="value" />') + self.check_html(widget, 'name', 'value', '<input type="date" name="name" value="value">') # reuse the same attrs for another widget - self.check_html(Input(attrs), 'name', 'value', '<input type="date" name="name" value="value" />') + self.check_html(Input(attrs), 'name', 'value', '<input type="date" name="name" value="value">') attrs['type'] = 'number' # shouldn't change the widget type - self.check_html(widget, 'name', 'value', '<input type="date" name="name" value="value" />') + self.check_html(widget, 'name', 'value', '<input type="date" name="name" value="value">') diff --git a/tests/forms_tests/widget_tests/test_multiplehiddeninput.py b/tests/forms_tests/widget_tests/test_multiplehiddeninput.py index d1c1ae6fa5..37d54174ee 100644 --- a/tests/forms_tests/widget_tests/test_multiplehiddeninput.py +++ b/tests/forms_tests/widget_tests/test_multiplehiddeninput.py @@ -9,30 +9,30 @@ class MultipleHiddenInputTest(WidgetTest): def test_render_single(self): self.check_html( self.widget, 'email', ['test@example.com'], - html='<input type="hidden" name="email" value="test@example.com" />', + html='<input type="hidden" name="email" value="test@example.com">', ) def test_render_multiple(self): self.check_html( self.widget, 'email', ['test@example.com', 'foo@example.com'], html=( - '<input type="hidden" name="email" value="test@example.com" />\n' - '<input type="hidden" name="email" value="foo@example.com" />' + '<input type="hidden" name="email" value="test@example.com">\n' + '<input type="hidden" name="email" value="foo@example.com">' ), ) def test_render_attrs(self): self.check_html( self.widget, 'email', ['test@example.com'], attrs={'class': 'fun'}, - html='<input type="hidden" name="email" value="test@example.com" class="fun" />', + html='<input type="hidden" name="email" value="test@example.com" class="fun">', ) def test_render_attrs_multiple(self): self.check_html( self.widget, 'email', ['test@example.com', 'foo@example.com'], attrs={'class': 'fun'}, html=( - '<input type="hidden" name="email" value="test@example.com" class="fun" />\n' - '<input type="hidden" name="email" value="foo@example.com" class="fun" />' + '<input type="hidden" name="email" value="test@example.com" class="fun">\n' + '<input type="hidden" name="email" value="foo@example.com" class="fun">' ), ) @@ -41,18 +41,18 @@ class MultipleHiddenInputTest(WidgetTest): self.check_html(widget, 'email', [], '') self.check_html( widget, 'email', ['foo@example.com'], - html='<input type="hidden" class="fun" value="foo@example.com" name="email" />', + html='<input type="hidden" class="fun" value="foo@example.com" name="email">', ) self.check_html( widget, 'email', ['foo@example.com', 'test@example.com'], html=( - '<input type="hidden" class="fun" value="foo@example.com" name="email" />\n' - '<input type="hidden" class="fun" value="test@example.com" name="email" />' + '<input type="hidden" class="fun" value="foo@example.com" name="email">\n' + '<input type="hidden" class="fun" value="test@example.com" name="email">' ), ) self.check_html( widget, 'email', ['foo@example.com'], attrs={'class': 'special'}, - html='<input type="hidden" class="special" value="foo@example.com" name="email" />', + html='<input type="hidden" class="special" value="foo@example.com" name="email">', ) def test_render_empty(self): @@ -68,8 +68,8 @@ class MultipleHiddenInputTest(WidgetTest): self.check_html( self.widget, 'letters', ['a', 'b', 'c'], attrs={'id': 'hideme'}, html=( - '<input type="hidden" name="letters" value="a" id="hideme_0" />\n' - '<input type="hidden" name="letters" value="b" id="hideme_1" />\n' - '<input type="hidden" name="letters" value="c" id="hideme_2" />' + '<input type="hidden" name="letters" value="a" id="hideme_0">\n' + '<input type="hidden" name="letters" value="b" id="hideme_1">\n' + '<input type="hidden" name="letters" value="c" id="hideme_2">' ), ) diff --git a/tests/forms_tests/widget_tests/test_multiwidget.py b/tests/forms_tests/widget_tests/test_multiwidget.py index bce806231d..783eb78b85 100644 --- a/tests/forms_tests/widget_tests/test_multiwidget.py +++ b/tests/forms_tests/widget_tests/test_multiwidget.py @@ -88,16 +88,16 @@ class MultiWidgetTest(WidgetTest): ) ) self.check_html(widget, 'name', ['john', 'lennon'], html=( - '<input type="text" class="big" value="john" name="name_0" />' - '<input type="text" class="small" value="lennon" name="name_1" />' + '<input type="text" class="big" value="john" name="name_0">' + '<input type="text" class="small" value="lennon" name="name_1">' )) self.check_html(widget, 'name', 'john__lennon', html=( - '<input type="text" class="big" value="john" name="name_0" />' - '<input type="text" class="small" value="lennon" name="name_1" />' + '<input type="text" class="big" value="john" name="name_0">' + '<input type="text" class="small" value="lennon" name="name_1">' )) self.check_html(widget, 'name', 'john__lennon', attrs={'id': 'foo'}, html=( - '<input id="foo_0" type="text" class="big" value="john" name="name_0" />' - '<input id="foo_1" type="text" class="small" value="lennon" name="name_1" />' + '<input id="foo_0" type="text" class="big" value="john" name="name_0">' + '<input id="foo_1" type="text" class="small" value="lennon" name="name_1">' )) def test_constructor_attrs(self): @@ -109,21 +109,21 @@ class MultiWidgetTest(WidgetTest): attrs={'id': 'bar'}, ) self.check_html(widget, 'name', ['john', 'lennon'], html=( - '<input id="bar_0" type="text" class="big" value="john" name="name_0" />' - '<input id="bar_1" type="text" class="small" value="lennon" name="name_1" />' + '<input id="bar_0" type="text" class="big" value="john" name="name_0">' + '<input id="bar_1" type="text" class="small" value="lennon" name="name_1">' )) def test_constructor_attrs_with_type(self): attrs = {'type': 'number'} widget = MyMultiWidget(widgets=(TextInput, TextInput()), attrs=attrs) self.check_html(widget, 'code', ['1', '2'], html=( - '<input type="number" value="1" name="code_0" />' - '<input type="number" value="2" name="code_1" />' + '<input type="number" value="1" name="code_0">' + '<input type="number" value="2" name="code_1">' )) widget = MyMultiWidget(widgets=(TextInput(attrs), TextInput(attrs)), attrs={'class': 'bar'}) self.check_html(widget, 'code', ['1', '2'], html=( - '<input type="number" value="1" name="code_0" class="bar" />' - '<input type="number" value="2" name="code_1" class="bar" />' + '<input type="number" value="1" name="code_0" class="bar">' + '<input type="number" value="2" name="code_1" class="bar">' )) def test_value_omitted_from_data(self): @@ -154,23 +154,23 @@ class MultiWidgetTest(WidgetTest): widget = ComplexMultiWidget() self.check_html(widget, 'name', 'some text,JP,2007-04-25 06:24:00', html=( """ - <input type="text" name="name_0" value="some text" /> + <input type="text" name="name_0" value="some text"> <select multiple name="name_1"> <option value="J" selected>John</option> <option value="P" selected>Paul</option> <option value="G">George</option> <option value="R">Ringo</option> </select> - <input type="text" name="name_2_0" value="2007-04-25" /> - <input type="text" name="name_2_1" value="06:24:00" /> + <input type="text" name="name_2_0" value="2007-04-25"> + <input type="text" name="name_2_1" value="06:24:00"> """ )) def test_no_whitespace_between_widgets(self): widget = MyMultiWidget(widgets=(TextInput, TextInput())) self.check_html(widget, 'code', None, html=( - '<input type="text" name="code_0" />' - '<input type="text" name="code_1" />' + '<input type="text" name="code_0">' + '<input type="text" name="code_1">' ), strict=True) def test_deepcopy(self): diff --git a/tests/forms_tests/widget_tests/test_numberinput.py b/tests/forms_tests/widget_tests/test_numberinput.py index 95a0a9250a..40bd94df6e 100644 --- a/tests/forms_tests/widget_tests/test_numberinput.py +++ b/tests/forms_tests/widget_tests/test_numberinput.py @@ -11,5 +11,5 @@ class NumberInputTests(WidgetTest): widget = NumberInput(attrs={'max': 12345, 'min': 1234, 'step': 9999}) self.check_html( widget, 'name', 'value', - '<input type="number" name="name" value="value" max="12345" min="1234" step="9999" />' + '<input type="number" name="name" value="value" max="12345" min="1234" step="9999">' ) diff --git a/tests/forms_tests/widget_tests/test_passwordinput.py b/tests/forms_tests/widget_tests/test_passwordinput.py index 4cb7c4ef47..ecbe274d69 100644 --- a/tests/forms_tests/widget_tests/test_passwordinput.py +++ b/tests/forms_tests/widget_tests/test_passwordinput.py @@ -7,10 +7,10 @@ class PasswordInputTest(WidgetTest): widget = PasswordInput() def test_render(self): - self.check_html(self.widget, 'password', '', html='<input type="password" name="password" />') + self.check_html(self.widget, 'password', '', html='<input type="password" name="password">') def test_render_ignore_value(self): - self.check_html(self.widget, 'password', 'secret', html='<input type="password" name="password" />') + self.check_html(self.widget, 'password', 'secret', html='<input type="password" name="password">') def test_render_value_true(self): """ @@ -18,9 +18,9 @@ class PasswordInputTest(WidgetTest): render its value. For security reasons, this is off by default. """ widget = PasswordInput(render_value=True) - self.check_html(widget, 'password', '', html='<input type="password" name="password" />') - self.check_html(widget, 'password', None, html='<input type="password" name="password" />') + self.check_html(widget, 'password', '', html='<input type="password" name="password">') + self.check_html(widget, 'password', None, html='<input type="password" name="password">') self.check_html( widget, 'password', 'test@example.com', - html='<input type="password" name="password" value="test@example.com" />', + html='<input type="password" name="password" value="test@example.com">', ) diff --git a/tests/forms_tests/widget_tests/test_radioselect.py b/tests/forms_tests/widget_tests/test_radioselect.py index 05f980eb36..d0a70c7953 100644 --- a/tests/forms_tests/widget_tests/test_radioselect.py +++ b/tests/forms_tests/widget_tests/test_radioselect.py @@ -13,11 +13,11 @@ class RadioSelectTest(WidgetTest): choices = (('', '------'),) + self.beatles self.check_html(self.widget(choices=choices), 'beatle', 'J', html=( """<ul> - <li><label><input type="radio" name="beatle" value="" /> ------</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> + <li><label><input type="radio" name="beatle" value=""> ------</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> </ul>""" )) @@ -30,19 +30,19 @@ class RadioSelectTest(WidgetTest): html = """ <ul id="media"> <li> - <label for="media_0"><input id="media_0" name="nestchoice" type="radio" value="unknown" /> Unknown</label> + <label for="media_0"><input id="media_0" name="nestchoice" type="radio" value="unknown"> Unknown</label> </li> <li>Audio<ul id="media_1"> <li> - <label for="media_1_0"><input id="media_1_0" name="nestchoice" type="radio" value="vinyl" /> Vinyl</label> + <label for="media_1_0"><input id="media_1_0" name="nestchoice" type="radio" value="vinyl"> Vinyl</label> </li> - <li><label for="media_1_1"><input id="media_1_1" name="nestchoice" type="radio" value="cd" /> CD</label></li> + <li><label for="media_1_1"><input id="media_1_1" name="nestchoice" type="radio" value="cd"> CD</label></li> </ul></li> <li>Video<ul id="media_2"> - <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_0"><input id="media_2_0" name="nestchoice" type="radio" value="vhs"> VHS</label></li> <li> <label for="media_2_1"> - <input 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> @@ -62,11 +62,11 @@ class RadioSelectTest(WidgetTest): html = """ <ul id="foo"> <li> - <label for="foo_0"><input 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> - <li><label for="foo_3"><input type="radio" id="foo_3" value="R" name="beatle" /> Ringo</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> + <li><label for="foo_3"><input type="radio" id="foo_3" value="R" name="beatle"> Ringo</label></li> </ul> """ self.check_html(widget, 'beatle', 'J', html=html) @@ -79,11 +79,11 @@ class RadioSelectTest(WidgetTest): html = """ <ul id="bar"> <li> - <label for="bar_0"><input 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> - <li><label for="bar_3"><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</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> + <li><label for="bar_3"><input type="radio" id="bar_3" value="R" name="beatle"> Ringo</label></li> </ul> """ self.check_html(self.widget(choices=self.beatles), 'beatle', 'J', attrs={'id': 'bar'}, html=html) @@ -95,10 +95,10 @@ class RadioSelectTest(WidgetTest): """ html = """ <ul class="bar"> - <li><label><input checked type="radio" class="bar" value="J" name="beatle" /> John</label></li> - <li><label><input type="radio" class="bar" value="P" name="beatle" /> Paul</label></li> - <li><label><input type="radio" class="bar" value="G" name="beatle" /> George</label></li> - <li><label><input type="radio" class="bar" value="R" name="beatle" /> Ringo</label></li> + <li><label><input checked type="radio" class="bar" value="J" name="beatle"> John</label></li> + <li><label><input type="radio" class="bar" value="P" name="beatle"> Paul</label></li> + <li><label><input type="radio" class="bar" value="G" name="beatle"> George</label></li> + <li><label><input type="radio" class="bar" value="R" name="beatle"> Ringo</label></li> </ul> """ self.check_html(self.widget(choices=self.beatles), 'beatle', 'J', attrs={'class': 'bar'}, html=html) @@ -112,9 +112,9 @@ class RadioSelectTest(WidgetTest): ] html = """ <ul> - <li><label><input type="radio" name="number" value="1" /> One</label></li> - <li><label><input type="radio" name="number" value="1000" /> One thousand</label></li> - <li><label><input type="radio" name="number" value="1000000" /> One million</label></li> + <li><label><input type="radio" name="number" value="1"> One</label></li> + <li><label><input type="radio" name="number" value="1000"> One thousand</label></li> + <li><label><input type="radio" name="number" value="1000000"> One million</label></li> </ul> """ self.check_html(self.widget(choices=choices), 'number', None, html=html) @@ -125,8 +125,8 @@ class RadioSelectTest(WidgetTest): ] html = """ <ul> - <li><label><input type="radio" name="time" value="00:00:00" /> midnight</label></li> - <li><label><input type="radio" name="time" value="12:00:00" /> noon</label></li> + <li><label><input type="radio" name="time" value="00:00:00"> midnight</label></li> + <li><label><input type="radio" name="time" value="12:00:00"> noon</label></li> </ul> """ self.check_html(self.widget(choices=choices), 'time', None, html=html) diff --git a/tests/forms_tests/widget_tests/test_splitdatetimewidget.py b/tests/forms_tests/widget_tests/test_splitdatetimewidget.py index 3b06fd5958..ebb30da148 100644 --- a/tests/forms_tests/widget_tests/test_splitdatetimewidget.py +++ b/tests/forms_tests/widget_tests/test_splitdatetimewidget.py @@ -10,37 +10,37 @@ class SplitDateTimeWidgetTest(WidgetTest): def test_render_empty(self): self.check_html(self.widget, 'date', '', html=( - '<input type="text" name="date_0" /><input type="text" name="date_1" />' + '<input type="text" name="date_0"><input type="text" name="date_1">' )) def test_render_none(self): self.check_html(self.widget, 'date', None, html=( - '<input type="text" name="date_0" /><input type="text" name="date_1" />' + '<input type="text" name="date_0"><input type="text" name="date_1">' )) def test_render_datetime(self): self.check_html(self.widget, 'date', datetime(2006, 1, 10, 7, 30), html=( - '<input type="text" name="date_0" value="2006-01-10" />' - '<input type="text" name="date_1" value="07:30:00" />' + '<input type="text" name="date_0" value="2006-01-10">' + '<input type="text" name="date_1" value="07:30:00">' )) def test_render_date_and_time(self): self.check_html(self.widget, 'date', [date(2006, 1, 10), time(7, 30)], html=( - '<input type="text" name="date_0" value="2006-01-10" />' - '<input type="text" name="date_1" value="07:30:00" />' + '<input type="text" name="date_0" value="2006-01-10">' + '<input type="text" name="date_1" value="07:30:00">' )) def test_constructor_attrs(self): widget = SplitDateTimeWidget(attrs={'class': 'pretty'}) self.check_html(widget, 'date', datetime(2006, 1, 10, 7, 30), html=( - '<input type="text" class="pretty" value="2006-01-10" name="date_0" />' - '<input type="text" class="pretty" value="07:30:00" name="date_1" />' + '<input type="text" class="pretty" value="2006-01-10" name="date_0">' + '<input type="text" class="pretty" value="07:30:00" name="date_1">' )) def test_constructor_different_attrs(self): html = ( - '<input type="text" class="foo" value="2006-01-10" name="date_0" />' - '<input type="text" class="bar" value="07:30:00" name="date_1" />' + '<input type="text" class="foo" value="2006-01-10" name="date_0">' + '<input type="text" class="bar" value="07:30:00" name="date_1">' ) widget = SplitDateTimeWidget(date_attrs={'class': 'foo'}, time_attrs={'class': 'bar'}) self.check_html(widget, 'date', datetime(2006, 1, 10, 7, 30), html=html) @@ -58,6 +58,6 @@ class SplitDateTimeWidgetTest(WidgetTest): date_format='%d/%m/%Y', time_format='%H:%M', ) self.check_html(widget, 'date', datetime(2006, 1, 10, 7, 30), html=( - '<input type="text" name="date_0" value="10/01/2006" />' - '<input type="text" name="date_1" value="07:30" />' + '<input type="text" name="date_0" value="10/01/2006">' + '<input type="text" name="date_1" value="07:30">' )) diff --git a/tests/forms_tests/widget_tests/test_splithiddendatetimewidget.py b/tests/forms_tests/widget_tests/test_splithiddendatetimewidget.py index e3adb11520..dff28161a5 100644 --- a/tests/forms_tests/widget_tests/test_splithiddendatetimewidget.py +++ b/tests/forms_tests/widget_tests/test_splithiddendatetimewidget.py @@ -12,22 +12,22 @@ class SplitHiddenDateTimeWidgetTest(WidgetTest): def test_render_empty(self): self.check_html(self.widget, 'date', '', html=( - '<input type="hidden" name="date_0" /><input type="hidden" name="date_1" />' + '<input type="hidden" name="date_0"><input type="hidden" name="date_1">' )) def test_render_value(self): d = datetime(2007, 9, 17, 12, 51, 34, 482548) self.check_html(self.widget, 'date', d, html=( - '<input type="hidden" name="date_0" value="2007-09-17" />' - '<input type="hidden" name="date_1" value="12:51:34" />' + '<input type="hidden" name="date_0" value="2007-09-17">' + '<input type="hidden" name="date_1" value="12:51:34">' )) self.check_html(self.widget, 'date', datetime(2007, 9, 17, 12, 51, 34), html=( - '<input type="hidden" name="date_0" value="2007-09-17" />' - '<input type="hidden" name="date_1" value="12:51:34" />' + '<input type="hidden" name="date_0" value="2007-09-17">' + '<input type="hidden" name="date_1" value="12:51:34">' )) self.check_html(self.widget, 'date', datetime(2007, 9, 17, 12, 51), html=( - '<input type="hidden" name="date_0" value="2007-09-17" />' - '<input type="hidden" name="date_1" value="12:51:00" />' + '<input type="hidden" name="date_0" value="2007-09-17">' + '<input type="hidden" name="date_1" value="12:51:00">' )) @override_settings(USE_L10N=True) @@ -36,15 +36,15 @@ class SplitHiddenDateTimeWidgetTest(WidgetTest): d = datetime(2007, 9, 17, 12, 51) self.check_html(self.widget, 'date', d, html=( """ - <input type="hidden" name="date_0" value="17.09.2007" /> - <input type="hidden" name="date_1" value="12:51:00" /> + <input type="hidden" name="date_0" value="17.09.2007"> + <input type="hidden" name="date_1" value="12:51:00"> """ )) def test_constructor_different_attrs(self): html = ( - '<input type="hidden" class="foo" value="2006-01-10" name="date_0" />' - '<input type="hidden" class="bar" value="07:30:00" name="date_1" />' + '<input type="hidden" class="foo" value="2006-01-10" name="date_0">' + '<input type="hidden" class="bar" value="07:30:00" name="date_1">' ) widget = SplitHiddenDateTimeWidget(date_attrs={'class': 'foo'}, time_attrs={'class': 'bar'}) self.check_html(widget, 'date', datetime(2006, 1, 10, 7, 30), html=html) diff --git a/tests/forms_tests/widget_tests/test_textinput.py b/tests/forms_tests/widget_tests/test_textinput.py index 906687d971..260e86f740 100644 --- a/tests/forms_tests/widget_tests/test_textinput.py +++ b/tests/forms_tests/widget_tests/test_textinput.py @@ -8,14 +8,14 @@ class TextInputTest(WidgetTest): widget = TextInput() def test_render(self): - self.check_html(self.widget, 'email', '', html='<input type="text" name="email" />') + self.check_html(self.widget, 'email', '', html='<input type="text" name="email">') def test_render_none(self): - self.check_html(self.widget, 'email', None, html='<input type="text" name="email" />') + self.check_html(self.widget, 'email', None, html='<input type="text" name="email">') def test_render_value(self): self.check_html(self.widget, 'email', 'test@example.com', html=( - '<input type="text" name="email" value="test@example.com" />' + '<input type="text" name="email" value="test@example.com">' )) def test_render_boolean(self): @@ -24,22 +24,22 @@ class TextInputTest(WidgetTest): "False"). """ self.check_html(self.widget, 'get_spam', False, html=( - '<input type="text" name="get_spam" value="False" />' + '<input type="text" name="get_spam" value="False">' )) self.check_html(self.widget, 'get_spam', True, html=( - '<input type="text" name="get_spam" value="True" />' + '<input type="text" name="get_spam" value="True">' )) def test_render_quoted(self): self.check_html( self.widget, 'email', 'some "quoted" & ampersanded value', - html='<input type="text" name="email" value="some "quoted" & ampersanded value" />', + html='<input type="text" name="email" value="some "quoted" & ampersanded value">', ) def test_render_custom_attrs(self): self.check_html( self.widget, 'email', 'test@example.com', attrs={'class': 'fun'}, - html='<input type="text" name="email" value="test@example.com" class="fun" />', + html='<input type="text" name="email" value="test@example.com" class="fun">', ) def test_render_unicode(self): @@ -47,16 +47,16 @@ class TextInputTest(WidgetTest): self.widget, 'email', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}, html=( '<input type="text" name="email" ' - 'value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" class="fun" />' + 'value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" class="fun">' ), ) def test_constructor_attrs(self): widget = TextInput(attrs={'class': 'fun', 'type': 'email'}) - self.check_html(widget, 'email', '', html='<input type="email" class="fun" name="email" />') + self.check_html(widget, 'email', '', html='<input type="email" class="fun" name="email">') self.check_html( widget, 'email', 'foo@example.com', - html='<input type="email" class="fun" value="foo@example.com" name="email" />', + html='<input type="email" class="fun" value="foo@example.com" name="email">', ) def test_attrs_precedence(self): @@ -67,12 +67,12 @@ class TextInputTest(WidgetTest): widget = TextInput(attrs={'class': 'pretty'}) self.check_html( widget, 'email', '', attrs={'class': 'special'}, - html='<input type="text" class="special" name="email" />', + html='<input type="text" class="special" name="email">', ) def test_attrs_safestring(self): widget = TextInput(attrs={'onBlur': mark_safe("function('foo')")}) - self.check_html(widget, 'email', '', html='<input onBlur="function(\'foo\')" type="text" name="email" />') + self.check_html(widget, 'email', '', html='<input onBlur="function(\'foo\')" type="text" name="email">') def test_use_required_attribute(self): # Text inputs can safely trigger the browser validation. diff --git a/tests/forms_tests/widget_tests/test_timeinput.py b/tests/forms_tests/widget_tests/test_timeinput.py index ab355e2ec9..1a511e4cab 100644 --- a/tests/forms_tests/widget_tests/test_timeinput.py +++ b/tests/forms_tests/widget_tests/test_timeinput.py @@ -11,7 +11,7 @@ class TimeInputTest(WidgetTest): widget = TimeInput() def test_render_none(self): - self.check_html(self.widget, 'time', None, html='<input type="text" name="time" />') + self.check_html(self.widget, 'time', None, html='<input type="text" name="time">') def test_render_value(self): """ @@ -19,18 +19,18 @@ class TimeInputTest(WidgetTest): """ t = time(12, 51, 34, 482548) self.assertEqual(str(t), '12:51:34.482548') - self.check_html(self.widget, 'time', t, html='<input type="text" name="time" value="12:51:34" />') + self.check_html(self.widget, 'time', t, html='<input type="text" name="time" value="12:51:34">') self.check_html(self.widget, 'time', time(12, 51, 34), html=( - '<input type="text" name="time" value="12:51:34" />' + '<input type="text" name="time" value="12:51:34">' )) self.check_html(self.widget, 'time', time(12, 51), html=( - '<input type="text" name="time" value="12:51:00" />' + '<input type="text" name="time" value="12:51:00">' )) def test_string(self): """Initializing from a string value.""" self.check_html(self.widget, 'time', '13:12:11', html=( - '<input type="text" name="time" value="13:12:11" />' + '<input type="text" name="time" value="13:12:11">' )) def test_format(self): @@ -39,10 +39,10 @@ class TimeInputTest(WidgetTest): """ t = time(12, 51, 34, 482548) widget = TimeInput(format='%H:%M', attrs={'type': 'time'}) - self.check_html(widget, 'time', t, html='<input type="time" name="time" value="12:51" />') + self.check_html(widget, 'time', t, html='<input type="time" name="time" value="12:51">') @override_settings(USE_L10N=True) @translation.override('de-at') def test_l10n(self): t = time(12, 51, 34, 482548) - self.check_html(self.widget, 'time', t, html='<input type="text" name="time" value="12:51:34" />') + self.check_html(self.widget, 'time', t, html='<input type="text" name="time" value="12:51:34">') diff --git a/tests/forms_tests/widget_tests/test_widget.py b/tests/forms_tests/widget_tests/test_widget.py index f25fe1e5fe..8cde388b8f 100644 --- a/tests/forms_tests/widget_tests/test_widget.py +++ b/tests/forms_tests/widget_tests/test_widget.py @@ -19,8 +19,8 @@ class WidgetTests(WidgetTest): self.assertIs(widget.value_omitted_from_data({'field': 'value'}, {}, 'field'), False) def test_no_trailing_newline_in_attrs(self): - self.check_html(Input(), 'name', 'value', strict=True, html='<input type="None" name="name" value="value" />') + self.check_html(Input(), 'name', 'value', strict=True, html='<input type="None" name="name" value="value">') def test_attr_false_not_rendered(self): - html = '<input type="None" name="name" value="value" />' + html = '<input type="None" name="name" value="value">' self.check_html(Input(), 'name', 'value', html=html, attrs={'readonly': False}) |