From e17668521a209a9a15931b45fdc96ce69023a3d5 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 27 Feb 2017 21:08:01 +0000 Subject: [PATCH] Fix remaining tests to use HTML-level comparison --- .../wagtailadmin/tests/test_edit_handlers.py | 42 +++++++++++++++---- .../wagtailadmin/tests/test_pages_views.py | 4 +- wagtail/wagtailadmin/tests/test_widgets.py | 4 +- .../wagtailcore/tests/test_page_privacy.py | 6 ++- wagtail/wagtailsnippets/tests.py | 4 +- 5 files changed, 44 insertions(+), 16 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index 4e95c5960d..ba14975949 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -695,12 +695,24 @@ class TestInlinePanel(TestCase, WagtailTestUtils): self.assertIn('Choose an image', result) # rendered panel must also contain hidden fields for id, DELETE and ORDER - self.assertIn('', + result, allow_extra_attrs=True + ) + self.assertTagInHTML( + '', + result, allow_extra_attrs=True + ) + self.assertTagInHTML( + '', + result, allow_extra_attrs=True + ) # rendered panel must contain maintenance form for the formset - self.assertIn('', + result, allow_extra_attrs=True + ) # rendered panel must include the JS initializer self.assertIn('var panel = InlinePanel({', result) @@ -735,18 +747,30 @@ class TestInlinePanel(TestCase, WagtailTestUtils): self.assertNotIn('', result) # test for #338: surname field should not be rendered as a 'stray' label-less field - self.assertNotIn('', result, count=0, allow_extra_attrs=True) self.assertIn('', result) self.assertIn('Choose an image', result) # rendered panel must also contain hidden fields for id, DELETE and ORDER - self.assertIn('', + result, allow_extra_attrs=True + ) + self.assertTagInHTML( + '', + result, allow_extra_attrs=True + ) + self.assertTagInHTML( + '', + result, allow_extra_attrs=True + ) # rendered panel must contain maintenance form for the formset - self.assertIn('', + result, allow_extra_attrs=True + ) # render_js_init must provide the JS initializer self.assertIn('var panel = InlinePanel({', panel.render_js_init()) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 14aad63e61..2779cc85aa 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -3335,7 +3335,9 @@ class TestChildRelationsOnSuperclass(TestCase, WagtailTestUtils): self.assertContains(response, "id_advert_placements-TOTAL_FORMS") # the formset should be populated with an existing form self.assertContains(response, "id_advert_placements-0-advert") - self.assertContains(response, '') + self.assertContains( + response, '', html=True + ) def test_post_edit_form(self): post_data = { diff --git a/wagtail/wagtailadmin/tests/test_widgets.py b/wagtail/wagtailadmin/tests/test_widgets.py index 8da3ea2a2f..36ecd120c5 100644 --- a/wagtail/wagtailadmin/tests/test_widgets.py +++ b/wagtail/wagtailadmin/tests/test_widgets.py @@ -26,7 +26,7 @@ class TestAdminPageChooserWidget(TestCase): widget = widgets.AdminPageChooser() html = widget.render_html('test', None, {}) - self.assertIn("", html) + self.assertInHTML("""""", html) def test_render_js_init(self): widget = widgets.AdminPageChooser() @@ -38,7 +38,7 @@ class TestAdminPageChooserWidget(TestCase): widget = widgets.AdminPageChooser() html = widget.render_html('test', self.child_page, {}) - self.assertIn("" % self.child_page.id, html) + self.assertInHTML("""""" % self.child_page.id, html) def test_render_js_init_with_value(self): widget = widgets.AdminPageChooser() diff --git a/wagtail/wagtailcore/tests/test_page_privacy.py b/wagtail/wagtailcore/tests/test_page_privacy.py index 68ad350a39..71f04818b6 100644 --- a/wagtail/wagtailcore/tests/test_page_privacy.py +++ b/wagtail/wagtailcore/tests/test_page_privacy.py @@ -26,7 +26,8 @@ class TestPagePrivacy(TestCase): self.assertContains(response, '
' + '', + html=True ) # posting the wrong password should redisplay the password page @@ -60,7 +61,8 @@ class TestPagePrivacy(TestCase): self.assertContains(response, '' + '', + html=True ) # posting the wrong password should redisplay the password page diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 6f6d92c13b..d8374edafc 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -742,13 +742,13 @@ class TestSnippetChooserBlock(TestCase): block = SnippetChooserBlock(Advert, help_text="pick an advert, any advert") empty_form_html = block.render_form(None, 'advert') - self.assertIn('', empty_form_html) + self.assertInHTML('', empty_form_html) self.assertIn('createSnippetChooser("advert", "tests/advert");', empty_form_html) test_advert = Advert.objects.get(text='test_advert') test_advert_form_html = block.render_form(test_advert, 'advert') expected_html = '' % test_advert.id - self.assertIn(expected_html, test_advert_form_html) + self.assertInHTML(expected_html, test_advert_form_html) self.assertIn("pick an advert, any advert", test_advert_form_html) def test_form_response(self):