diff options
author | Jon Dufresne <jon.dufresne@gmail.com> | 2018-01-20 23:09:10 -0800 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2018-01-21 02:09:10 -0500 |
commit | ff05de760cc4ef4c7f188e163c722ec3bc1f0cbf (patch) | |
tree | ba133d0ecea7521935c98cf1c058df4e6a9ff233 /tests/admin_inlines | |
parent | 4b0f39d9fb2033a9597e30ac13af162440b82ebc (diff) | |
download | django-ff05de760cc4ef4c7f188e163c722ec3bc1f0cbf.tar.gz |
Fixed #29038 -- Removed closing slash from HTML void tags.
Diffstat (limited to 'tests/admin_inlines')
-rw-r--r-- | tests/admin_inlines/tests.py | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index 67ffa7648f..73b1bd065e 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -161,7 +161,7 @@ class TestInline(TestDataMixin, TestCase): '<img src="/static/admin/img/icon-unknown.svg" ' 'class="help help-tooltip" width="10" height="10" ' 'alt="(Awesome tabular help text is awesome.)" ' - 'title="Awesome tabular help text is awesome." />', + 'title="Awesome tabular help text is awesome.">', 1 ) # ReadOnly fields @@ -171,7 +171,7 @@ class TestInline(TestDataMixin, TestCase): '<img src="/static/admin/img/icon-unknown.svg" ' 'class="help help-tooltip" width="10" height="10" ' 'alt="(Help text for ReadOnlyInline)" ' - 'title="Help text for ReadOnlyInline" />', + 'title="Help text for ReadOnlyInline">', 1 ) @@ -184,7 +184,7 @@ class TestInline(TestDataMixin, TestCase): self.assertNotContains(response, '<td class="field-position">') self.assertInHTML( '<input id="id_somechildmodel_set-1-position" ' - 'name="somechildmodel_set-1-position" type="hidden" value="1" />', + 'name="somechildmodel_set-1-position" type="hidden" value="1">', response.rendered_content, ) @@ -193,26 +193,26 @@ class TestInline(TestDataMixin, TestCase): Multiple inlines with related_name='+' have correct form prefixes. """ response = self.client.get(reverse('admin:admin_inlines_capofamiglia_add')) - self.assertContains(response, '<input type="hidden" name="-1-0-id" id="id_-1-0-id" />', html=True) + self.assertContains(response, '<input type="hidden" name="-1-0-id" id="id_-1-0-id">', html=True) self.assertContains( response, - '<input type="hidden" name="-1-0-capo_famiglia" id="id_-1-0-capo_famiglia" />', + '<input type="hidden" name="-1-0-capo_famiglia" id="id_-1-0-capo_famiglia">', html=True ) self.assertContains( response, - '<input id="id_-1-0-name" type="text" class="vTextField" name="-1-0-name" maxlength="100" />', + '<input id="id_-1-0-name" type="text" class="vTextField" name="-1-0-name" maxlength="100">', html=True ) - self.assertContains(response, '<input type="hidden" name="-2-0-id" id="id_-2-0-id" />', html=True) + self.assertContains(response, '<input type="hidden" name="-2-0-id" id="id_-2-0-id">', html=True) self.assertContains( response, - '<input type="hidden" name="-2-0-capo_famiglia" id="id_-2-0-capo_famiglia" />', + '<input type="hidden" name="-2-0-capo_famiglia" id="id_-2-0-capo_famiglia">', html=True ) self.assertContains( response, - '<input id="id_-2-0-name" type="text" class="vTextField" name="-2-0-name" maxlength="100" />', + '<input id="id_-2-0-name" type="text" class="vTextField" name="-2-0-name" maxlength="100">', html=True ) @@ -265,12 +265,12 @@ class TestInline(TestDataMixin, TestCase): # ModelAdmin max_forms_input = ( '<input id="id_binarytree_set-MAX_NUM_FORMS" ' - 'name="binarytree_set-MAX_NUM_FORMS" type="hidden" value="%d" />' + 'name="binarytree_set-MAX_NUM_FORMS" type="hidden" value="%d">' ) # The total number of forms will remain the same in either case total_forms_hidden = ( '<input id="id_binarytree_set-TOTAL_FORMS" ' - 'name="binarytree_set-TOTAL_FORMS" type="hidden" value="2" />' + 'name="binarytree_set-TOTAL_FORMS" type="hidden" value="2">' ) response = self.client.get(reverse('admin:admin_inlines_binarytree_add')) self.assertInHTML(max_forms_input % 3, response.rendered_content) @@ -293,11 +293,11 @@ class TestInline(TestDataMixin, TestCase): modeladmin.inlines = [MinNumInline] min_forms = ( '<input id="id_binarytree_set-MIN_NUM_FORMS" ' - 'name="binarytree_set-MIN_NUM_FORMS" type="hidden" value="2" />' + 'name="binarytree_set-MIN_NUM_FORMS" type="hidden" value="2">' ) total_forms = ( '<input id="id_binarytree_set-TOTAL_FORMS" ' - 'name="binarytree_set-TOTAL_FORMS" type="hidden" value="5" />' + 'name="binarytree_set-TOTAL_FORMS" type="hidden" value="5">' ) request = self.factory.get(reverse('admin:admin_inlines_binarytree_add')) request.user = User(username='super', is_superuser=True) @@ -322,11 +322,11 @@ class TestInline(TestDataMixin, TestCase): modeladmin.inlines = [MinNumInline] min_forms = ( '<input id="id_binarytree_set-MIN_NUM_FORMS" ' - 'name="binarytree_set-MIN_NUM_FORMS" type="hidden" value="%d" />' + 'name="binarytree_set-MIN_NUM_FORMS" type="hidden" value="%d">' ) total_forms = ( '<input id="id_binarytree_set-TOTAL_FORMS" ' - 'name="binarytree_set-TOTAL_FORMS" type="hidden" value="%d" />' + 'name="binarytree_set-TOTAL_FORMS" type="hidden" value="%d">' ) request = self.factory.get(reverse('admin:admin_inlines_binarytree_add')) request.user = User(username='super', is_superuser=True) @@ -345,13 +345,13 @@ class TestInline(TestDataMixin, TestCase): self.assertContains( response, '<input id="id_nonautopkbook_set-0-rand_pk" ' - 'name="nonautopkbook_set-0-rand_pk" type="hidden" />', + 'name="nonautopkbook_set-0-rand_pk" type="hidden">', html=True ) self.assertContains( response, '<input id="id_nonautopkbook_set-2-0-rand_pk" ' - 'name="nonautopkbook_set-2-0-rand_pk" type="hidden" />', + 'name="nonautopkbook_set-2-0-rand_pk" type="hidden">', html=True ) @@ -360,13 +360,13 @@ class TestInline(TestDataMixin, TestCase): self.assertContains( response, '<input id="id_nonautopkbookchild_set-0-nonautopkbook_ptr" ' - 'name="nonautopkbookchild_set-0-nonautopkbook_ptr" type="hidden" />', + 'name="nonautopkbookchild_set-0-nonautopkbook_ptr" type="hidden">', html=True ) self.assertContains( response, '<input id="id_nonautopkbookchild_set-2-nonautopkbook_ptr" ' - 'name="nonautopkbookchild_set-2-nonautopkbook_ptr" type="hidden" />', + 'name="nonautopkbookchild_set-2-nonautopkbook_ptr" type="hidden">', html=True ) @@ -375,13 +375,13 @@ class TestInline(TestDataMixin, TestCase): self.assertContains( response, '<input class="vIntegerField" id="id_editablepkbook_set-0-manual_pk" ' - 'name="editablepkbook_set-0-manual_pk" type="number" />', + 'name="editablepkbook_set-0-manual_pk" type="number">', html=True, count=1 ) self.assertContains( response, '<input class="vIntegerField" id="id_editablepkbook_set-2-0-manual_pk" ' - 'name="editablepkbook_set-2-0-manual_pk" type="number" />', + 'name="editablepkbook_set-2-0-manual_pk" type="number">', html=True, count=1 ) @@ -614,7 +614,7 @@ class TestInlinePermissions(TestCase): self.assertContains(response, '<h2>Inner2s</h2>') self.assertContains(response, 'Add another Inner2') self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" ' - 'value="3" name="inner2_set-TOTAL_FORMS" />', html=True) + 'value="3" name="inner2_set-TOTAL_FORMS">', html=True) def test_inline_change_m2m_add_perm(self): permission = Permission.objects.get(codename='add_book', content_type=self.book_ct) @@ -634,11 +634,11 @@ class TestInlinePermissions(TestCase): self.assertContains(response, '<h2>Author-book relationships</h2>') self.assertContains(response, 'Add another Author-book relationship') self.assertContains(response, '<input type="hidden" id="id_Author_books-TOTAL_FORMS" ' - 'value="4" name="Author_books-TOTAL_FORMS" />', html=True) + 'value="4" name="Author_books-TOTAL_FORMS">', html=True) self.assertContains( response, '<input type="hidden" id="id_Author_books-0-id" value="%i" ' - 'name="Author_books-0-id" />' % self.author_book_auto_m2m_intermediate_id, + 'name="Author_books-0-id">' % self.author_book_auto_m2m_intermediate_id, html=True ) self.assertContains(response, 'id="id_Author_books-0-DELETE"') @@ -654,12 +654,12 @@ class TestInlinePermissions(TestCase): self.assertContains( response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="3" ' - 'name="inner2_set-TOTAL_FORMS" />', + 'name="inner2_set-TOTAL_FORMS">', html=True ) self.assertNotContains( response, - '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id" />' % self.inner2_id, + '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id">' % self.inner2_id, html=True ) @@ -671,18 +671,18 @@ class TestInlinePermissions(TestCase): self.assertContains(response, '<h2>Inner2s</h2>') # Just the one form for existing instances self.assertContains( - response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="1" name="inner2_set-TOTAL_FORMS" />', + response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="1" name="inner2_set-TOTAL_FORMS">', html=True ) self.assertContains( response, - '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id" />' % self.inner2_id, + '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id">' % self.inner2_id, html=True ) # max-num 0 means we can't add new ones self.assertContains( response, - '<input type="hidden" id="id_inner2_set-MAX_NUM_FORMS" value="0" name="inner2_set-MAX_NUM_FORMS" />', + '<input type="hidden" id="id_inner2_set-MAX_NUM_FORMS" value="0" name="inner2_set-MAX_NUM_FORMS">', html=True ) @@ -696,12 +696,12 @@ class TestInlinePermissions(TestCase): self.assertContains(response, '<h2>Inner2s</h2>') # One form for existing instance and three extra for new self.assertContains( - response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="4" name="inner2_set-TOTAL_FORMS" />', + response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="4" name="inner2_set-TOTAL_FORMS">', html=True ) self.assertContains( response, - '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id" />' % self.inner2_id, + '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id">' % self.inner2_id, html=True ) @@ -716,12 +716,12 @@ class TestInlinePermissions(TestCase): # One form for existing instance only, no new self.assertContains( response, - '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="1" name="inner2_set-TOTAL_FORMS" />', + '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="1" name="inner2_set-TOTAL_FORMS">', html=True ) self.assertContains( response, - '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id" />' % self.inner2_id, + '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id">' % self.inner2_id, html=True ) self.assertContains(response, 'id="id_inner2_set-0-DELETE"') @@ -739,12 +739,12 @@ class TestInlinePermissions(TestCase): # One form for existing instance only, three for new self.assertContains( response, - '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="4" name="inner2_set-TOTAL_FORMS" />', + '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" value="4" name="inner2_set-TOTAL_FORMS">', html=True ) self.assertContains( response, - '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id" />' % self.inner2_id, + '<input type="hidden" id="id_inner2_set-0-id" value="%i" name="inner2_set-0-id">' % self.inner2_id, html=True ) self.assertContains(response, 'id="id_inner2_set-0-DELETE"') |